September 2021 - ffmpeg-cvslog

avcodec/wmaprodec: add gapless support
by Paul B Mahol 02 Sep '21

02 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 2 01:09:36 2021 +0200| [61c2c9ef8e66920c8ba308e8fa9f36ae602f8245] | committer: Paul B Mahol avcodec/wmaprodec: add gapless support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61c2c9ef8e66920c8… --- libavcodec/wmaprodec.c | 158 +++++++++++++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 59 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 66271c4037..14a48db45a 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -88,6 +88,7 @@ #include <inttypes.h> +#include "libavutil/audio_fifo.h" #include "libavutil/ffmath.h" #include "libavutil/float_dsp.h" #include "libavutil/intfloat.h" @@ -192,6 +193,8 @@ typedef struct WMAProDecodeCtx { uint8_t dynamic_range_compression; ///< frame contains DRC data uint8_t bits_per_sample; ///< integer audio sample size for the unscaled IMDCT output (used to scale to [-1.0, 1.0]) uint16_t samples_per_frame; ///< number of samples to output + uint16_t trim_start; ///< number of samples to skip at start + uint16_t trim_end; ///< number of samples to skip at end uint16_t log2_frame_size; int8_t lfe_channel; ///< lfe channel index uint8_t max_num_subframes; @@ -246,9 +249,9 @@ typedef struct XMADecodeCtx { AVFrame *frames[XMA_MAX_STREAMS]; int current_stream; int num_streams; - float samples[XMA_MAX_CHANNELS][512 * 64]; - int offset[XMA_MAX_STREAMS]; + AVAudioFifo *samples[2][XMA_MAX_CHANNELS]; int start_channel[XMA_MAX_STREAMS]; + int trim_start, trim_end; } XMADecodeCtx; /** @@ -417,10 +420,7 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu } /** frame info */ - if (avctx->codec_id != AV_CODEC_ID_WMAPRO) - s->skip_frame = 0; - else - s->skip_frame = 1; /* skip first frame */ + s->skip_frame = 1; /* skip first frame */ s->packet_loss = 1; s->len_prefix = (s->decode_flags & 0x40); @@ -1462,23 +1462,14 @@ static int decode_frame(WMAProDecodeCtx *s, AVFrame *frame, int *got_frame_ptr) ff_dlog(s->avctx, "drc_gain %i\n", s->drc_gain); } - /** no idea what these are for, might be the number of samples - that need to be skipped at the beginning or end of a stream */ if (get_bits1(gb)) { - int av_unused skip; - - /** usually true for the first frame */ - if (get_bits1(gb)) { - skip = get_bits(gb, av_log2(s->samples_per_frame * 2)); - ff_dlog(s->avctx, "start skip: %i\n", skip); - } - - /** sometimes true for the last frame */ - if (get_bits1(gb)) { - skip = get_bits(gb, av_log2(s->samples_per_frame * 2)); - ff_dlog(s->avctx, "end skip: %i\n", skip); - } + if (get_bits1(gb)) + s->trim_start = get_bits(gb, av_log2(s->samples_per_frame * 2)); + if (get_bits1(gb)) + s->trim_end = get_bits(gb, av_log2(s->samples_per_frame * 2)); + } else { + s->trim_start = s->trim_end = 0; } ff_dlog(s->avctx, "BITSTREAM: frame header length was %i\n", @@ -1641,9 +1632,6 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, s->samples_per_frame * sizeof(*s->channel[i].out) >> 1); } - /* TODO: XMA should output 128 samples only (instead of 512) and WMAPRO - * maybe 768 (with 2048), XMA needs changes in multi-stream handling though. */ - s->eof_done = 1; s->packet_done = 1; *got_frame_ptr = 1; @@ -1781,6 +1769,33 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, if (s->packet_loss) return AVERROR_INVALIDDATA; + if (s->trim_start && avctx->codec_id == AV_CODEC_ID_WMAPRO) { + AVFrame *frame = data; + + if (s->trim_start < frame->nb_samples) { + for (int ch = 0; ch < frame->channels; ch++) + frame->extended_data[ch] += s->trim_start * 4; + + frame->nb_samples -= s->trim_start; + } else { + *got_frame_ptr = 0; + } + + s->trim_start = 0; + } + + if (s->trim_end && avctx->codec_id == AV_CODEC_ID_WMAPRO) { + AVFrame *frame = data; + + if (s->trim_end < frame->nb_samples) { + frame->nb_samples -= s->trim_end; + } else { + *got_frame_ptr = 0; + } + + s->trim_end = 0; + } + return get_bits_count(gb) >> 3; } @@ -1814,34 +1829,40 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data, XMADecodeCtx *s = avctx->priv_data; int got_stream_frame_ptr = 0; AVFrame *frame = data; - int i, ret, offset = INT_MAX; + int i, ret, eof; if (!s->frames[s->current_stream]->data[0]) { + avctx->internal->skip_samples = 64; s->frames[s->current_stream]->nb_samples = 512; - if ((ret = ff_get_buffer(avctx, s->frames[s->current_stream], 0)) < 0) { + if ((ret = ff_get_buffer(avctx, s->frames[s->current_stream], 0)) < 0) + return ret; + } else if (s->frames[s->current_stream]->nb_samples != 512) { + avctx->internal->skip_samples = 64; + av_frame_unref(s->frames[s->current_stream]); + s->frames[s->current_stream]->nb_samples = 512; + if ((ret = ff_get_buffer(avctx, s->frames[s->current_stream], 0)) < 0) return ret; - } } /* decode current stream packet */ ret = decode_packet(avctx, &s->xma[s->current_stream], s->frames[s->current_stream], &got_stream_frame_ptr, avpkt); - - if (got_stream_frame_ptr && s->offset[s->current_stream] >= 64) { - got_stream_frame_ptr = 0; - ret = AVERROR_INVALIDDATA; - } + eof = s->xma[s->current_stream].eof_done; + if (s->xma[s->current_stream].trim_start) + s->trim_start = s->xma[s->current_stream].trim_start; + if (s->xma[s->current_stream].trim_end) + s->trim_end = s->xma[s->current_stream].trim_end; /* copy stream samples (1/2ch) to sample buffer (Nch) */ if (got_stream_frame_ptr) { int start_ch = s->start_channel[s->current_stream]; - memcpy(&s->samples[start_ch + 0][s->offset[s->current_stream] * 512], - s->frames[s->current_stream]->extended_data[0], 512 * 4); + const int nb_samples = s->frames[s->current_stream]->nb_samples; + void *left[1] = { s->frames[s->current_stream]->extended_data[0] }; + void *right[1] = { s->frames[s->current_stream]->extended_data[1] }; + + av_audio_fifo_write(s->samples[0][start_ch + 0], left, nb_samples); if (s->xma[s->current_stream].nb_channels > 1) - memcpy(&s->samples[start_ch + 1][s->offset[s->current_stream] * 512], - s->frames[s->current_stream]->extended_data[1], 512 * 4); - s->offset[s->current_stream]++; + av_audio_fifo_write(s->samples[1][start_ch + 1], right, nb_samples); } else if (ret < 0) { - memset(s->offset, 0, sizeof(s->offset)); s->current_stream = 0; return ret; } @@ -1851,6 +1872,7 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data, * (at start there is one packet per stream, then interleave non-linearly). */ if (s->xma[s->current_stream].packet_done || s->xma[s->current_stream].packet_loss) { + int nb_samples = INT_MAX; /* select stream with 0 skip_packets (= uses next packet) */ if (s->xma[s->current_stream].skip_packets != 0) { @@ -1870,34 +1892,37 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data, } /* all other streams skip next packet */ - for (i = 0; i < s->num_streams; i++) { + for (i = 0; i < s->num_streams; i++) s->xma[i].skip_packets = FFMAX(0, s->xma[i].skip_packets - 1); - } - /* copy samples from buffer to output if possible */ for (i = 0; i < s->num_streams; i++) { - offset = FFMIN(offset, s->offset[i]); + int start_ch = s->start_channel[s->current_stream]; + + nb_samples = FFMIN(nb_samples, av_audio_fifo_size(s->samples[0][start_ch])); } - if (offset > 0) { + + /* copy samples from buffer to output if possible */ + if (nb_samples > 4096 || eof) { int bret; - frame->nb_samples = 512 * offset; + if (eof) { + nb_samples -= FFMIN(nb_samples, s->trim_end + s->trim_start - 128 - 64); + s->trim_end = s->trim_start = 0; + } + frame->nb_samples = nb_samples; + if (frame->nb_samples <= 0) + return ret; if ((bret = ff_get_buffer(avctx, frame, 0)) < 0) return bret; - /* copy samples buffer (Nch) to frame samples (Nch), move unconsumed samples */ for (i = 0; i < s->num_streams; i++) { - int start_ch = s->start_channel[i]; - memcpy(frame->extended_data[start_ch + 0], s->samples[start_ch + 0], frame->nb_samples * 4); - if (s->xma[i].nb_channels > 1) - memcpy(frame->extended_data[start_ch + 1], s->samples[start_ch + 1], frame->nb_samples * 4); - - s->offset[i] -= offset; - if (s->offset[i]) { - memmove(s->samples[start_ch + 0], s->samples[start_ch + 0] + frame->nb_samples, s->offset[i] * 4 * 512); - if (s->xma[i].nb_channels > 1) - memmove(s->samples[start_ch + 1], s->samples[start_ch + 1] + frame->nb_samples, s->offset[i] * 4 * 512); - } + const int start_ch = s->start_channel[s->current_stream]; + void *left[1] = { frame->extended_data[0] }; + void *right[1] = { frame->extended_data[1] }; + + av_audio_fifo_read(s->samples[0][start_ch + 0], left, nb_samples); + if (s->xma[s->current_stream].nb_channels > 1) + av_audio_fifo_read(s->samples[1][start_ch + 1], right, nb_samples); } *got_frame_ptr = 1; @@ -1961,6 +1986,13 @@ static av_cold int xma_decode_init(AVCodecContext *avctx) if (start_channels != avctx->channels) return AVERROR_INVALIDDATA; + for (int i = 0; i < XMA_MAX_CHANNELS; i++) { + s->samples[0][i] = av_audio_fifo_alloc(avctx->sample_fmt, 1, 64 * 512); + s->samples[1][i] = av_audio_fifo_alloc(avctx->sample_fmt, 1, 64 * 512); + if (!s->samples[0][i] || !s->samples[1][i]) + return AVERROR(ENOMEM); + } + return ret; } @@ -1975,6 +2007,11 @@ static av_cold int xma_decode_end(AVCodecContext *avctx) } s->num_streams = 0; + for (i = 0; i < XMA_MAX_CHANNELS; i++) { + av_audio_fifo_free(s->samples[0][i]); + av_audio_fifo_free(s->samples[1][i]); + } + return 0; } @@ -1989,9 +2026,9 @@ static void flush(WMAProDecodeCtx *s) s->packet_loss = 1; s->skip_packets = 0; s->eof_done = 0; + s->skip_frame = 1; } - /** *@brief Clear decoder buffers (for seeking). *@param avctx codec context @@ -2008,14 +2045,17 @@ static void xma_flush(AVCodecContext *avctx) XMADecodeCtx *s = avctx->priv_data; int i; + for (i = 0; i < XMA_MAX_CHANNELS; i++) { + av_audio_fifo_reset(s->samples[0][i]); + av_audio_fifo_reset(s->samples[1][i]); + } + for (i = 0; i < s->num_streams; i++) flush(&s->xma[i]); - memset(s->offset, 0, sizeof(s->offset)); s->current_stream = 0; } - /** *@brief wmapro decoder */

