March 2016 - ffmpeg-cvslog - lists.ffmpeg.org

lavc/ccaption_dec: do not ignore repeated character commands
by git＠videolan.org 13 Apr '16

13 Apr '16

ffmpeg | branch: master | Aman Gupta <aman(a)tmm1.net> | Sun Feb 14 18:11:53 2016 -0800| [2f26b67d557f56e01f8a3efa199a832ad8ce70b0] | committer: Clément Bœsch lavc/ccaption_dec: do not ignore repeated character commands control codes in a cc stream can be repeated, and must be ignored. however, repeated characters must not be ignored. the code attempted to wipe prev_cmd in handle_char to allow repeated characters to be processed, but prev_cmd would previously get reset _after_ handle_char() i also moved the prev_cmd reset out from handle_char() so it can be re-used for special character sets, which _must_ be ignored when repeated. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f26b67d557f56e01… --- libavcodec/ccaption_dec.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 790f071..5fb2ec6 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -484,9 +484,6 @@ static void handle_char(CCaptionSubContext *ctx, char hi, char lo, int64_t pts) if (ctx->mode != CCMODE_POPON) ctx->screen_touched = 1; - /* reset prev command since character can repeat */ - ctx->prev_cmd[0] = 0; - ctx->prev_cmd[1] = 0; if (lo) ff_dlog(ctx, "(%c,%c)\n", hi, lo); else @@ -497,8 +494,15 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint { if (hi == ctx->prev_cmd[0] && lo == ctx->prev_cmd[1]) { /* ignore redundant command */ - } else if ( (hi == 0x10 && (lo >= 0x40 && lo <= 0x5f)) || - ( (hi >= 0x11 && hi <= 0x17) && (lo >= 0x40 && lo <= 0x7f) ) ) { + return; + } + + /* set prev command */ + ctx->prev_cmd[0] = hi; + ctx->prev_cmd[1] = lo; + + if ( (hi == 0x10 && (lo >= 0x40 && lo <= 0x5f)) || + ( (hi >= 0x11 && hi <= 0x17) && (lo >= 0x40 && lo <= 0x7f) ) ) { handle_pac(ctx, hi, lo); } else if ( ( hi == 0x11 && lo >= 0x20 && lo <= 0x2f ) || ( hi == 0x17 && lo >= 0x2e && lo <= 0x2f) ) { @@ -559,14 +563,11 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint } else if (hi >= 0x20) { /* Standard characters (always in pairs) */ handle_char(ctx, hi, lo, pts); + ctx->prev_cmd[0] = ctx->prev_cmd[1] = 0; } else { /* Ignoring all other non data code */ ff_dlog(ctx, "Unknown command 0x%hhx 0x%hhx\n", hi, lo); } - - /* set prev command */ - ctx->prev_cmd[0] = hi; - ctx->prev_cmd[1] = lo; } static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avpkt)

2 1

psxstr: Remove some commented out code
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Thu Mar 31 18:37:21 2016 +0100| [54ccaaeb2b93e19d2a19267db1781bc9d5d36f27] | committer: Derek Buitenhuis psxstr: Remove some commented out code Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54ccaaeb2b93e19d2… --- libavformat/psxstr.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index b57981a..38186f7 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -104,13 +104,7 @@ static int str_probe(AVProbeData *p) && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){ return 0; } - - /*st->codec->width = AV_RL16(&sector[0x28]); - st->codec->height = AV_RL16(&sector[0x2A]);*/ - -// if (current_sector == sector_count-1) { - vid++; -// } + vid++; } break;

1 0

lavc/utils: transfer width/height for subs in codecpar
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Mon Mar 28 19:02:02 2016 +0200| [be8d98c1ad3872ce84139bb583919ab973208de5] | committer: Derek Buitenhuis lavc/utils: transfer width/height for subs in codecpar Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be8d98c1ad3872ce8… --- libavcodec/utils.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 5288d4d..cef98d7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3788,6 +3788,10 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->initial_padding = codec->initial_padding; par->seek_preroll = codec->seek_preroll; break; + case AVMEDIA_TYPE_SUBTITLE: + par->width = codec->width; + par->height = codec->height; + break; } if (codec->extradata) { @@ -3837,6 +3841,10 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->initial_padding = par->initial_padding; codec->seek_preroll = par->seek_preroll; break; + case AVMEDIA_TYPE_SUBTITLE: + codec->width = par->width; + codec->height = par->height; + break; } if (par->extradata) {

1 0

codecpar: Add video delay field
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Wed Mar 30 17:15:04 2016 +0100| [dd77dad4e6ff59bb5ba888341e28ce620cc16ae0] | committer: Derek Buitenhuis codecpar: Add video delay field Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd77dad4e6ff59bb5… --- libavcodec/avcodec.h | 5 +++++ libavcodec/utils.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 10a2083..bbf742f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3869,6 +3869,11 @@ typedef struct AVCodecParameters { enum AVChromaLocation chroma_location; /** + * Video only. Number of delayed frames. + */ + int video_delay; + + /** * Audio only. The channel layout bitmask. May be 0 if the channel layout is * unknown or unspecified, otherwise the number of bits set must be equal to * the channels field. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0341686..5288d4d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3776,6 +3776,7 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->color_space = codec->colorspace; par->chroma_location = codec->chroma_sample_location; par->sample_aspect_ratio = codec->sample_aspect_ratio; + par->video_delay = codec->has_b_frames; break; case AVMEDIA_TYPE_AUDIO: par->format = codec->sample_fmt; @@ -3824,6 +3825,7 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->colorspace = par->color_space; codec->chroma_sample_location = par->chroma_location; codec->sample_aspect_ratio = par->sample_aspect_ratio; + codec->has_b_frames = par->video_delay; break; case AVMEDIA_TYPE_AUDIO: codec->sample_fmt = par->format;

1 0

Add frame_size to AVCodecParameters
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sat Mar 5 11:22:11 2016 +0100| [5b4f8af2f1ac0595062dbb040db413633e9ef2fc] | committer: Derek Buitenhuis Add frame_size to AVCodecParameters Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b4f8af2f1ac05950… --- libavcodec/avcodec.h | 4 ++++ libavcodec/utils.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4e8d30c..10a2083 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3889,6 +3889,10 @@ typedef struct AVCodecParameters { * Corresponds to nBlockAlign in WAVEFORMATEX. */ int block_align; + /** + * Audio only. Audio frame size, if known. Required by some formats to be static. + */ + int frame_size; /** * Audio only. The amount of padding (in samples) inserted by the encoder at diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 55a1379..0341686 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3783,6 +3783,7 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->channels = codec->channels; par->sample_rate = codec->sample_rate; par->block_align = codec->block_align; + par->frame_size = codec->frame_size; par->initial_padding = codec->initial_padding; par->seek_preroll = codec->seek_preroll; break; @@ -3830,6 +3831,7 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->channels = par->channels; codec->sample_rate = par->sample_rate; codec->block_align = par->block_align; + codec->frame_size = par->frame_size; codec->initial_padding = par->initial_padding; codec->seek_preroll = par->seek_preroll; break;

1 0

lavc: Add seek_preroll to AVCodecParameters
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 4 15:51:41 2016 -0300| [3fafde6cbe345d2f84cfe61b94d4a823990969b3] | committer: Derek Buitenhuis lavc: Add seek_preroll to AVCodecParameters Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fafde6cbe345d2f8… --- libavcodec/avcodec.h | 4 ++++ libavcodec/utils.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0d37083..4e8d30c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3904,6 +3904,10 @@ typedef struct AVCodecParameters { * audio without any trailing padding. */ int trailing_padding; + /** + * Audio only. Number of samples to skip after a discontinuity. + */ + int seek_preroll; } AVCodecParameters; /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d38e2f9..55a1379 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3784,6 +3784,7 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->sample_rate = codec->sample_rate; par->block_align = codec->block_align; par->initial_padding = codec->initial_padding; + par->seek_preroll = codec->seek_preroll; break; } @@ -3830,6 +3831,7 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->sample_rate = par->sample_rate; codec->block_align = par->block_align; codec->initial_padding = par->initial_padding; + codec->seek_preroll = par->seek_preroll; break; }

