mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

demux: remove ds_read_packet()

Browse Source
This commit is contained in:
wm4 2013-07-09 00:03:14 +02:00
parent 9200538b39
commit b096269af5
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demux/demux.c
View File

@ -403,19 +403,6 @@ void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp)
ds->demuxer->video->packs);
}
void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len,
double pts, int64_t pos, bool keyframe)
{
demux_packet_t *dp = new_demux_packet(len);
len = stream_read(stream, dp->buffer, len);
resize_demux_packet(dp, len);
dp->pts = pts;
dp->pos = pos;
dp->keyframe = keyframe;
// append packet to DS stream:
ds_add_packet(ds, dp);
}
static bool demux_check_queue_full(demuxer_t *demux)
{
int apacks = demux->audio ? demux->audio->packs : 0;

2
demux/demux.h
View File

@ -254,8 +254,6 @@ void free_demuxer(struct demuxer *demuxer);
int demuxer_add_packet(demuxer_t *demuxer, struct sh_stream *stream,
demux_packet_t *dp);
void ds_add_packet(struct demux_stream *ds, struct demux_packet *dp);
void ds_read_packet(struct demux_stream *ds, struct stream *stream, int len,
double pts, int64_t pos, bool keyframe);
int demux_fill_buffer(struct demuxer *demux, struct demux_stream *ds);
int ds_fill_buffer(struct demux_stream *ds);

21
demux/demux_rawvideo.c
View File

@ -131,12 +131,21 @@ static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) {
}
static int demux_rawvideo_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
sh_video_t* sh = demuxer->video->gsh->video;
int64_t pos;
if(demuxer->stream->eof) return 0;
if(ds!=demuxer->video) return 0;
pos = stream_tell(demuxer->stream);
ds_read_packet(ds,demuxer->stream,imgsize,(pos/imgsize)*sh->frametime,pos,0x10);
int64_t spos = stream_tell(demuxer->stream);
demux_packet_t* dp;
int size;
if(demuxer->stream->eof)
return 0;
dp = new_demux_packet(imgsize);
dp->pos = (spos - demuxer->movi_start);
dp->pts = dp->pos / (float)(imgsize);
size = stream_read(demuxer->stream, dp->buffer, imgsize);
resize_demux_packet(dp, size);
ds_add_packet(ds, dp);
return 1;
}