1 0

avformat: add an AV1 Low overhead bitstream format muxer
by James Almer 02 Sep '21

02 Sep '21

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Aug 27 16:34:06 2021 -0300| [8a6beccf0d8f2e6515b0ddbf5c792c2bf799500b] | committer: James Almer avformat: add an AV1 Low overhead bitstream format muxer Suggested-by: BBB Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a6beccf0d8f2e651… --- Changelog | 1 + configure | 1 + doc/general_contents.texi | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 20 ++++++++++++++++++++ libavformat/version.h | 4 ++-- 7 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 933ef9e080..5b58401183 100644 --- a/Changelog +++ b/Changelog @@ -15,6 +15,7 @@ version <next>: - adecorrelate audio filter - atilt audio filter - grayworld video filter +- AV1 Low overhead bitstream format muxer version 4.4: diff --git a/configure b/configure index 9249254b70..af410a9d11 100755 --- a/configure +++ b/configure @@ -3388,6 +3388,7 @@ mxf_opatom_muxer_select="mxf_muxer" nut_muxer_select="riffenc" nuv_demuxer_select="riffdec" obu_demuxer_select="av1_frame_merge_bsf av1_parser" +obu_muxer_select="av1_metadata_bsf" oga_muxer_select="ogg_muxer" ogg_demuxer_select="dirac_parse" ogv_muxer_select="ogg_muxer" diff --git a/doc/general_contents.texi b/doc/general_contents.texi index edc047e539..ce5fd4639d 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -599,6 +599,7 @@ library: @item raw NULL @tab X @tab @item raw video @tab X @tab X @item raw id RoQ @tab X @tab +@item raw OBU @tab X @tab X @item raw SBC @tab X @tab X @item raw Shorten @tab @tab X @item raw TAK @tab @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 7e0f587b41..f7e47563da 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -379,6 +379,7 @@ OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o OBJS-$(CONFIG_AV1_DEMUXER) += av1dec.o OBJS-$(CONFIG_OBU_DEMUXER) += av1dec.o +OBJS-$(CONFIG_OBU_MUXER) += rawenc.o OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparsecelt.o \ oggparsedirac.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 111ca3cbf0..5471f7c16f 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -305,6 +305,7 @@ extern const AVInputFormat ff_nut_demuxer; extern const AVOutputFormat ff_nut_muxer; extern const AVInputFormat ff_nuv_demuxer; extern const AVInputFormat ff_obu_demuxer; +extern const AVOutputFormat ff_obu_muxer; extern const AVOutputFormat ff_oga_muxer; extern const AVInputFormat ff_ogg_demuxer; extern const AVOutputFormat ff_ogg_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 088b62f369..ad29e71099 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -453,6 +453,26 @@ const AVOutputFormat ff_mpeg2video_muxer = { }; #endif +#if CONFIG_OBU_MUXER +static int obu_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) +{ + AVStream *st = s->streams[0]; + return ff_stream_add_bitstream_filter(st, "av1_metadata", "td=insert"); +} + +const AVOutputFormat ff_obu_muxer = { + .name = "obu", + .long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), + .extensions = "obu", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_AV1, + .init = force_one_stream, + .write_packet = ff_raw_write_packet, + .check_bitstream = obu_check_bitstream, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_RAWVIDEO_MUXER const AVOutputFormat ff_rawvideo_muxer = { .name = "rawvideo", diff --git a/libavformat/version.h b/libavformat/version.h index fc8170a3b1..13df244d97 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 4 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 5 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