1 0

Merge commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7'
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Thu Mar 31 21:19:49 2016 +0100| [e6053b3b19c070e994a501fe0cc20255d15c4aa8] | committer: Derek Buitenhuis Merge commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7' * commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7': lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters Fixes from jamrial incorporated. Merged-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6053b3b19c070e99… --- doc/APIchanges | 1 + libavcodec/avcodec.h | 6 ++++++ libavcodec/utils.c | 49 +++++++++++++++++++++++++++++++------------------ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 32969ed..8363b05 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,6 +17,7 @@ API changes, most recent first: 2016-xx-xx - lavc 57.33.0 - avcodec.h xxxxxxx - Add AVCodecParameters and its related API. + xxxxxxx - Add av_get_audio_frame_duration2(). 2016-03-11 - xxxxxxx - lavf/lavc 57.28.101 Add requirement to bitstream filtering API that returned packets with diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 94993d3..0d37083 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5342,6 +5342,12 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id); */ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); +/** + * This function is the same as av_get_audio_frame_duration(), except it works + * with AVCodecParameters instead of an AVCodecContext. + */ +int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes); + typedef struct AVBitStreamFilterContext { void *priv_data; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f4312b2..d38e2f9 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3145,21 +3145,16 @@ int av_get_bits_per_sample(enum AVCodecID codec_id) } } -int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) +static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, + uint32_t tag, int bits_per_coded_sample, int64_t bitrate, + uint8_t * extradata, int frame_size, int frame_bytes) { - int id, sr, ch, ba, tag, bps; - - id = avctx->codec_id; - sr = avctx->sample_rate; - ch = avctx->channels; - ba = avctx->block_align; - tag = avctx->codec_tag; - bps = av_get_exact_bits_per_sample(avctx->codec_id); + int bps = av_get_exact_bits_per_sample(id); /* codecs with an exact constant bits per sample */ if (bps > 0 && ch > 0 && frame_bytes > 0 && ch < 32768 && bps < 32768) return (frame_bytes * 8LL) / (bps * ch); - bps = avctx->bits_per_coded_sample; + bps = bits_per_coded_sample; /* codecs with a fixed packet duration */ switch (id) { @@ -3245,7 +3240,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) return (frame_bytes - 8) * 2 / ch; case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP_LE: - if (avctx->extradata) + if (extradata) return frame_bytes * 14 / (8 * ch); break; case AV_CODEC_ID_ADPCM_XA: @@ -3280,7 +3275,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) if (ba > 0) { /* calc from frame_bytes, channels, and block_align */ int blocks = frame_bytes / ba; - switch (avctx->codec_id) { + switch (id) { case AV_CODEC_ID_ADPCM_IMA_WAV: if (bps < 2 || bps > 5) return 0; @@ -3298,7 +3293,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) if (bps > 0) { /* calc from frame_bytes, channels, and bits_per_coded_sample */ - switch (avctx->codec_id) { + switch (id) { case AV_CODEC_ID_PCM_DVD: if(bps<4) return 0; @@ -3315,19 +3310,37 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) } /* Fall back on using frame_size */ - if (avctx->frame_size > 1 && frame_bytes) - return avctx->frame_size; + if (frame_size > 1 && frame_bytes) + return frame_size; //For WMA we currently have no other means to calculate duration thus we //do it here by assuming CBR, which is true for all known cases. - if (avctx->bit_rate>0 && frame_bytes>0 && avctx->sample_rate>0 && avctx->block_align>1) { - if (avctx->codec_id == AV_CODEC_ID_WMAV1 || avctx->codec_id == AV_CODEC_ID_WMAV2) - return (frame_bytes * 8LL * avctx->sample_rate) / avctx->bit_rate; + if (bitrate > 0 && frame_bytes > 0 && sr > 0 && ba > 1) { + if (id == AV_CODEC_ID_WMAV1 || id == AV_CODEC_ID_WMAV2) + return (frame_bytes * 8LL * sr) / bitrate; } return 0; } +int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) +{ + return get_audio_frame_duration(avctx->codec_id, avctx->sample_rate, + avctx->channels, avctx->block_align, + avctx->codec_tag, avctx->bits_per_coded_sample, + avctx->bit_rate, avctx->extradata, avctx->frame_size, + frame_bytes); +} + +int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes) +{ + return get_audio_frame_duration(par->codec_id, par->sample_rate, + par->channels, par->block_align, + par->codec_tag, par->bits_per_coded_sample, + par->bit_rate, par->extradata, par->frame_size, + frame_bytes); +} + #if !HAVE_THREADS int ff_thread_init(AVCodecContext *s) { ====================================================================== diff --cc doc/APIchanges index 32969ed,70fce18..8363b05 --- a/doc/APIchanges +++ b/doc/APIchanges @@@ -15,49 -13,19 +15,50 @@@ libavutil: 2015-08-2 API changes, most recent first: -2016-xx-xx - lavc 57.14.0 - avcodec.h +2016-xx-xx - lavc 57.33.0 - avcodec.h xxxxxxx - Add AVCodecParameters and its related API. + xxxxxxx - Add av_get_audio_frame_duration2(). -2016-xx-xx - xxxxxxx - lavf 57.4.0 - avformat.h - Add AVFormatContext.protocol_whitelist and protocol_blacklist. - Add 'protocol_whitelist' and 'protocol_blacklist' private options for - avio_open2(). - -2016-xx-xx - lavc 57.13.0 - avcodec.h +2016-03-11 - xxxxxxx - lavf/lavc 57.28.101 + Add requirement to bitstream filtering API that returned packets with + size == 0 and side_data_elems == 0 are to be skipped by the caller. + +2016-XX-XX - xxxxxxx - lavf 57.28.100 + Add protocol blacklisting API + +2016-02-28 - xxxxxxx - lavc 57.27.101 + Validate AVFrame returned by get_buffer2 to have required + planes not NULL and unused planes set to NULL as crashes + and buffer overflow are possible with certain streams if + that is not the case. + +2016-xx-xx - xxxxxxx - lavc 57.27.100 - avcodec.h + "flags2" decoding option now allows the flag "ass_ro_flush_noop" preventing + the reset of the ASS ReadOrder field on flush. This affects the content of + AVSubtitles.rects[N]->ass when "sub_text_format" is set to "ass" (see + previous entry). + +2016-xx-xx - xxxxxxx - lavc 57.26.100 - avcodec.h + Add a "sub_text_format" subtitles decoding option allowing the values "ass" + (recommended) and "ass_with_timings" (not recommended, deprecated, default). + The default value for this option will change to "ass" at the next major + libavcodec version bump. + + The current default is "ass_with_timings" for compatibility. This means that + all subtitles text decoders currently still output ASS with timings printed + as strings in the AVSubtitles.rects[N]->ass fields. + + Setting "sub_text_format" to "ass" allows a better timing accuracy (ASS + timing is limited to a 1/100 time base, so this is relevant for any subtitles + format needing a bigger one), ease timing adjustments, and prevents the need + of removing the timing from the decoded string yourself. This form is also + known as "the Matroska form". The timing information (start time, duration) + can be found in the AVSubtitles fields. + +2016-xx-xx - lavc 57.25.0 - avcodec.h Add AVCodecContext.hw_frames_ctx. -2016-xx-xx - lavfi 6.2.0 - avfilter.h +2016-xx-xx - lavfi 6.36.0 - avfilter.h xxxxxxx avfilter.h - Add AVFilterLink.hw_frames_ctx. xxxxxxx buffersrc.h - Add AVBufferSrcParameters and functions for handling it. diff --cc libavcodec/utils.c index f4312b2,a9a7423..d38e2f9 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@@ -3145,21 -2037,15 +3145,16 @@@ int av_get_bits_per_sample(enum AVCodec } } - int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) + static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, - uint32_t tag, int bits_per_coded_sample, int frame_bytes) ++ uint32_t tag, int bits_per_coded_sample, int64_t bitrate, ++ uint8_t * extradata, int frame_size, int frame_bytes) { - int id, sr, ch, ba, tag, bps; - - id = avctx->codec_id; - sr = avctx->sample_rate; - ch = avctx->channels; - ba = avctx->block_align; - tag = avctx->codec_tag; - bps = av_get_exact_bits_per_sample(avctx->codec_id); + int bps = av_get_exact_bits_per_sample(id); /* codecs with an exact constant bits per sample */ - if (bps > 0 && ch > 0 && frame_bytes > 0) - return (frame_bytes * 8) / (bps * ch); + if (bps > 0 && ch > 0 && frame_bytes > 0 && ch < 32768 && bps < 32768) + return (frame_bytes * 8LL) / (bps * ch); - bps = avctx->bits_per_coded_sample; + bps = bits_per_coded_sample; /* codecs with a fixed packet duration */ switch (id) { @@@ -3243,11 -2120,6 +3238,11 @@@ return (frame_bytes - 4) * 2 / ch; case AV_CODEC_ID_ADPCM_IMA_AMV: return (frame_bytes - 8) * 2 / ch; + case AV_CODEC_ID_ADPCM_THP: + case AV_CODEC_ID_ADPCM_THP_LE: - if (avctx->extradata) ++ if (extradata) + return frame_bytes * 14 / (8 * ch); + break; case AV_CODEC_ID_ADPCM_XA: return (frame_bytes / 128) * 224 / ch; case AV_CODEC_ID_INTERPLAY_DPCM: @@@ -3280,11 -2149,9 +3275,11 @@@ if (ba > 0) { /* calc from frame_bytes, channels, and block_align */ int blocks = frame_bytes / ba; - switch (avctx->codec_id) { + switch (id) { case AV_CODEC_ID_ADPCM_IMA_WAV: - return blocks * (1 + (ba - 4 * ch) / (4 * ch) * 8); + if (bps < 2 || bps > 5) + return 0; + return blocks * (1 + (ba - 4 * ch) / (bps * ch) * 8); case AV_CODEC_ID_ADPCM_IMA_DK3: return blocks * (((ba - 16) * 2 / 3 * 4) / ch); case AV_CODEC_ID_ADPCM_IMA_DK4: @@@ -3298,14 -2163,10 +3293,14 @@@ if (bps > 0) { /* calc from frame_bytes, channels, and bits_per_coded_sample */ - switch (avctx->codec_id) { + switch (id) { case AV_CODEC_ID_PCM_DVD: + if(bps<4) + return 0; return 2 * (frame_bytes / ((bps * 2 / 8) * ch)); case AV_CODEC_ID_PCM_BLURAY: + if(bps<4) + return 0; return frame_bytes / ((FFALIGN(ch, 2) * bps) / 8); case AV_CODEC_ID_S302M: return 2 * (frame_bytes / ((bps + 4) / 4)) / ch; @@@ -3314,20 -2175,25 +3309,38 @@@ } } + /* Fall back on using frame_size */ - if (avctx->frame_size > 1 && frame_bytes) - return avctx->frame_size; ++ if (frame_size > 1 && frame_bytes) ++ return frame_size; + + //For WMA we currently have no other means to calculate duration thus we + //do it here by assuming CBR, which is true for all known cases. - if (avctx->bit_rate>0 && frame_bytes>0 && avctx->sample_rate>0 && avctx->block_align>1) { - if (avctx->codec_id == AV_CODEC_ID_WMAV1 || avctx->codec_id == AV_CODEC_ID_WMAV2) - return (frame_bytes * 8LL * avctx->sample_rate) / avctx->bit_rate; ++ if (bitrate > 0 && frame_bytes > 0 && sr > 0 && ba > 1) { ++ if (id == AV_CODEC_ID_WMAV1 || id == AV_CODEC_ID_WMAV2) ++ return (frame_bytes * 8LL * sr) / bitrate; + } + return 0; } + int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) + { + return get_audio_frame_duration(avctx->codec_id, avctx->sample_rate, + avctx->channels, avctx->block_align, + avctx->codec_tag, avctx->bits_per_coded_sample, ++ avctx->bit_rate, avctx->extradata, avctx->frame_size, + frame_bytes); + } + + int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes) + { + return get_audio_frame_duration(par->codec_id, par->sample_rate, + par->channels, par->block_align, + par->codec_tag, par->bits_per_coded_sample, ++ par->bit_rate, par->extradata, par->frame_size, + frame_bytes); + } + #if !HAVE_THREADS int ff_thread_init(AVCodecContext *s) {

1 0

Merge commit '998e1b8f521b73e1ed3a13caaabcf79eb401cf0d'
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Thu Mar 31 21:18:53 2016 +0100| [f9b1cf15c233dde29f3659c903e32f74be4fdb95] | committer: Derek Buitenhuis Merge commit '998e1b8f521b73e1ed3a13caaabcf79eb401cf0d' * commit '998e1b8f521b73e1ed3a13caaabcf79eb401cf0d': lavc: add codec parameters API Fixes added in: - bit_rate has been made int64_t to match. - profile and level are properly initialize. Merged-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9b1cf15c233dde29… --- doc/APIchanges | 3 + libavcodec/avcodec.h | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/utils.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 4 files changed, 319 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2e72128..32969ed 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-xx-xx - lavc 57.33.0 - avcodec.h + xxxxxxx - Add AVCodecParameters and its related API. + 2016-03-11 - xxxxxxx - lavf/lavc 57.28.101 Add requirement to bitstream filtering API that returned packets with size == 0 and side_data_elems == 0 are to be skipped by the caller. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index eb8b921..94993d3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3786,6 +3786,127 @@ typedef struct AVSubtitle { } AVSubtitle; /** + * This struct describes the properties of an encoded stream. + * + * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must + * be allocated with avcodec_parameters_alloc() and freed with + * avcodec_parameters_free(). + */ +typedef struct AVCodecParameters { + /** + * General type of the encoded data. + */ + enum AVMediaType codec_type; + /** + * Specific type of the encoded data (the codec used). + */ + enum AVCodecID codec_id; + /** + * Additional information about the codec (corresponds to the AVI FOURCC). + */ + uint32_t codec_tag; + + /** + * Extra binary data needed for initializing the decoder, codec-dependent. + * + * Must be allocated with av_malloc() and will be freed by + * avcodec_parameters_free(). The allocated size of extradata must be at + * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding + * bytes zeroed. + */ + uint8_t *extradata; + /** + * Size of the extradata content in bytes. + */ + int extradata_size; + + /** + * - video: the pixel format, the value corresponds to enum AVPixelFormat. + * - audio: the sample format, the value corresponds to enum AVSampleFormat. + */ + int format; + + /** + * The average bitrate of the encoded data (in bits per second). + */ + int64_t bit_rate; + + int bits_per_coded_sample; + + /** + * Codec-specific bitstream restrictions that the stream conforms to. + */ + int profile; + int level; + + /** + * Video only. The dimensions of the video frame in pixels. + */ + int width; + int height; + + /** + * Video only. The aspect ratio (width / height) which a single pixel + * should have when displayed. + * + * When the aspect ratio is unknown / undefined, the numerator should be + * set to 0 (the denominator may have any value). + */ + AVRational sample_aspect_ratio; + + /** + * Video only. The order of the fields in interlaced video. + */ + enum AVFieldOrder field_order; + + /** + * Video only. Additional colorspace characteristics. + */ + enum AVColorRange color_range; + enum AVColorPrimaries color_primaries; + enum AVColorTransferCharacteristic color_trc; + enum AVColorSpace color_space; + enum AVChromaLocation chroma_location; + + /** + * Audio only. The channel layout bitmask. May be 0 if the channel layout is + * unknown or unspecified, otherwise the number of bits set must be equal to + * the channels field. + */ + uint64_t channel_layout; + /** + * Audio only. The number of audio channels. + */ + int channels; + /** + * Audio only. The number of audio samples per second. + */ + int sample_rate; + /** + * Audio only. The number of bytes per coded audio frame, required by some + * formats. + * + * Corresponds to nBlockAlign in WAVEFORMATEX. + */ + int block_align; + + /** + * Audio only. The amount of padding (in samples) inserted by the encoder at + * the beginning of the audio. I.e. this number of leading decoded samples + * must be discarded by the caller to get the original audio without leading + * padding. + */ + int initial_padding; + /** + * Audio only. The amount of padding (in samples) appended by the encoder to + * the end of the audio. I.e. this number of decoded samples must be + * discarded by the caller from the end of the stream to get the original + * audio without any trailing padding. + */ + int trailing_padding; +} AVCodecParameters; + +/** * If c is NULL, returns the first registered codec, * if c is non-NULL, returns the next registered codec after c, * or NULL if c is the last one. @@ -3900,6 +4021,48 @@ const AVClass *avcodec_get_subtitle_rect_class(void); int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); /** + * Allocate a new AVCodecParameters and set its fields to default values + * (unknown/invalid/0). The returned struct must be freed with + * avcodec_parameters_free(). + */ +AVCodecParameters *avcodec_parameters_alloc(void); + +/** + * Free an AVCodecParameters instance and everything associated with it and + * write NULL to the supplied pointer. + */ +void avcodec_parameters_free(AVCodecParameters **par); + +/** + * Copy the contents of src to dst. Any allocated fields in dst are freed and + * replaced with newly allocated duplicates of the corresponding fields in src. + * + * @return >= 0 on success, a negative AVERROR code on failure. + */ +int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src); + +/** + * Fill the parameters struct based on the values from the supplied codec + * context. Any allocated fields in par are freed and replaced with duplicates + * of the corresponding fields in codec. + * + * @return >= 0 on success, a negative AVERROR code on failure + */ +int avcodec_parameters_from_context(AVCodecParameters *par, + const AVCodecContext *codec); + +/** + * Fill the codec context based on the values from the supplied codec + * parameters. Any allocated fields in codec that have a corresponding field in + * par are freed and replaced with duplicates of the corresponding field in par. + * Fields in codec that do not have a counterpart in par are not touched. + * + * @return >= 0 on success, a negative AVERROR code on failure. + */ +int avcodec_parameters_to_context(AVCodecContext *codec, + const AVCodecParameters *par); + +/** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). * diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 073c6fa..f4312b2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3680,6 +3680,158 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) return props; } +static void codec_parameters_reset(AVCodecParameters *par) +{ + av_freep(&par->extradata); + + memset(par, 0, sizeof(*par)); + + par->codec_type = AVMEDIA_TYPE_UNKNOWN; + par->codec_id = AV_CODEC_ID_NONE; + par->format = -1; + par->field_order = AV_FIELD_UNKNOWN; + par->color_range = AVCOL_RANGE_UNSPECIFIED; + par->color_primaries = AVCOL_PRI_UNSPECIFIED; + par->color_trc = AVCOL_TRC_UNSPECIFIED; + par->color_space = AVCOL_SPC_UNSPECIFIED; + par->chroma_location = AVCHROMA_LOC_UNSPECIFIED; + par->sample_aspect_ratio = (AVRational){ 0, 1 }; +} + +AVCodecParameters *avcodec_parameters_alloc(void) +{ + AVCodecParameters *par = av_mallocz(sizeof(*par)); + + if (!par) + return NULL; + codec_parameters_reset(par); + return par; +} + +void avcodec_parameters_free(AVCodecParameters **ppar) +{ + AVCodecParameters *par = *ppar; + + if (!par) + return; + codec_parameters_reset(par); + + av_freep(ppar); +} + +int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) +{ + codec_parameters_reset(dst); + memcpy(dst, src, sizeof(*dst)); + + dst->extradata = NULL; + dst->extradata_size = 0; + if (src->extradata) { + dst->extradata = av_mallocz(src->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!dst->extradata) + return AVERROR(ENOMEM); + memcpy(dst->extradata, src->extradata, src->extradata_size); + dst->extradata_size = src->extradata_size; + } + + return 0; +} + +int avcodec_parameters_from_context(AVCodecParameters *par, + const AVCodecContext *codec) +{ + codec_parameters_reset(par); + + par->codec_type = codec->codec_type; + par->codec_id = codec->codec_id; + par->codec_tag = codec->codec_tag; + + par->bit_rate = codec->bit_rate; + par->bits_per_coded_sample = codec->bits_per_coded_sample; + par->profile = codec->profile; + par->level = codec->level; + + switch (par->codec_type) { + case AVMEDIA_TYPE_VIDEO: + par->format = codec->pix_fmt; + par->width = codec->width; + par->height = codec->height; + par->field_order = codec->field_order; + par->color_range = codec->color_range; + par->color_primaries = codec->color_primaries; + par->color_trc = codec->color_trc; + par->color_space = codec->colorspace; + par->chroma_location = codec->chroma_sample_location; + par->sample_aspect_ratio = codec->sample_aspect_ratio; + break; + case AVMEDIA_TYPE_AUDIO: + par->format = codec->sample_fmt; + par->channel_layout = codec->channel_layout; + par->channels = codec->channels; + par->sample_rate = codec->sample_rate; + par->block_align = codec->block_align; + par->initial_padding = codec->initial_padding; + break; + } + + if (codec->extradata) { + par->extradata = av_mallocz(codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!par->extradata) + return AVERROR(ENOMEM); + memcpy(par->extradata, codec->extradata, codec->extradata_size); + par->extradata_size = codec->extradata_size; + } + + return 0; +} + +int avcodec_parameters_to_context(AVCodecContext *codec, + const AVCodecParameters *par) +{ + codec->codec_type = par->codec_type; + codec->codec_id = par->codec_id; + codec->codec_tag = par->codec_tag; + + codec->bit_rate = par->bit_rate; + codec->bits_per_coded_sample = par->bits_per_coded_sample; + codec->profile = par->profile; + codec->level = par->level; + + switch (par->codec_type) { + case AVMEDIA_TYPE_VIDEO: + codec->pix_fmt = par->format; + codec->width = par->width; + codec->height = par->height; + codec->field_order = par->field_order; + codec->color_range = par->color_range; + codec->color_primaries = par->color_primaries; + codec->color_trc = par->color_trc; + codec->colorspace = par->color_space; + codec->chroma_sample_location = par->chroma_location; + codec->sample_aspect_ratio = par->sample_aspect_ratio; + break; + case AVMEDIA_TYPE_AUDIO: + codec->sample_fmt = par->format; + codec->channel_layout = par->channel_layout; + codec->channels = par->channels; + codec->sample_rate = par->sample_rate; + codec->block_align = par->block_align; + codec->initial_padding = par->initial_padding; + break; + } + + if (par->extradata) { + av_freep(&codec->extradata); + codec->extradata = av_mallocz(par->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!codec->extradata) + return AVERROR(ENOMEM); + memcpy(codec->extradata, par->extradata, par->extradata_size); + codec->extradata_size = par->extradata_size; + } + + return 0; +} + #ifdef TEST int main(void){ AVCodec *codec = NULL; diff --git a/libavcodec/version.h b/libavcodec/version.h index 13371a5..db9d16a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 32 +#define LIBAVCODEC_VERSION_MINOR 33 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ ====================================================================== diff --cc doc/APIchanges index 2e72128,9e11ccc..32969ed --- a/doc/APIchanges +++ b/doc/APIchanges @@@ -15,46 -13,18 +15,49 @@@ libavutil: 2015-08-2 API changes, most recent first: -2016-xx-xx - lavc 57.14.0 - avcodec.h ++2016-xx-xx - lavc 57.33.0 - avcodec.h + xxxxxxx - Add AVCodecParameters and its related API. + -2016-xx-xx - xxxxxxx - lavf 57.4.0 - avformat.h - Add AVFormatContext.protocol_whitelist and protocol_blacklist. - Add 'protocol_whitelist' and 'protocol_blacklist' private options for - avio_open2(). - -2016-xx-xx - lavc 57.13.0 - avcodec.h +2016-03-11 - xxxxxxx - lavf/lavc 57.28.101 + Add requirement to bitstream filtering API that returned packets with + size == 0 and side_data_elems == 0 are to be skipped by the caller. + +2016-XX-XX - xxxxxxx - lavf 57.28.100 + Add protocol blacklisting API + +2016-02-28 - xxxxxxx - lavc 57.27.101 + Validate AVFrame returned by get_buffer2 to have required + planes not NULL and unused planes set to NULL as crashes + and buffer overflow are possible with certain streams if + that is not the case. + +2016-xx-xx - xxxxxxx - lavc 57.27.100 - avcodec.h + "flags2" decoding option now allows the flag "ass_ro_flush_noop" preventing + the reset of the ASS ReadOrder field on flush. This affects the content of + AVSubtitles.rects[N]->ass when "sub_text_format" is set to "ass" (see + previous entry). + +2016-xx-xx - xxxxxxx - lavc 57.26.100 - avcodec.h + Add a "sub_text_format" subtitles decoding option allowing the values "ass" + (recommended) and "ass_with_timings" (not recommended, deprecated, default). + The default value for this option will change to "ass" at the next major + libavcodec version bump. + + The current default is "ass_with_timings" for compatibility. This means that + all subtitles text decoders currently still output ASS with timings printed + as strings in the AVSubtitles.rects[N]->ass fields. + + Setting "sub_text_format" to "ass" allows a better timing accuracy (ASS + timing is limited to a 1/100 time base, so this is relevant for any subtitles + format needing a bigger one), ease timing adjustments, and prevents the need + of removing the timing from the decoded string yourself. This form is also + known as "the Matroska form". The timing information (start time, duration) + can be found in the AVSubtitles fields. + +2016-xx-xx - lavc 57.25.0 - avcodec.h Add AVCodecContext.hw_frames_ctx. -2016-xx-xx - lavfi 6.2.0 - avfilter.h +2016-xx-xx - lavfi 6.36.0 - avfilter.h xxxxxxx avfilter.h - Add AVFilterLink.hw_frames_ctx. xxxxxxx buffersrc.h - Add AVBufferSrcParameters and functions for handling it. diff --cc libavcodec/avcodec.h index eb8b921,4d6b2d0..94993d3 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@@ -3786,6 -3336,127 +3786,127 @@@ typedef struct AVSubtitle } AVSubtitle; /** + * This struct describes the properties of an encoded stream. + * + * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must + * be allocated with avcodec_parameters_alloc() and freed with + * avcodec_parameters_free(). + */ + typedef struct AVCodecParameters { + /** + * General type of the encoded data. + */ + enum AVMediaType codec_type; + /** + * Specific type of the encoded data (the codec used). + */ + enum AVCodecID codec_id; + /** + * Additional information about the codec (corresponds to the AVI FOURCC). + */ + uint32_t codec_tag; + + /** + * Extra binary data needed for initializing the decoder, codec-dependent. + * + * Must be allocated with av_malloc() and will be freed by + * avcodec_parameters_free(). The allocated size of extradata must be at + * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding + * bytes zeroed. + */ + uint8_t *extradata; + /** + * Size of the extradata content in bytes. + */ + int extradata_size; + + /** + * - video: the pixel format, the value corresponds to enum AVPixelFormat. + * - audio: the sample format, the value corresponds to enum AVSampleFormat. + */ + int format; + + /** + * The average bitrate of the encoded data (in bits per second). + */ - int bit_rate; ++ int64_t bit_rate; + + int bits_per_coded_sample; + + /** + * Codec-specific bitstream restrictions that the stream conforms to. + */ + int profile; + int level; + + /** + * Video only. The dimensions of the video frame in pixels. + */ + int width; + int height; + + /** + * Video only. The aspect ratio (width / height) which a single pixel + * should have when displayed. + * + * When the aspect ratio is unknown / undefined, the numerator should be + * set to 0 (the denominator may have any value). + */ + AVRational sample_aspect_ratio; + + /** + * Video only. The order of the fields in interlaced video. + */ + enum AVFieldOrder field_order; + + /** + * Video only. Additional colorspace characteristics. + */ + enum AVColorRange color_range; + enum AVColorPrimaries color_primaries; + enum AVColorTransferCharacteristic color_trc; + enum AVColorSpace color_space; + enum AVChromaLocation chroma_location; + + /** + * Audio only. The channel layout bitmask. May be 0 if the channel layout is + * unknown or unspecified, otherwise the number of bits set must be equal to + * the channels field. + */ + uint64_t channel_layout; + /** + * Audio only. The number of audio channels. + */ + int channels; + /** + * Audio only. The number of audio samples per second. + */ + int sample_rate; + /** + * Audio only. The number of bytes per coded audio frame, required by some + * formats. + * + * Corresponds to nBlockAlign in WAVEFORMATEX. + */ + int block_align; + + /** + * Audio only. The amount of padding (in samples) inserted by the encoder at + * the beginning of the audio. I.e. this number of leading decoded samples + * must be discarded by the caller to get the original audio without leading + * padding. + */ + int initial_padding; + /** + * Audio only. The amount of padding (in samples) appended by the encoder to + * the end of the audio. I.e. this number of decoded samples must be + * discarded by the caller from the end of the stream to get the original + * audio without any trailing padding. + */ + int trailing_padding; + } AVCodecParameters; + + /** * If c is NULL, returns the first registered codec, * if c is non-NULL, returns the next registered codec after c, * or NULL if c is the last one. diff --cc libavcodec/utils.c index 073c6fa,86a67e1..f4312b2 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@@ -3680,22 -2441,154 +3680,174 @@@ AVCPBProperties *ff_add_cpb_side_data(A return props; } + static void codec_parameters_reset(AVCodecParameters *par) + { + av_freep(&par->extradata); + + memset(par, 0, sizeof(*par)); + + par->codec_type = AVMEDIA_TYPE_UNKNOWN; + par->codec_id = AV_CODEC_ID_NONE; + par->format = -1; + par->field_order = AV_FIELD_UNKNOWN; + par->color_range = AVCOL_RANGE_UNSPECIFIED; + par->color_primaries = AVCOL_PRI_UNSPECIFIED; + par->color_trc = AVCOL_TRC_UNSPECIFIED; + par->color_space = AVCOL_SPC_UNSPECIFIED; + par->chroma_location = AVCHROMA_LOC_UNSPECIFIED; + par->sample_aspect_ratio = (AVRational){ 0, 1 }; + } + + AVCodecParameters *avcodec_parameters_alloc(void) + { + AVCodecParameters *par = av_mallocz(sizeof(*par)); + + if (!par) + return NULL; + codec_parameters_reset(par); + return par; + } + + void avcodec_parameters_free(AVCodecParameters **ppar) + { + AVCodecParameters *par = *ppar; + + if (!par) + return; + codec_parameters_reset(par); + + av_freep(ppar); + } + + int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) + { + codec_parameters_reset(dst); + memcpy(dst, src, sizeof(*dst)); + + dst->extradata = NULL; + dst->extradata_size = 0; + if (src->extradata) { + dst->extradata = av_mallocz(src->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!dst->extradata) + return AVERROR(ENOMEM); + memcpy(dst->extradata, src->extradata, src->extradata_size); + dst->extradata_size = src->extradata_size; + } + + return 0; + } + + int avcodec_parameters_from_context(AVCodecParameters *par, + const AVCodecContext *codec) + { + codec_parameters_reset(par); + + par->codec_type = codec->codec_type; + par->codec_id = codec->codec_id; + par->codec_tag = codec->codec_tag; + + par->bit_rate = codec->bit_rate; + par->bits_per_coded_sample = codec->bits_per_coded_sample; + par->profile = codec->profile; + par->level = codec->level; + + switch (par->codec_type) { + case AVMEDIA_TYPE_VIDEO: + par->format = codec->pix_fmt; + par->width = codec->width; + par->height = codec->height; + par->field_order = codec->field_order; + par->color_range = codec->color_range; + par->color_primaries = codec->color_primaries; + par->color_trc = codec->color_trc; + par->color_space = codec->colorspace; + par->chroma_location = codec->chroma_sample_location; + par->sample_aspect_ratio = codec->sample_aspect_ratio; + break; + case AVMEDIA_TYPE_AUDIO: + par->format = codec->sample_fmt; + par->channel_layout = codec->channel_layout; + par->channels = codec->channels; + par->sample_rate = codec->sample_rate; + par->block_align = codec->block_align; + par->initial_padding = codec->initial_padding; + break; + } + + if (codec->extradata) { + par->extradata = av_mallocz(codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!par->extradata) + return AVERROR(ENOMEM); + memcpy(par->extradata, codec->extradata, codec->extradata_size); + par->extradata_size = codec->extradata_size; + } + + return 0; + } + + int avcodec_parameters_to_context(AVCodecContext *codec, + const AVCodecParameters *par) + { + codec->codec_type = par->codec_type; + codec->codec_id = par->codec_id; + codec->codec_tag = par->codec_tag; + + codec->bit_rate = par->bit_rate; + codec->bits_per_coded_sample = par->bits_per_coded_sample; + codec->profile = par->profile; + codec->level = par->level; + + switch (par->codec_type) { + case AVMEDIA_TYPE_VIDEO: + codec->pix_fmt = par->format; + codec->width = par->width; + codec->height = par->height; + codec->field_order = par->field_order; + codec->color_range = par->color_range; + codec->color_primaries = par->color_primaries; + codec->color_trc = par->color_trc; + codec->colorspace = par->color_space; + codec->chroma_sample_location = par->chroma_location; + codec->sample_aspect_ratio = par->sample_aspect_ratio; + break; + case AVMEDIA_TYPE_AUDIO: + codec->sample_fmt = par->format; + codec->channel_layout = par->channel_layout; + codec->channels = par->channels; + codec->sample_rate = par->sample_rate; + codec->block_align = par->block_align; + codec->initial_padding = par->initial_padding; + break; + } + + if (par->extradata) { + av_freep(&codec->extradata); + codec->extradata = av_mallocz(par->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!codec->extradata) + return AVERROR(ENOMEM); + memcpy(codec->extradata, par->extradata, par->extradata_size); + codec->extradata_size = par->extradata_size; + } + + return 0; + } ++ +#ifdef TEST +int main(void){ + AVCodec *codec = NULL; + int ret = 0; + avcodec_register_all(); + + while (codec = av_codec_next(codec)) { + if (av_codec_is_encoder(codec)) { + if (codec->type == AVMEDIA_TYPE_AUDIO) { + if (!codec->sample_fmts) { + av_log(NULL, AV_LOG_FATAL, "Encoder %s is missing the sample_fmts field\n", codec->name); + ret = 1; + } + } + } + } + return ret; +} +#endif /* TEST */ diff --cc libavcodec/version.h index 13371a5,d247c09..db9d16a --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -27,9 -27,9 +27,9 @@@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 14 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MAJOR 57 - #define LIBAVCODEC_VERSION_MINOR 32 ++#define LIBAVCODEC_VERSION_MINOR 33 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sun Jun 1 09:38:22 2014 +0200| [a8068346e48e123f8d3bdf4d64464d81e53e5fc7] | committer: Anton Khirnov lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8068346e48e123f8… --- doc/APIchanges | 1 + libavcodec/avcodec.h | 6 ++++++ libavcodec/utils.c | 34 ++++++++++++++++++++++------------ 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 9e11ccc..70fce18 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,7 @@ API changes, most recent first: 2016-xx-xx - lavc 57.14.0 - avcodec.h xxxxxxx - Add AVCodecParameters and its related API. + xxxxxxx - Add av_get_audio_frame_duration2(). 2016-xx-xx - xxxxxxx - lavf 57.4.0 - avformat.h Add AVFormatContext.protocol_whitelist and protocol_blacklist. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4d6b2d0..33de8ec 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4686,6 +4686,12 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id); */ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); +/** + * This function is the same as av_get_audio_frame_duration(), except it works + * with AVCodecParameters instead of an AVCodecContext. + */ +int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes); + typedef struct AVBitStreamFilterContext { void *priv_data; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 86a67e1..a9a7423 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2037,21 +2037,15 @@ int av_get_bits_per_sample(enum AVCodecID codec_id) } } -int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) +static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, + uint32_t tag, int bits_per_coded_sample, int frame_bytes) { - int id, sr, ch, ba, tag, bps; - - id = avctx->codec_id; - sr = avctx->sample_rate; - ch = avctx->channels; - ba = avctx->block_align; - tag = avctx->codec_tag; - bps = av_get_exact_bits_per_sample(avctx->codec_id); + int bps = av_get_exact_bits_per_sample(id); /* codecs with an exact constant bits per sample */ if (bps > 0 && ch > 0 && frame_bytes > 0) return (frame_bytes * 8) / (bps * ch); - bps = avctx->bits_per_coded_sample; + bps = bits_per_coded_sample; /* codecs with a fixed packet duration */ switch (id) { @@ -2155,7 +2149,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) if (ba > 0) { /* calc from frame_bytes, channels, and block_align */ int blocks = frame_bytes / ba; - switch (avctx->codec_id) { + switch (id) { case AV_CODEC_ID_ADPCM_IMA_WAV: return blocks * (1 + (ba - 4 * ch) / (4 * ch) * 8); case AV_CODEC_ID_ADPCM_IMA_DK3: @@ -2169,7 +2163,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) if (bps > 0) { /* calc from frame_bytes, channels, and bits_per_coded_sample */ - switch (avctx->codec_id) { + switch (id) { case AV_CODEC_ID_PCM_DVD: return 2 * (frame_bytes / ((bps * 2 / 8) * ch)); case AV_CODEC_ID_PCM_BLURAY: @@ -2184,6 +2178,22 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) return 0; } +int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) +{ + return get_audio_frame_duration(avctx->codec_id, avctx->sample_rate, + avctx->channels, avctx->block_align, + avctx->codec_tag, avctx->bits_per_coded_sample, + frame_bytes); +} + +int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes) +{ + return get_audio_frame_duration(par->codec_id, par->sample_rate, + par->channels, par->block_align, + par->codec_tag, par->bits_per_coded_sample, + frame_bytes); +} + #if !HAVE_THREADS int ff_thread_init(AVCodecContext *s) {

1 0

lavc: add codec parameters API
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jun 18 20:42:13 2014 +0200| [998e1b8f521b73e1ed3a13caaabcf79eb401cf0d] | committer: Anton Khirnov lavc: add codec parameters API This API is intended to allow passing around codec parameters without using full AVCodecContext (which also contains codec options and encoder/decoder state). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=998e1b8f521b73e1e… --- doc/APIchanges | 3 + libavcodec/avcodec.h | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/utils.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 4 files changed, 319 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index b84fa4e..9e11ccc 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-xx-xx - lavc 57.14.0 - avcodec.h + xxxxxxx - Add AVCodecParameters and its related API. + 2016-xx-xx - xxxxxxx - lavf 57.4.0 - avformat.h Add AVFormatContext.protocol_whitelist and protocol_blacklist. Add 'protocol_whitelist' and 'protocol_blacklist' private options for diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3deefb0..4d6b2d0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3336,6 +3336,127 @@ typedef struct AVSubtitle { } AVSubtitle; /** + * This struct describes the properties of an encoded stream. + * + * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must + * be allocated with avcodec_parameters_alloc() and freed with + * avcodec_parameters_free(). + */ +typedef struct AVCodecParameters { + /** + * General type of the encoded data. + */ + enum AVMediaType codec_type; + /** + * Specific type of the encoded data (the codec used). + */ + enum AVCodecID codec_id; + /** + * Additional information about the codec (corresponds to the AVI FOURCC). + */ + uint32_t codec_tag; + + /** + * Extra binary data needed for initializing the decoder, codec-dependent. + * + * Must be allocated with av_malloc() and will be freed by + * avcodec_parameters_free(). The allocated size of extradata must be at + * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding + * bytes zeroed. + */ + uint8_t *extradata; + /** + * Size of the extradata content in bytes. + */ + int extradata_size; + + /** + * - video: the pixel format, the value corresponds to enum AVPixelFormat. + * - audio: the sample format, the value corresponds to enum AVSampleFormat. + */ + int format; + + /** + * The average bitrate of the encoded data (in bits per second). + */ + int bit_rate; + + int bits_per_coded_sample; + + /** + * Codec-specific bitstream restrictions that the stream conforms to. + */ + int profile; + int level; + + /** + * Video only. The dimensions of the video frame in pixels. + */ + int width; + int height; + + /** + * Video only. The aspect ratio (width / height) which a single pixel + * should have when displayed. + * + * When the aspect ratio is unknown / undefined, the numerator should be + * set to 0 (the denominator may have any value). + */ + AVRational sample_aspect_ratio; + + /** + * Video only. The order of the fields in interlaced video. + */ + enum AVFieldOrder field_order; + + /** + * Video only. Additional colorspace characteristics. + */ + enum AVColorRange color_range; + enum AVColorPrimaries color_primaries; + enum AVColorTransferCharacteristic color_trc; + enum AVColorSpace color_space; + enum AVChromaLocation chroma_location; + + /** + * Audio only. The channel layout bitmask. May be 0 if the channel layout is + * unknown or unspecified, otherwise the number of bits set must be equal to + * the channels field. + */ + uint64_t channel_layout; + /** + * Audio only. The number of audio channels. + */ + int channels; + /** + * Audio only. The number of audio samples per second. + */ + int sample_rate; + /** + * Audio only. The number of bytes per coded audio frame, required by some + * formats. + * + * Corresponds to nBlockAlign in WAVEFORMATEX. + */ + int block_align; + + /** + * Audio only. The amount of padding (in samples) inserted by the encoder at + * the beginning of the audio. I.e. this number of leading decoded samples + * must be discarded by the caller to get the original audio without leading + * padding. + */ + int initial_padding; + /** + * Audio only. The amount of padding (in samples) appended by the encoder to + * the end of the audio. I.e. this number of decoded samples must be + * discarded by the caller from the end of the stream to get the original + * audio without any trailing padding. + */ + int trailing_padding; +} AVCodecParameters; + +/** * If c is NULL, returns the first registered codec, * if c is non-NULL, returns the next registered codec after c, * or NULL if c is the last one. @@ -3434,6 +3555,48 @@ const AVClass *avcodec_get_class(void); int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); /** + * Allocate a new AVCodecParameters and set its fields to default values + * (unknown/invalid/0). The returned struct must be freed with + * avcodec_parameters_free(). + */ +AVCodecParameters *avcodec_parameters_alloc(void); + +/** + * Free an AVCodecParameters instance and everything associated with it and + * write NULL to the supplied pointer. + */ +void avcodec_parameters_free(AVCodecParameters **par); + +/** + * Copy the contents of src to dst. Any allocated fields in dst are freed and + * replaced with newly allocated duplicates of the corresponding fields in src. + * + * @return >= 0 on success, a negative AVERROR code on failure. + */ +int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src); + +/** + * Fill the parameters struct based on the values from the supplied codec + * context. Any allocated fields in par are freed and replaced with duplicates + * of the corresponding fields in codec. + * + * @return >= 0 on success, a negative AVERROR code on failure + */ +int avcodec_parameters_from_context(AVCodecParameters *par, + const AVCodecContext *codec); + +/** + * Fill the codec context based on the values from the supplied codec + * parameters. Any allocated fields in codec that have a corresponding field in + * par are freed and replaced with duplicates of the corresponding field in par. + * Fields in codec that do not have a counterpart in par are not touched. + * + * @return >= 0 on success, a negative AVERROR code on failure. + */ +int avcodec_parameters_to_context(AVCodecContext *codec, + const AVCodecParameters *par); + +/** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). * diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 94ec1e8..86a67e1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2440,3 +2440,155 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) return props; } + +static void codec_parameters_reset(AVCodecParameters *par) +{ + av_freep(&par->extradata); + + memset(par, 0, sizeof(*par)); + + par->codec_type = AVMEDIA_TYPE_UNKNOWN; + par->codec_id = AV_CODEC_ID_NONE; + par->format = -1; + par->field_order = AV_FIELD_UNKNOWN; + par->color_range = AVCOL_RANGE_UNSPECIFIED; + par->color_primaries = AVCOL_PRI_UNSPECIFIED; + par->color_trc = AVCOL_TRC_UNSPECIFIED; + par->color_space = AVCOL_SPC_UNSPECIFIED; + par->chroma_location = AVCHROMA_LOC_UNSPECIFIED; + par->sample_aspect_ratio = (AVRational){ 0, 1 }; +} + +AVCodecParameters *avcodec_parameters_alloc(void) +{ + AVCodecParameters *par = av_mallocz(sizeof(*par)); + + if (!par) + return NULL; + codec_parameters_reset(par); + return par; +} + +void avcodec_parameters_free(AVCodecParameters **ppar) +{ + AVCodecParameters *par = *ppar; + + if (!par) + return; + codec_parameters_reset(par); + + av_freep(ppar); +} + +int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) +{ + codec_parameters_reset(dst); + memcpy(dst, src, sizeof(*dst)); + + dst->extradata = NULL; + dst->extradata_size = 0; + if (src->extradata) { + dst->extradata = av_mallocz(src->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!dst->extradata) + return AVERROR(ENOMEM); + memcpy(dst->extradata, src->extradata, src->extradata_size); + dst->extradata_size = src->extradata_size; + } + + return 0; +} + +int avcodec_parameters_from_context(AVCodecParameters *par, + const AVCodecContext *codec) +{ + codec_parameters_reset(par); + + par->codec_type = codec->codec_type; + par->codec_id = codec->codec_id; + par->codec_tag = codec->codec_tag; + + par->bit_rate = codec->bit_rate; + par->bits_per_coded_sample = codec->bits_per_coded_sample; + par->profile = codec->profile; + par->level = codec->level; + + switch (par->codec_type) { + case AVMEDIA_TYPE_VIDEO: + par->format = codec->pix_fmt; + par->width = codec->width; + par->height = codec->height; + par->field_order = codec->field_order; + par->color_range = codec->color_range; + par->color_primaries = codec->color_primaries; + par->color_trc = codec->color_trc; + par->color_space = codec->colorspace; + par->chroma_location = codec->chroma_sample_location; + par->sample_aspect_ratio = codec->sample_aspect_ratio; + break; + case AVMEDIA_TYPE_AUDIO: + par->format = codec->sample_fmt; + par->channel_layout = codec->channel_layout; + par->channels = codec->channels; + par->sample_rate = codec->sample_rate; + par->block_align = codec->block_align; + par->initial_padding = codec->initial_padding; + break; + } + + if (codec->extradata) { + par->extradata = av_mallocz(codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!par->extradata) + return AVERROR(ENOMEM); + memcpy(par->extradata, codec->extradata, codec->extradata_size); + par->extradata_size = codec->extradata_size; + } + + return 0; +} + +int avcodec_parameters_to_context(AVCodecContext *codec, + const AVCodecParameters *par) +{ + codec->codec_type = par->codec_type; + codec->codec_id = par->codec_id; + codec->codec_tag = par->codec_tag; + + codec->bit_rate = par->bit_rate; + codec->bits_per_coded_sample = par->bits_per_coded_sample; + codec->profile = par->profile; + codec->level = par->level; + + switch (par->codec_type) { + case AVMEDIA_TYPE_VIDEO: + codec->pix_fmt = par->format; + codec->width = par->width; + codec->height = par->height; + codec->field_order = par->field_order; + codec->color_range = par->color_range; + codec->color_primaries = par->color_primaries; + codec->color_trc = par->color_trc; + codec->colorspace = par->color_space; + codec->chroma_sample_location = par->chroma_location; + codec->sample_aspect_ratio = par->sample_aspect_ratio; + break; + case AVMEDIA_TYPE_AUDIO: + codec->sample_fmt = par->format; + codec->channel_layout = par->channel_layout; + codec->channels = par->channels; + codec->sample_rate = par->sample_rate; + codec->block_align = par->block_align; + codec->initial_padding = par->initial_padding; + break; + } + + if (par->extradata) { + av_freep(&codec->extradata); + codec->extradata = av_mallocz(par->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!codec->extradata) + return AVERROR(ENOMEM); + memcpy(codec->extradata, par->extradata, par->extradata_size); + codec->extradata_size = par->extradata_size; + } + + return 0; +} diff --git a/libavcodec/version.h b/libavcodec/version.h index 2cdad5a..d247c09 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 13 +#define LIBAVCODEC_VERSION_MINOR 14 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

1 0