[FFmpeg-devel] [PATCH 2/2] matroska: Demux support for SeekPreRoll and CodecDelay
Michael Niedermayer
michaelni at gmx.at
Mon Oct 14 18:55:00 CEST 2013
On Fri, Oct 11, 2013 at 11:47:38AM -0700, Vignesh Venkatasubramanian wrote:
> Adds support for demuxing SeekPreRoll and CodecDelay container
> elements.
>
> Signed-off-by: Vignesh Venkatasubramanian <vigneshv at google.com>
> ---
> libavformat/matroskadec.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 1879328..b07db9d 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -163,6 +163,8 @@ typedef struct {
> uint64_t default_duration;
> uint64_t flag_default;
> uint64_t flag_forced;
> + uint64_t codec_delay;
> + uint64_t seek_preroll;
> MatroskaTrackVideo video;
> MatroskaTrackAudio audio;
> MatroskaTrackOperation operation;
> @@ -410,6 +412,8 @@ static EbmlSyntax matroska_track[] = {
> { MATROSKA_ID_TRACKOPERATION, EBML_NEST, 0, offsetof(MatroskaTrack,operation), {.n=matroska_track_operation} },
> { MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} },
> { MATROSKA_ID_TRACKMAXBLKADDID, EBML_UINT, 0, offsetof(MatroskaTrack,max_block_additional_id) },
> + { MATROSKA_ID_CODECDELAY, EBML_UINT, 0, offsetof(MatroskaTrack,codec_delay) },
> + { MATROSKA_ID_SEEKPREROLL, EBML_UINT, 0, offsetof(MatroskaTrack,seek_preroll) },
> { MATROSKA_ID_TRACKFLAGENABLED, EBML_NONE },
> { MATROSKA_ID_TRACKFLAGLACING, EBML_NONE },
> { MATROSKA_ID_CODECNAME, EBML_NONE },
> @@ -1881,6 +1885,16 @@ static int matroska_read_header(AVFormatContext *s)
> st->codec->bits_per_coded_sample = track->audio.bitdepth;
> if (st->codec->codec_id != AV_CODEC_ID_AAC)
> st->need_parsing = AVSTREAM_PARSE_HEADERS;
> + if (track->codec_delay > 0) {
> + st->codec->delay = av_rescale_q(track->codec_delay,
> + (AVRational){1, 1000000000},
> + (AVRational){1, st->codec->sample_rate});
> + }
> + if (track->seek_preroll > 0) {
> + st->codec->seek_preroll = av_rescale_q(track->seek_preroll,
> + (AVRational){1, 1000000000},
> + (AVRational){1, st->codec->sample_rate});
being outside libavcdoec this needs to use the setter function
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The greatest way to live with honor in this world is to be what we pretend
to be. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131014/ef1a79de/attachment.asc>
More information about the ffmpeg-devel
mailing list