avfilter/vf_scale: set the RGB matrix coefficients in case of RGB
by Jan Ekström 01 Sep '21

01 Sep '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Sun Aug 29 00:38:29 2021 +0300| [2818b143929d86f6b67695b09bc7483da5cef434] | committer: Jan Ekström avfilter/vf_scale: set the RGB matrix coefficients in case of RGB This fixes the passing through of non-RGB matrix from input to output when conversion from YCbCr to RGB happens. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2818b143929d86f6b… --- libavfilter/vf_scale.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 909080b829..ec5aa6f869 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -736,13 +736,16 @@ scale: out->width = outlink->w; out->height = outlink->h; - // Sanity check: If we've got the RGB/XYZ (identity) matrix configured, and - // the output is no longer RGB, unset the matrix. - // In theory this should be in swscale itself as the AVFrame - // based API gets in, so that not every swscale API user has - // to go through duplicating such sanity checks. - if (out->colorspace == AVCOL_SPC_RGB && - !(av_pix_fmt_desc_get(out->format)->flags & AV_PIX_FMT_FLAG_RGB)) + // Sanity checks: + // 1. If the output is RGB, set the matrix coefficients to RGB. + // 2. If the output is not RGB and we've got the RGB/XYZ (identity) + // matrix configured, unset the matrix. + // In theory these should be in swscale itself as the AVFrame + // based API gets in, so that not every swscale API user has + // to go through duplicating such sanity checks. + if (av_pix_fmt_desc_get(out->format)->flags & AV_PIX_FMT_FLAG_RGB) + out->colorspace = AVCOL_SPC_RGB; + else if (out->colorspace == AVCOL_SPC_RGB) out->colorspace = AVCOL_SPC_UNSPECIFIED; if (scale->output_is_pal)

