RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In ogg muxer, correctly mux VFR streams, fix issue #2398 

Originally committed as revision 26229 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2011-01-05 19:32:45 +00:00
parent 5e2202d6f3
commit ab04337464
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/oggenc.c
View File

@ -52,6 +52,7 @@ typedef struct {
unsigned page_count; ///< number of page buffered unsigned page_count; ///< number of page buffered
OGGPage page; ///< current page OGGPage page; ///< current page
unsigned serial_num; ///< serial number unsigned serial_num; ///< serial number
int64_t last_granule; ///< last packet granule
} OGGStreamContext; } OGGStreamContext;
typedef struct OGGPageList { typedef struct OGGPageList {
@ -110,13 +111,13 @@ static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags)
return 0; return 0;
} }
static int64_t ogg_granule_to_timestamp(OGGStreamContext *oggstream, OGGPage *page) static int64_t ogg_granule_to_timestamp(OGGStreamContext *oggstream, int64_t granule)
{ {
if (oggstream->kfgshift) if (oggstream->kfgshift)
return (page->granule>>oggstream->kfgshift) + return (granule>>oggstream->kfgshift) +
(page->granule & ((1<<oggstream->kfgshift)-1)); (granule & ((1<<oggstream->kfgshift)-1));
else else
return page->granule; return granule;
} }
static int ogg_compare_granule(AVFormatContext *s, OGGPage *next, OGGPage *page) static int ogg_compare_granule(AVFormatContext *s, OGGPage *next, OGGPage *page)
@ -128,9 +129,9 @@ static int ogg_compare_granule(AVFormatContext *s, OGGPage *next, OGGPage *page)
if (next->granule == -1 || page->granule == -1) if (next->granule == -1 || page->granule == -1)
return 0; return 0;
next_granule = av_rescale_q(ogg_granule_to_timestamp(st2->priv_data, next), next_granule = av_rescale_q(ogg_granule_to_timestamp(st2->priv_data, next->granule),
st2->time_base, AV_TIME_BASE_Q); st2->time_base, AV_TIME_BASE_Q);
cur_granule = av_rescale_q(ogg_granule_to_timestamp(st->priv_data, page), cur_granule = av_rescale_q(ogg_granule_to_timestamp(st->priv_data, page->granule),
st ->time_base, AV_TIME_BASE_Q); st ->time_base, AV_TIME_BASE_Q);
return next_granule > cur_granule; return next_granule > cur_granule;
} }
@ -174,7 +175,16 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
OGGStreamContext *oggstream = st->priv_data; OGGStreamContext *oggstream = st->priv_data;
int total_segments = size / 255 + 1; int total_segments = size / 255 + 1;
uint8_t *p = data; uint8_t *p = data;
int i, segments, len; int i, segments, len, flush = 0;
// Handles VFR by flushing page because this frame needs to have a timestamp
if (st->codec->codec_id == CODEC_ID_THEORA &&
ogg_granule_to_timestamp(oggstream, granule) >
ogg_granule_to_timestamp(oggstream, oggstream->last_granule) + 1) {
if (oggstream->page.granule != -1)
ogg_buffer_page(s, oggstream);
flush = 1;
}
for (i = 0; i < total_segments; ) { for (i = 0; i < total_segments; ) {
OGGPage *page = &oggstream->page; OGGPage *page = &oggstream->page;
@ -202,6 +212,10 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
ogg_buffer_page(s, oggstream); ogg_buffer_page(s, oggstream);
} }
} }
if (flush && oggstream->page.granule != -1)
ogg_buffer_page(s, oggstream);
return 0; return 0;
} }
@ -460,6 +474,8 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
ogg_write_pages(s, 0); ogg_write_pages(s, 0);
oggstream->last_granule = granule;
return 0; return 0;
} }