generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support demuxing of streamed Bink files

Browse Source 
Originally committed as revision 22166 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2010-03-03 09:44:30 +00:00
parent f087881207
commit a27998010c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/bink.c
View File

@ -211,18 +211,17 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
bink->remain_packet_size -= 4 + audio_size; bink->remain_packet_size -= 4 + audio_size;
bink->current_track++; bink->current_track++;
if (audio_size > 0) { if (audio_size > 0) {
/* Each audio packet reports the number of decompressed samples
(in bytes). We use this value to calcuate the audio PTS */
int reported_size = get_le32(pb) / (2 * s->streams[bink->current_track]->codec->channels);
url_fseek(pb, -4, SEEK_CUR);
/* get one audio packet per track */ /* get one audio packet per track */
if ((ret = av_get_packet(pb, pkt, audio_size)) if ((ret = av_get_packet(pb, pkt, audio_size))
!= audio_size) != audio_size)
return ret; return ret;
pkt->stream_index = bink->current_track; pkt->stream_index = bink->current_track;
pkt->pts = bink->audio_pts[bink->current_track - 1]; pkt->pts = bink->audio_pts[bink->current_track - 1];
bink->audio_pts[bink->current_track -1] += reported_size;
/* Each audio packet reports the number of decompressed samples
(in bytes). We use this value to calcuate the audio PTS */
bink->audio_pts[bink->current_track -1] +=
AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codec->channels);
return 0; return 0;
} }
} }
@ -246,6 +245,9 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
BinkDemuxContext *bink = s->priv_data; BinkDemuxContext *bink = s->priv_data;
AVStream *vst = s->streams[0]; AVStream *vst = s->streams[0];
if (url_is_streamed(s->pb))
return -1;
/* seek to the first frame */ /* seek to the first frame */
url_fseek(s->pb, vst->index_entries[0].pos, SEEK_SET); url_fseek(s->pb, vst->index_entries[0].pos, SEEK_SET);
bink->video_pts = 0; bink->video_pts = 0;