1 0

avcodec/libx265: add support for setting chroma sample location
by Jan Ekström 01 Sep '21

01 Sep '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Sun Aug 29 19:24:12 2021 +0300| [9b2281a4a383677ded522e603514789cc22498fa] | committer: Jan Ekström avcodec/libx265: add support for setting chroma sample location Unlike libx264, libx265 does not handle the chroma format check on its own side, so in order to not write out values which are supposed to be ignored according to the specification, we limit the writing out of chroma sample location to 4:2:0 only. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b2281a4a383677de… --- libavcodec/libx265.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 71affbf61b..839b6ce9de 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -211,6 +211,19 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->vui.matrixCoeffs = avctx->colorspace; } + // chroma sample location values are to be ignored in case of non-4:2:0 + // according to the specification, so we only write them out in case of + // 4:2:0 (log2_chroma_{w,h} == 1). + ctx->params->vui.bEnableChromaLocInfoPresentFlag = + avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED && + desc->log2_chroma_w == 1 && desc->log2_chroma_h == 1; + + if (ctx->params->vui.bEnableChromaLocInfoPresentFlag) { + ctx->params->vui.chromaSampleLocTypeTopField = + ctx->params->vui.chromaSampleLocTypeBottomField = + avctx->chroma_sample_location - 1; + } + if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) { char sar[12]; int sar_num, sar_den;

1 0

fftools/cmdutils: Fix warning for initialization makes integer from pointer without a cast
by Limin Wang 01 Sep '21

01 Sep '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Fri Aug 20 19:27:26 2021 +0800| [c500dc7cca73efb1289fce7ea1c1c7118800fb84] | committer: Limin Wang fftools/cmdutils: Fix warning for initialization makes integer from pointer without a cast Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c500dc7cca73efb12… --- fftools/cmdutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 2dd035a7cf..ae341184f6 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -853,7 +853,7 @@ int opt_cpucount(void *optctx, const char *opt, const char *arg) int count; static const AVOption opts[] = { - {"count", NULL, 0, AV_OPT_TYPE_INT, { .i64 = -1}, -1, INT_MAX, NULL}, + {"count", NULL, 0, AV_OPT_TYPE_INT, { .i64 = -1}, -1, INT_MAX}, {NULL}, }; static const AVClass class = {

1 0