January 2023 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/mlpdec: parse and use substream info bits
by Paul B Mahol 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Jan 30 19:35:36 2023 +0100| [fc9a3b584da3cf3fc1f00036be2eaf5dff903ccf] | committer: Paul B Mahol avcodec/mlpdec: parse and use substream info bits > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc9a3b584da3cf3fc… --- libavcodec/mlp_parse.c | 6 +++++- libavcodec/mlp_parse.h | 3 +++ libavcodec/mlpdec.c | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/libavcodec/mlp_parse.c b/libavcodec/mlp_parse.c index 45715352c2..924c731439 100644 --- a/libavcodec/mlp_parse.c +++ b/libavcodec/mlp_parse.c @@ -159,7 +159,11 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb) mh->num_substreams = get_bits(gb, 4); - skip_bits_long(gb, 4 + (header_size - 17) * 8); + skip_bits(gb, 2); + mh->extended_substream_info = get_bits(gb, 2); + mh->substream_info = get_bits(gb, 8); + + skip_bits_long(gb, (header_size - 18) * 8); return 0; } diff --git a/libavcodec/mlp_parse.h b/libavcodec/mlp_parse.h index f0d7b41c11..fa6e3d52dc 100644 --- a/libavcodec/mlp_parse.h +++ b/libavcodec/mlp_parse.h @@ -58,6 +58,9 @@ typedef struct MLPHeaderInfo int peak_bitrate; ///< Peak bitrate for VBR, actual bitrate (==peak) for CBR int num_substreams; ///< Number of substreams within stream + + int extended_substream_info; ///< Which substream of substreams carry 16-channel presentation + int substream_info; ///< Which substream of substreams carry 2/6/8-channel presentation } MLPHeaderInfo; static const uint8_t thd_chancount[13] = { diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 5b14a3b03b..0ee1f0982c 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -153,6 +153,12 @@ typedef struct MLPDecodeContext { /// Number of substreams contained within this stream. uint8_t num_substreams; + /// Which substream of substreams carry 16-channel presentation + uint8_t extended_substream_info; + + /// Which substream of substreams carry 2/6/8-channel presentation + uint8_t substream_info; + /// Index of the last substream to decode - further substreams are skipped. uint8_t max_decoded_substream; @@ -384,6 +390,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->access_unit_size_pow2 = mh.access_unit_size_pow2; m->num_substreams = mh.num_substreams; + m->substream_info = mh.substream_info; /* limit to decoding 3 substreams, as the 4th is used by Dolby Atmos for non-audio data */ m->max_decoded_substream = FFMIN(m->num_substreams - 1, 2); @@ -1286,7 +1293,13 @@ static int read_access_unit(AVCodecContext *avctx, AVFrame *frame, if (!s->restart_seen) goto next_substr; - if (substr > 0 && substr < m->max_decoded_substream && + if (((avctx->ch_layout.nb_channels == 6 && + ((m->substream_info >> 2) & 0x3) != 0x3) || + (avctx->ch_layout.nb_channels == 8 && + ((m->substream_info >> 4) & 0x7) != 0x7 && + ((m->substream_info >> 4) & 0x7) != 0x6 && + ((m->substream_info >> 4) & 0x7) != 0x3)) && + substr > 0 && substr < m->max_decoded_substream && (s->min_channel <= m->substream[substr - 1].max_channel)) { av_log(avctx, AV_LOG_DEBUG, "Previous substream(%d) channels overlaps current substream(%d) channels, skipping.\n",

1 0

avcodec: add media100_to_mjpegb bitstream filter and use it
by Paul B Mahol 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 31 10:18:17 2023 +0100| [00994e8be185d259fbb8346f45f09bcea4e7f750] | committer: Paul B Mahol avcodec: add media100_to_mjpegb bitstream filter and use it > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00994e8be185d259f… --- Changelog | 1 + configure | 1 + libavcodec/Makefile | 3 +- libavcodec/bitstream_filters.c | 1 + libavcodec/media100.c | 224 ------------------------------------ libavcodec/media100_to_mjpegb_bsf.c | 168 +++++++++++++++++++++++++++ libavcodec/mjpegbdec.c | 15 +++ libavcodec/version.h | 2 +- 8 files changed, 189 insertions(+), 226 deletions(-) diff --git a/Changelog b/Changelog index aa0dad13a1..c3ca10a3bb 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ version <next>: - ffmpeg CLI new options: -enc_stats_pre[_fmt], -enc_stats_post[_fmt] - hstack_vaapi, vstack_vaapi and xstack_vaapi filters - XMD ADPCM decoder and demuxer +- media100 to mjpegb bsf version 5.1: diff --git a/configure b/configure index 47790d10f5..9d78a244a3 100755 --- a/configure +++ b/configure @@ -2850,6 +2850,7 @@ lscr_decoder_select="inflate_wrapper" magicyuv_decoder_select="llviddsp" magicyuv_encoder_select="llvidencdsp" mdec_decoder_select="blockdsp bswapdsp idctdsp" +media100_decoder_select="media100_to_mjpegb_bsf mjpegb_decoder" metasound_decoder_select="lsp sinewin" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 304c2bc2e3..1fb963f820 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -485,7 +485,7 @@ OBJS-$(CONFIG_MACE6_DECODER) += mace.o OBJS-$(CONFIG_MAGICYUV_DECODER) += magicyuv.o OBJS-$(CONFIG_MAGICYUV_ENCODER) += magicyuvenc.o OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o -OBJS-$(CONFIG_MEDIA100_DECODER) += media100.o +OBJS-$(CONFIG_MEDIA100_DECODER) += mjpegbdec.o OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o twinvq.o OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o @@ -1220,6 +1220,7 @@ OBJS-$(CONFIG_HEVC_METADATA_BSF) += h265_metadata_bsf.o h265_profile_le h2645data.o OBJS-$(CONFIG_HEVC_MP4TOANNEXB_BSF) += hevc_mp4toannexb_bsf.o OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o +OBJS-$(CONFIG_MEDIA100_TO_MJPEGB_BSF) += media100_to_mjpegb_bsf.o OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o OBJS-$(CONFIG_MPEG4_UNPACK_BFRAMES_BSF) += mpeg4_unpack_bframes_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index a3bebefe5f..e8216819ca 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -43,6 +43,7 @@ extern const FFBitStreamFilter ff_hapqa_extract_bsf; extern const FFBitStreamFilter ff_hevc_metadata_bsf; extern const FFBitStreamFilter ff_hevc_mp4toannexb_bsf; extern const FFBitStreamFilter ff_imx_dump_header_bsf; +extern const FFBitStreamFilter ff_media100_to_mjpegb_bsf; extern const FFBitStreamFilter ff_mjpeg2jpeg_bsf; extern const FFBitStreamFilter ff_mjpega_dump_header_bsf; extern const FFBitStreamFilter ff_mp3_header_decompress_bsf; diff --git a/libavcodec/media100.c b/libavcodec/media100.c deleted file mode 100644 index fdfce2cac1..0000000000 --- a/libavcodec/media100.c +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Media 100 decoder - * Copyright (c) 2022 Paul B Mahol - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * Media 100 decoder. - */ - -#include <inttypes.h> - -#include "libavutil/intreadwrite.h" -#include "avcodec.h" -#include "bytestream.h" -#include "codec_internal.h" - -typedef struct Media100Context { - AVCodecContext *avctx; // wrapper context for mjpegb - AVPacket *pkt; -} Media100Context; - -static av_cold int media100_decode_init(AVCodecContext *avctx) -{ - Media100Context *ctx = avctx->priv_data; - const AVCodec *codec; - int ret; - - codec = avcodec_find_decoder(AV_CODEC_ID_MJPEGB); - if (!codec) - return AVERROR_BUG; - ctx->avctx = avcodec_alloc_context3(codec); - if (!ctx->avctx) - return AVERROR(ENOMEM); - ctx->avctx->thread_count = 1; - ctx->avctx->flags = avctx->flags; - ctx->avctx->flags2 = avctx->flags2; - ctx->avctx->width = ctx->avctx->coded_width = avctx->width; - ctx->avctx->height = ctx->avctx->coded_height = avctx->height; - - ret = avcodec_open2(ctx->avctx, codec, NULL); - if (ret < 0) - return ret; - - ctx->pkt = av_packet_alloc(); - if (!ctx->pkt) - return AVERROR(ENOMEM); - - return 0; -} - -static int media100_decode_frame(AVCodecContext *avctx, - AVFrame *frame, int *got_frame, - AVPacket *avpkt) -{ - Media100Context *ctx = avctx->priv_data; - unsigned second_field_offset = 0; - unsigned next_field = 0; - unsigned dht_offset[2]; - unsigned dqt_offset[2]; - unsigned sod_offset[2]; - unsigned sof_offset[2]; - unsigned sos_offset[2]; - unsigned field = 0; - GetByteContext gb; - PutByteContext pb; - AVPacket *pkt; - int ret; - - if (avpkt->size + 1024 > ctx->pkt->size) { - ret = av_grow_packet(ctx->pkt, avpkt->size + 1024 - ctx->pkt->size); - if (ret < 0) - return ret; - } - - ret = av_packet_make_writable(ctx->pkt); - if (ret < 0) - return ret; - - bytestream2_init(&gb, avpkt->data, avpkt->size); - bytestream2_init_writer(&pb, ctx->pkt->data, ctx->pkt->size); - -second_field: - bytestream2_put_be32(&pb, 0); - bytestream2_put_be32(&pb, AV_RB32("mjpg")); - bytestream2_put_be32(&pb, 0); - bytestream2_put_be32(&pb, 0); - for (int i = 0; i < 6; i++) - bytestream2_put_be32(&pb, 0); - - sof_offset[field] = bytestream2_tell_p(&pb); - bytestream2_put_be16(&pb, 17); - bytestream2_put_byte(&pb, 8); - bytestream2_put_be16(&pb, avctx->height / 2); - bytestream2_put_be16(&pb, avctx->width); - bytestream2_put_byte(&pb, 3); - bytestream2_put_byte(&pb, 1); - bytestream2_put_byte(&pb, 0x21); - bytestream2_put_byte(&pb, 0); - bytestream2_put_byte(&pb, 2); - bytestream2_put_byte(&pb, 0x11); - bytestream2_put_byte(&pb, 1); - bytestream2_put_byte(&pb, 3); - bytestream2_put_byte(&pb, 0x11); - bytestream2_put_byte(&pb, 1); - - sos_offset[field] = bytestream2_tell_p(&pb); - bytestream2_put_be16(&pb, 12); - bytestream2_put_byte(&pb, 3); - bytestream2_put_byte(&pb, 1); - bytestream2_put_byte(&pb, 0); - bytestream2_put_byte(&pb, 2); - bytestream2_put_byte(&pb, 0x11); - bytestream2_put_byte(&pb, 3); - bytestream2_put_byte(&pb, 0x11); - bytestream2_put_byte(&pb, 0); - bytestream2_put_byte(&pb, 0); - bytestream2_put_byte(&pb, 0); - - dqt_offset[field] = bytestream2_tell_p(&pb); - bytestream2_put_be16(&pb, 132); - bytestream2_put_byte(&pb, 0); - bytestream2_skip(&gb, 4); - for (int i = 0; i < 64; i++) - bytestream2_put_byte(&pb, bytestream2_get_be32(&gb)); - bytestream2_put_byte(&pb, 1); - for (int i = 0; i < 64; i++) - bytestream2_put_byte(&pb, bytestream2_get_be32(&gb)); - - dht_offset[field] = 0; - sod_offset[field] = bytestream2_tell_p(&pb); - - for (int i = bytestream2_tell(&gb) + 8; next_field == 0 && i < avpkt->size - 4; i++) { - if (AV_RB32(avpkt->data + i) == 0x00000001) { - next_field = i; - break; - } - } - - bytestream2_skip(&gb, 8); - bytestream2_copy_buffer(&pb, &gb, next_field - bytestream2_tell(&gb)); - bytestream2_put_be64(&pb, 0); - - if (field == 0) { - field = 1; - second_field_offset = bytestream2_tell_p(&pb); - next_field = avpkt->size; - goto second_field; - } - - pkt = ctx->pkt; - - AV_WB32(pkt->data + 8, second_field_offset); - AV_WB32(pkt->data + 12, second_field_offset); - AV_WB32(pkt->data + 16, second_field_offset); - AV_WB32(pkt->data + 20, dqt_offset[0]); - AV_WB32(pkt->data + 24, dht_offset[0]); - AV_WB32(pkt->data + 28, sof_offset[0]); - AV_WB32(pkt->data + 32, sos_offset[0]); - AV_WB32(pkt->data + 36, sod_offset[0]); - - AV_WB32(pkt->data + second_field_offset + 8, bytestream2_tell_p(&pb) - second_field_offset); - AV_WB32(pkt->data + second_field_offset + 12, bytestream2_tell_p(&pb) - second_field_offset); - AV_WB32(pkt->data + second_field_offset + 16, 0); - AV_WB32(pkt->data + second_field_offset + 20, dqt_offset[1] - second_field_offset); - AV_WB32(pkt->data + second_field_offset + 24, dht_offset[1]); - AV_WB32(pkt->data + second_field_offset + 28, sof_offset[1] - second_field_offset); - AV_WB32(pkt->data + second_field_offset + 32, sos_offset[1] - second_field_offset); - AV_WB32(pkt->data + second_field_offset + 36, sod_offset[1] - second_field_offset); - - pkt->size = bytestream2_tell_p(&pb); - - ret = avcodec_send_packet(ctx->avctx, pkt); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); - return ret; - } - - ret = avcodec_receive_frame(ctx->avctx, frame); - if (ret < 0) - return ret; - - *got_frame = 1; - - return avpkt->size; -} - -static av_cold int media100_decode_end(AVCodecContext *avctx) -{ - Media100Context *ctx = avctx->priv_data; - - avcodec_free_context(&ctx->avctx); - av_packet_free(&ctx->pkt); - - return 0; -} - -const FFCodec ff_media100_decoder = { - .p.name = "media100", - CODEC_LONG_NAME("Media 100"), - .p.type = AVMEDIA_TYPE_VIDEO, - .p.id = AV_CODEC_ID_MEDIA100, - .priv_data_size = sizeof(Media100Context), - .init = media100_decode_init, - .close = media100_decode_end, - FF_CODEC_DECODE_CB(media100_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, -}; diff --git a/libavcodec/media100_to_mjpegb_bsf.c b/libavcodec/media100_to_mjpegb_bsf.c new file mode 100644 index 0000000000..6e117ae20f --- /dev/null +++ b/libavcodec/media100_to_mjpegb_bsf.c @@ -0,0 +1,168 @@ +/* + * Media 100 to MJPEGB bitstream filter + * Copyright (c) 2023 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Media 100 to MJPEGB bitstream filter. + */ + +#include "libavutil/intreadwrite.h" +#include "bsf.h" +#include "bsf_internal.h" +#include "bytestream.h" + +static av_cold int init(AVBSFContext *ctx) +{ + ctx->par_out->codec_id = AV_CODEC_ID_MJPEGB; + return 0; +} + +static int filter(AVBSFContext *ctx, AVPacket *out) +{ + unsigned second_field_offset = 0; + unsigned next_field = 0; + unsigned dht_offset[2]; + unsigned dqt_offset[2]; + unsigned sod_offset[2]; + unsigned sof_offset[2]; + unsigned sos_offset[2]; + unsigned field = 0; + GetByteContext gb; + PutByteContext pb; + AVPacket *in; + int ret; + + ret = ff_bsf_get_packet(ctx, &in); + if (ret < 0) + return ret; + + ret = av_new_packet(out, in->size + 1024); + if (ret < 0) + goto fail; + + bytestream2_init(&gb, in->data, in->size); + bytestream2_init_writer(&pb, out->data, out->size); + +second_field: + bytestream2_put_be32(&pb, 0); + bytestream2_put_be32(&pb, AV_RB32("mjpg")); + bytestream2_put_be32(&pb, 0); + bytestream2_put_be32(&pb, 0); + for (int i = 0; i < 6; i++) + bytestream2_put_be32(&pb, 0); + + sof_offset[field] = bytestream2_tell_p(&pb); + bytestream2_put_be16(&pb, 17); + bytestream2_put_byte(&pb, 8); + bytestream2_put_be16(&pb, ctx->par_in->height / 2); + bytestream2_put_be16(&pb, ctx->par_in->width); + bytestream2_put_byte(&pb, 3); + bytestream2_put_byte(&pb, 1); + bytestream2_put_byte(&pb, 0x21); + bytestream2_put_byte(&pb, 0); + bytestream2_put_byte(&pb, 2); + bytestream2_put_byte(&pb, 0x11); + bytestream2_put_byte(&pb, 1); + bytestream2_put_byte(&pb, 3); + bytestream2_put_byte(&pb, 0x11); + bytestream2_put_byte(&pb, 1); + + sos_offset[field] = bytestream2_tell_p(&pb); + bytestream2_put_be16(&pb, 12); + bytestream2_put_byte(&pb, 3); + bytestream2_put_byte(&pb, 1); + bytestream2_put_byte(&pb, 0); + bytestream2_put_byte(&pb, 2); + bytestream2_put_byte(&pb, 0x11); + bytestream2_put_byte(&pb, 3); + bytestream2_put_byte(&pb, 0x11); + bytestream2_put_byte(&pb, 0); + bytestream2_put_byte(&pb, 0); + bytestream2_put_byte(&pb, 0); + + dqt_offset[field] = bytestream2_tell_p(&pb); + bytestream2_put_be16(&pb, 132); + bytestream2_put_byte(&pb, 0); + bytestream2_skip(&gb, 4); + for (int i = 0; i < 64; i++) + bytestream2_put_byte(&pb, bytestream2_get_be32(&gb)); + bytestream2_put_byte(&pb, 1); + for (int i = 0; i < 64; i++) + bytestream2_put_byte(&pb, bytestream2_get_be32(&gb)); + + dht_offset[field] = 0; + sod_offset[field] = bytestream2_tell_p(&pb); + + for (int i = bytestream2_tell(&gb) + 8; next_field == 0 && i < in->size - 4; i++) { + if (AV_RB32(in->data + i) == 0x00000001) { + next_field = i; + break; + } + } + + bytestream2_skip(&gb, 8); + bytestream2_copy_buffer(&pb, &gb, next_field - bytestream2_tell(&gb)); + bytestream2_put_be64(&pb, 0); + + if (field == 0) { + field = 1; + second_field_offset = bytestream2_tell_p(&pb); + next_field = in->size; + goto second_field; + } + + AV_WB32(out->data + 8, second_field_offset); + AV_WB32(out->data + 12, second_field_offset); + AV_WB32(out->data + 16, second_field_offset); + AV_WB32(out->data + 20, dqt_offset[0]); + AV_WB32(out->data + 24, dht_offset[0]); + AV_WB32(out->data + 28, sof_offset[0]); + AV_WB32(out->data + 32, sos_offset[0]); + AV_WB32(out->data + 36, sod_offset[0]); + + AV_WB32(out->data + second_field_offset + 8, bytestream2_tell_p(&pb) - second_field_offset); + AV_WB32(out->data + second_field_offset + 12, bytestream2_tell_p(&pb) - second_field_offset); + AV_WB32(out->data + second_field_offset + 16, 0); + AV_WB32(out->data + second_field_offset + 20, dqt_offset[1] - second_field_offset); + AV_WB32(out->data + second_field_offset + 24, dht_offset[1]); + AV_WB32(out->data + second_field_offset + 28, sof_offset[1] - second_field_offset); + AV_WB32(out->data + second_field_offset + 32, sos_offset[1] - second_field_offset); + AV_WB32(out->data + second_field_offset + 36, sod_offset[1] - second_field_offset); + + out->size = bytestream2_tell_p(&pb); + + ret = av_packet_copy_props(out, in); + if (ret < 0) + goto fail; + +fail: + if (ret < 0) + av_packet_unref(out); + av_packet_free(&in); + return ret; +} + +const FFBitStreamFilter ff_media100_to_mjpegb_bsf = { + .p.name = "media100_to_mjpegb", + .p.codec_ids = (const enum AVCodecID []){ AV_CODEC_ID_MEDIA100, AV_CODEC_ID_NONE }, + .init = init, + .filter = filter, +}; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 6d422e7a29..4db1d9a89d 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -168,3 +168,18 @@ const FFCodec ff_mjpegb_decoder = { .p.max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; + +const FFCodec ff_media100_decoder = { + .p.name = "media100", + CODEC_LONG_NAME("Media 100"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_MEDIA100, + .priv_data_size = sizeof(MJpegDecodeContext), + .init = ff_mjpeg_decode_init, + .close = ff_mjpeg_decode_end, + FF_CODEC_DECODE_CB(mjpegb_decode_frame), + .p.capabilities = AV_CODEC_CAP_DR1, + .p.max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .bsfs = "media100_to_mjpegb", +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 2ed4ef5547..499c6bb175 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 60 +#define LIBAVCODEC_VERSION_MINOR 61 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

1 0

avcodec/libjxl: respect AVCodecContext->bits_per_raw_sample
by Leo Izen 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Leo Izen <leo.izen(a)gmail.com> | Fri Jan 27 06:47:15 2023 -0500| [fb823161a8e3dfc864a7bd83a9b968f4912c5b1d] | committer: Leo Izen avcodec/libjxl: respect AVCodecContext->bits_per_raw_sample libjxl only accepts 16-bit buffers with its API, but it can accept 9-bit to 15-bit input via a 16-bit buffer, provided the flag is set declaring the buffer to be of the respective significant depth. Likewise, it can only provide pixel data on decode as a 16-bit buffer (if higher than 8) but does provide the metadata tagging the actual bit depth. This commit causes libjxlenc.c and libjxldec.c to respect this metadata and tag/read it accordingly from AVCodecContext->bits_per_raw_sample. Signed-off-by: Leo Izen <leo.izen(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb823161a8e3dfc86… --- libavcodec/libjxldec.c | 17 +++++++++++++---- libavcodec/libjxlenc.c | 10 +++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index c85cfa3d69..abe08eb400 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -47,6 +47,7 @@ typedef struct LibJxlDecodeContext { JxlDecoder *decoder; JxlBasicInfo basic_info; JxlPixelFormat jxl_pixfmt; + JxlBitDepth jxl_bit_depth; JxlDecoderStatus events; AVBufferRef *iccp; } LibJxlDecodeContext; @@ -93,10 +94,14 @@ static av_cold int libjxl_decode_init(AVCodecContext *avctx) return libjxl_init_jxl_decoder(avctx); } -static enum AVPixelFormat libjxl_get_pix_fmt(void *avctx, const JxlBasicInfo *basic_info, JxlPixelFormat *format) +static enum AVPixelFormat libjxl_get_pix_fmt(AVCodecContext *avctx, const JxlBasicInfo *basic_info, + JxlPixelFormat *format, JxlBitDepth *depth) { format->endianness = JXL_NATIVE_ENDIAN; format->num_channels = basic_info->num_color_channels + (basic_info->alpha_bits > 0); + depth->bits_per_sample = avctx->bits_per_raw_sample = basic_info->bits_per_sample; + depth->type = JXL_BIT_DEPTH_FROM_PIXEL_FORMAT; + depth->exponent_bits_per_sample = basic_info->exponent_bits_per_sample; /* Gray */ if (basic_info->num_color_channels == 1) { if (basic_info->bits_per_sample <= 8) { @@ -119,10 +124,10 @@ static enum AVPixelFormat libjxl_get_pix_fmt(void *avctx, const JxlBasicInfo *ba format->data_type = JXL_TYPE_UINT8; return basic_info->alpha_bits ? AV_PIX_FMT_RGBA : AV_PIX_FMT_RGB24; } - if (basic_info->bits_per_sample > 16) - av_log(avctx, AV_LOG_WARNING, "Downsampling larger integer to 16-bit via libjxl\n"); if (basic_info->exponent_bits_per_sample) av_log(avctx, AV_LOG_WARNING, "Downsampling float to 16-bit integer via libjxl\n"); + else if (basic_info->bits_per_sample > 16) + av_log(avctx, AV_LOG_WARNING, "Downsampling larger integer to 16-bit via libjxl\n"); format->data_type = JXL_TYPE_UINT16; return basic_info->alpha_bits ? AV_PIX_FMT_RGBA64 : AV_PIX_FMT_RGB48; } @@ -367,7 +372,7 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f av_log(avctx, AV_LOG_ERROR, "Bad libjxl basic info event\n"); return AVERROR_EXTERNAL; } - avctx->pix_fmt = libjxl_get_pix_fmt(avctx, &ctx->basic_info, &ctx->jxl_pixfmt); + avctx->pix_fmt = libjxl_get_pix_fmt(avctx, &ctx->basic_info, &ctx->jxl_pixfmt, &ctx->jxl_bit_depth); if (avctx->pix_fmt == AV_PIX_FMT_NONE) { av_log(avctx, AV_LOG_ERROR, "Bad libjxl pixel format\n"); return AVERROR_EXTERNAL; @@ -390,6 +395,10 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f av_log(avctx, AV_LOG_ERROR, "Bad libjxl dec need image out buffer event\n"); return AVERROR_EXTERNAL; } + if (JxlDecoderSetImageOutBitDepth(ctx->decoder, &ctx->jxl_bit_depth) != JXL_DEC_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Error setting output bit depth\n"); + return AVERROR_EXTERNAL; + } continue; case JXL_DEC_FULL_IMAGE: /* full image is one frame, even if animated */ diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 06581b268d..c51024f180 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -250,6 +250,7 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra JxlBasicInfo info; JxlColorEncoding jxl_color; JxlPixelFormat jxl_fmt; + JxlBitDepth jxl_bit_depth; JxlEncoderStatus jret; int ret; size_t available = ctx->buffer_size; @@ -269,17 +270,22 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra info.ysize = frame->height; info.num_extra_channels = (jxl_fmt.num_channels + 1) % 2; info.num_color_channels = jxl_fmt.num_channels - info.num_extra_channels; - info.bits_per_sample = av_get_bits_per_pixel(pix_desc) / jxl_fmt.num_channels; + jxl_bit_depth.bits_per_sample = av_get_bits_per_pixel(pix_desc) / jxl_fmt.num_channels; + info.bits_per_sample = avctx->bits_per_raw_sample > 0 && !(pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) + ? avctx->bits_per_raw_sample : jxl_bit_depth.bits_per_sample; info.alpha_bits = (info.num_extra_channels > 0) * info.bits_per_sample; if (pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) { info.exponent_bits_per_sample = info.bits_per_sample > 16 ? 8 : 5; info.alpha_exponent_bits = info.alpha_bits ? info.exponent_bits_per_sample : 0; jxl_fmt.data_type = info.bits_per_sample > 16 ? JXL_TYPE_FLOAT : JXL_TYPE_FLOAT16; + jxl_bit_depth.exponent_bits_per_sample = info.exponent_bits_per_sample; } else { info.exponent_bits_per_sample = 0; info.alpha_exponent_bits = 0; jxl_fmt.data_type = info.bits_per_sample <= 8 ? JXL_TYPE_UINT8 : JXL_TYPE_UINT16; + jxl_bit_depth.exponent_bits_per_sample = 0; } + jxl_bit_depth.type = JXL_BIT_DEPTH_FROM_PIXEL_FORMAT; /* JPEG XL format itself does not support limited range */ if (avctx->color_range == AVCOL_RANGE_MPEG || @@ -356,6 +362,8 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra av_log(avctx, AV_LOG_WARNING, "Could not set ICC Profile\n"); if (JxlEncoderSetColorEncoding(ctx->encoder, &jxl_color) != JXL_ENC_SUCCESS) av_log(avctx, AV_LOG_WARNING, "Failed to set JxlColorEncoding\n"); + if (JxlEncoderSetFrameBitDepth(ctx->options, &jxl_bit_depth) != JXL_ENC_SUCCESS) + av_log(avctx, AV_LOG_WARNING, "Failed to set JxlBitDepth\n"); /* depending on basic info, level 10 might * be required instead of level 5 */

1 0

avcodec/mfenc: fix double-free on init failure
by Cameron Gutman 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Cameron Gutman <aicommander(a)gmail.com> | Fri Jan 20 19:20:30 2023 -0600| [669ff26bc283c39334e7df3a81fd0db0088a7442] | committer: Martin Storsjö avcodec/mfenc: fix double-free on init failure mfenc sets FF_CODEC_CAP_INIT_CLEANUP, so calling mf_close() on failure inside mf_init() results in a double-free. Signed-off-by: Cameron Gutman <aicommander(a)gmail.com> Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=669ff26bc283c3933… --- libavcodec/mfenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 36a6d8482d..f3415df10b 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -1214,7 +1214,6 @@ static int mf_init(AVCodecContext *avctx) return 0; } } - mf_close(avctx); return ret; }

1 0

mov: Reduce the verbosity of the warning about fragmented MP4 vs advanced edit lists
by Martin Storsjö 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Tue Jan 17 10:56:54 2023 +0200| [431f6260ac6408fdccfe06dd5276084b17c3557f] | committer: Martin Storsjö mov: Reduce the verbosity of the warning about fragmented MP4 vs advanced edit lists Only warn if the advanced_editlist option is enabled (it is enabled by default though) so we don't print one warning for each track, and demote the warning to AV_LOG_LEVEL_VERBOSE; this message does get generated whenever parsing a fragmented MP4 file, regardless of whether the file actually uses multiple edits or not. Later when parsing the mov structures, the demuxer does warn if the file did contain multiple edits which would require the advanced_editlist option enabled for decoding correctly. Adjust the warning message for the case when the file seemed like it actually would have needed handling of advanced edit lists, to reflect the fact that it doesn't help to try set the option as it has been automatically disabled. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=431f6260ac6408fdc… --- libavformat/isom.h | 1 + libavformat/mov.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 64fb7065d5..5107b4eb74 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -286,6 +286,7 @@ typedef struct MOVContext { int use_absolute_path; int ignore_editlist; int advanced_editlist; + int advanced_editlist_autodisabled; int ignore_chapters; int seek_individually; int64_t next_root_atom; ///< offset of the next root atom diff --git a/libavformat/mov.c b/libavformat/mov.c index e0b7df2815..6ab43b00c6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4063,10 +4063,15 @@ static void mov_build_index(MOVContext *mov, AVStream *st) } } - if (multiple_edits && !mov->advanced_editlist) - av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, " - "Use -advanced_editlist to correctly decode otherwise " - "a/v desync might occur\n"); + if (multiple_edits && !mov->advanced_editlist) { + if (mov->advanced_editlist_autodisabled) + av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, " + "not supported in fragmented MP4 files\n"); + else + av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, " + "Use -advanced_editlist to correctly decode otherwise " + "a/v desync might occur\n"); + } /* adjust first dts according to edit list */ if ((empty_duration || start_time) && mov->time_scale > 0) { @@ -4507,10 +4512,13 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) * It cannot be used with use_mfra_for = {pts,dts} either, as the index * is not complete, but filled in as more trun atoms are read, as well. */ - if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO) { - av_log(c->fc, AV_LOG_WARNING, "advanced_editlist does not work with fragmented " + if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO && + c->advanced_editlist) { + + av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented " "MP4. disabling.\n"); c->advanced_editlist = 0; + c->advanced_editlist_autodisabled = 1; } mov_build_index(c, st);

1 0

lavu/video_enc_params: Avoid relying on an undefined C construct
by Martin Storsjö 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Mon Jan 16 00:20:24 2023 +0200| [01f58f36465a13db069641cca47fa9777f03b875] | committer: Martin Storsjö lavu/video_enc_params: Avoid relying on an undefined C construct The construct of using offsetof on a (potentially anonymous) struct defined within the offsetof expression, while supported by all current compilers, has been declared explicitly undefined by the C standards committee [1]. Clang recently got a change to identify this as an issue [2]; initially it was treated as a hard error, but it was soon after softened into a warning under the -Wgnu-offsetof-extensions option (not enabled automatically as part of -Wall though). Nevertheless - in this particular case, it's trivial to fix the code not to rely on the construct that the standards committee has explicitly called out as undefined. [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm [2] https://reviews.llvm.org/D133574 Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01f58f36465a13db0… --- libavutil/video_enc_params.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/video_enc_params.c b/libavutil/video_enc_params.c index 54bfed0ed9..33592dc128 100644 --- a/libavutil/video_enc_params.c +++ b/libavutil/video_enc_params.c @@ -27,11 +27,11 @@ AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type, unsigned int nb_blocks, size_t *out_size) { - const size_t blocks_offset = offsetof( - struct { - AVVideoEncParams p; - AVVideoBlockParams b; - }, b); + struct TestStruct { + AVVideoEncParams p; + AVVideoBlockParams b; + }; + const size_t blocks_offset = offsetof(struct TestStruct, b); size_t size = blocks_offset; AVVideoEncParams *par;

1 0

fftools/ffmpeg: support input frame params in encoding stats
by Anton Khirnov 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Jan 27 12:19:16 2023 +0100| [806ecace91d5b5e7c0f10b69746a57fd0d8a51f9] | committer: Anton Khirnov fftools/ffmpeg: support input frame params in encoding stats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=806ecace91d5b5e7c… --- doc/ffmpeg.texi | 17 +++++++++++++++ fftools/ffmpeg.c | 54 +++++++++++++++++++++++++++++++++++++++++++---- fftools/ffmpeg.h | 6 ++++++ fftools/ffmpeg_mux_init.c | 21 ++++++++++++++++-- 4 files changed, 92 insertions(+), 6 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 7f445022a0..81e04f6983 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -2082,18 +2082,35 @@ Index of the output stream in the file. Frame number. Pre-encoding: number of frames sent to the encoder so far. Post-encoding: number of packets received from the encoder so far. +@item ni +Input frame number. Index of the input frame (i.e. output by a decoder) that +corresponds to this output frame or packet. -1 if unavailable. + @item tb Encoder timebase, as a rational number @var{num/den}. Note that this may be different from the timebase used by the muxer. +@item tbi +Timebase for @var{ptsi}, as a rational number @var{num/den}. Available when +@var{ptsi} is available, @var{0/1} otherwise. + @item pts Presentation timestamp of the frame or packet, as an integer. Should be multiplied by the timebase to compute presentation time. +@item ptsi +Presentation timestamp of the input frame (see @var{ni}), as an integer. Should +be multiplied by @var{tbi} to compute presentation time. Printed as +(2^63 - 1 = 9223372036854775807) when not available. + @item t Presentation time of the frame or packet, as a decimal number. Equal to @var{pts} multiplied by @var{tb}. +@item ti +Presentation time of the input frame (see @var{ni}), as a decimal number. Equal +to @var{ptsi} multiplied by @var{tbi}. Printed as inf when not available. + @item dts Decoding timestamp of the packet, as an integer. Should be multiplied by the timebase to compute presentation time. Post-encoding only. diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 3ad432ff54..92fd61f315 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -113,6 +113,13 @@ const int program_birth_year = 2000; static FILE *vstats_file; +// optionally attached as opaque_ref to decoded AVFrames +typedef struct FrameData { + uint64_t idx; + int64_t pts; + AVRational tb; +} FrameData; + typedef struct BenchmarkTimeStamps { int64_t real_usec; int64_t user_usec; @@ -807,6 +814,17 @@ static void enc_stats_write(OutputStream *ost, EncStats *es, AVRational tb = ost->enc_ctx->time_base; int64_t pts = frame ? frame->pts : pkt->pts; + AVRational tbi = (AVRational){ 0, 1}; + int64_t ptsi = INT64_MAX; + + const FrameData *fd; + + if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) { + fd = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data); + tbi = fd->tb; + ptsi = fd->pts; + } + for (size_t i = 0; i < es->nb_components; i++) { const EncStatsComponent *c = &es->components[i]; @@ -815,8 +833,13 @@ static void enc_stats_write(OutputStream *ost, EncStats *es, case ENC_STATS_FILE_IDX: avio_printf(io, "%d", ost->file_index); continue; case ENC_STATS_STREAM_IDX: avio_printf(io, "%d", ost->index); continue; case ENC_STATS_TIMEBASE: avio_printf(io, "%d/%d", tb.num, tb.den); continue; + case ENC_STATS_TIMEBASE_IN: avio_printf(io, "%d/%d", tbi.num, tbi.den); continue; case ENC_STATS_PTS: avio_printf(io, "%"PRId64, pts); continue; + case ENC_STATS_PTS_IN: avio_printf(io, "%"PRId64, ptsi); continue; case ENC_STATS_PTS_TIME: avio_printf(io, "%g", pts * av_q2d(tb)); continue; + case ENC_STATS_PTS_TIME_IN: avio_printf(io, "%g", ptsi == INT64_MAX ? + INFINITY : ptsi * av_q2d(tbi)); continue; + case ENC_STATS_FRAME_NUM_IN: avio_printf(io, "%"PRIu64, fd ? fd->idx : -1); continue; } if (frame) { @@ -2034,7 +2057,8 @@ static int ifilter_send_eof(InputFilter *ifilter, int64_t pts) // There is the following difference: if you got a frame, you must call // it again with pkt=NULL. pkt==NULL is treated differently from pkt->size==0 // (pkt==NULL means get more output, pkt->size==0 is a flush/drain packet) -static int decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt) +static int decode(InputStream *ist, AVCodecContext *avctx, + AVFrame *frame, int *got_frame, AVPacket *pkt) { int ret; @@ -2051,8 +2075,24 @@ static int decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacke ret = avcodec_receive_frame(avctx, frame); if (ret < 0 && ret != AVERROR(EAGAIN)) return ret; - if (ret >= 0) + if (ret >= 0) { + if (ist->want_frame_data) { + FrameData *fd; + + av_assert0(!frame->opaque_ref); + frame->opaque_ref = av_buffer_allocz(sizeof(*fd)); + if (!frame->opaque_ref) { + av_frame_unref(frame); + return AVERROR(ENOMEM); + } + fd = (FrameData*)frame->opaque_ref->data; + fd->pts = frame->pts; + fd->tb = avctx->pkt_timebase; + fd->idx = avctx->frame_number - 1; + } + *got_frame = 1; + } return 0; } @@ -2084,7 +2124,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output, AVRational decoded_frame_tb; update_benchmark(NULL); - ret = decode(avctx, decoded_frame, got_output, pkt); + ret = decode(ist, avctx, decoded_frame, got_output, pkt); update_benchmark("decode_audio %d.%d", ist->file_index, ist->st->index); if (ret < 0) *decode_failed = 1; @@ -2163,7 +2203,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ } update_benchmark(NULL); - ret = decode(ist->dec_ctx, decoded_frame, got_output, pkt); + ret = decode(ist, ist->dec_ctx, decoded_frame, got_output, pkt); update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index); if (ret < 0) *decode_failed = 1; @@ -3017,6 +3057,12 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, if (!av_dict_get(ost->encoder_opts, "threads", NULL, 0)) av_dict_set(&ost->encoder_opts, "threads", "auto", 0); + if (codec->capabilities & AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE) { + ret = av_dict_set(&ost->encoder_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); + if (ret < 0) + return ret; + } + ret = hw_device_setup_for_encode(ost); if (ret < 0) { snprintf(error, error_len, "Device setup failed for " diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index dddab456f7..8c976af97a 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -335,6 +335,8 @@ typedef struct InputStream { #define DECODING_FOR_OST 1 #define DECODING_FOR_FILTER 2 int processing_needed; /* non zero if the packets must be processed */ + // should attach FrameData as opaque_ref after decoding + int want_frame_data; /** * Codec parameters - to be used by the decoding/streamcopy code. @@ -493,9 +495,13 @@ enum EncStatsType { ENC_STATS_FILE_IDX, ENC_STATS_STREAM_IDX, ENC_STATS_FRAME_NUM, + ENC_STATS_FRAME_NUM_IN, ENC_STATS_TIMEBASE, + ENC_STATS_TIMEBASE_IN, ENC_STATS_PTS, ENC_STATS_PTS_TIME, + ENC_STATS_PTS_IN, + ENC_STATS_PTS_TIME_IN, ENC_STATS_DTS, ENC_STATS_DTS_TIME, ENC_STATS_SAMPLE_NUM, diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 35b115f8a6..f8ccf4a3e9 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -269,13 +269,18 @@ static int enc_stats_init(OutputStream *ost, int pre, const char *str; int pre_only:1; int post_only:1; + int need_input_data:1; } fmt_specs[] = { { ENC_STATS_FILE_IDX, "fidx" }, { ENC_STATS_STREAM_IDX, "sidx" }, { ENC_STATS_FRAME_NUM, "n" }, + { ENC_STATS_FRAME_NUM_IN, "ni", 0, 0, 1 }, { ENC_STATS_TIMEBASE, "tb" }, + { ENC_STATS_TIMEBASE_IN, "tbi", 0, 0, 1 }, { ENC_STATS_PTS, "pts" }, { ENC_STATS_PTS_TIME, "t" }, + { ENC_STATS_PTS_IN, "ptsi", 0, 0, 1 }, + { ENC_STATS_PTS_TIME_IN, "ti", 0, 0, 1 }, { ENC_STATS_DTS, "dts", 0, 1 }, { ENC_STATS_DTS_TIME, "dt", 0, 1 }, { ENC_STATS_SAMPLE_NUM, "sn", 1 }, @@ -345,6 +350,18 @@ static int enc_stats_init(OutputStream *ost, int pre, } c->type = fmt_specs[i].type; + + if (fmt_specs[i].need_input_data) { + if (ost->ist) + ost->ist->want_frame_data = 1; + else { + av_log(ost, AV_LOG_WARNING, + "Format directive '%s' is unavailable, because " + "this output stream has no associated input stream\n", + val); + } + } + break; } } @@ -428,6 +445,7 @@ static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o, ms->last_mux_dts = AV_NOPTS_VALUE; ost->st = st; + ost->ist = ist; ost->kf.ref_pts = AV_NOPTS_VALUE; st->codecpar->codec_type = type; @@ -605,8 +623,7 @@ static OutputStream *new_output_stream(Muxer *mux, const OptionsContext *o, if (ost->enc_ctx && av_get_exact_bits_per_sample(ost->enc_ctx->codec_id) == 24) av_dict_set(&ost->swr_opts, "output_sample_bits", "24", 0); - if (ist) { - ost->ist = ist; + if (ost->ist) { ost->ist->discard = 0; ost->ist->st->discard = ost->ist->user_set_discard; }

1 0

fftools/ffmpeg: use correct IO context for -enc_stats_post
by Anton Khirnov 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sun Jan 29 22:26:20 2023 +0100| [61afbc23766f1567857551eb7b2da5f8aab97c4c] | committer: Anton Khirnov fftools/ffmpeg: use correct IO context for -enc_stats_post > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61afbc23766f15678… --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9884e0c6c6..3ad432ff54 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -803,7 +803,7 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write static void enc_stats_write(OutputStream *ost, EncStats *es, const AVFrame *frame, const AVPacket *pkt) { - AVIOContext *io = ost->enc_stats_pre.io; + AVIOContext *io = es->io; AVRational tb = ost->enc_ctx->time_base; int64_t pts = frame ? frame->pts : pkt->pts;

1 0

lavu/opt: use AV_DICT_MULTIKEY in av_opt_set_dict2()
by Anton Khirnov 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sun Jan 29 22:13:33 2023 +0100| [5c36f4ef8410008d508b9ca348441903a15a6f7c] | committer: Anton Khirnov lavu/opt: use AV_DICT_MULTIKEY in av_opt_set_dict2() If the dictionary provided on input contains multiple entries for an option (relevant for flags modifying the previous value with '+' or '-') and the option is not found in the target object, only the last entry would be returned to the caller. Pass AV_DICT_MULTIKEY to av_dict_set() to make sure all such entries are returned. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c36f4ef8410008d5… --- libavutil/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 0a909a8b22..0908751752 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1752,7 +1752,7 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) while ((t = av_dict_iterate(*options, t))) { ret = av_opt_set(obj, t->key, t->value, search_flags); if (ret == AVERROR_OPTION_NOT_FOUND) - ret = av_dict_set(&tmp, t->key, t->value, 0); + ret = av_dict_set(&tmp, t->key, t->value, AV_DICT_MULTIKEY); if (ret < 0) { av_log(obj, AV_LOG_ERROR, "Error setting option %s to value %s.\n", t->key, t->value); av_dict_free(&tmp);

1 0

lavc: add null codecs
by Anton Khirnov 31 Jan '23

31 Jan '23

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Jan 27 18:41:40 2023 +0100| [e3a99041b80e915efc021f93eef1c3fddf41199c] | committer: Anton Khirnov lavc: add null codecs They discard all input without ever returning any output. Useful for development. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3a99041b80e915ef… --- libavcodec/Makefile | 4 ++ libavcodec/allcodecs.c | 6 +++ libavcodec/codec_desc.c | 12 ++++++ libavcodec/codec_id.h | 10 +++++ libavcodec/null.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 129 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 629933d85c..304c2bc2e3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -219,6 +219,8 @@ OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \ acelp_pitch_delay.o OBJS-$(CONFIG_AMV_ENCODER) += mjpegenc.o mjpegenc_common.o OBJS-$(CONFIG_ANM_DECODER) += anm.o +OBJS-$(CONFIG_ANULL_DECODER) += null.o +OBJS-$(CONFIG_ANULL_ENCODER) += null.o OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o OBJS-$(CONFIG_APAC_DECODER) += apac.o OBJS-$(CONFIG_APE_DECODER) += apedec.o @@ -747,6 +749,8 @@ OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o +OBJS-$(CONFIG_VNULL_DECODER) += null.o +OBJS-$(CONFIG_VNULL_ENCODER) += null.o OBJS-$(CONFIG_VORBIS_DECODER) += vorbisdec.o vorbisdsp.o vorbis.o \ vorbis_data.o OBJS-$(CONFIG_VORBIS_ENCODER) += vorbisenc.o vorbis.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 0deaea65b3..ff82423a88 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -884,6 +884,12 @@ extern const FFCodec ff_vp9_qsv_decoder; extern const FFCodec ff_vp9_vaapi_encoder; extern const FFCodec ff_vp9_qsv_encoder; +// null codecs +extern const FFCodec ff_vnull_decoder; +extern const FFCodec ff_vnull_encoder; +extern const FFCodec ff_anull_decoder; +extern const FFCodec ff_anull_encoder; + // The iterate API is not usable with ossfuzz due to the excessive size of binaries created #if CONFIG_OSSFUZZ const FFCodec * codec_list[] = { diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index fbb6604f76..8ab228d846 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3625,6 +3625,18 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), .props = AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_VNULL, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vnull", + .long_name = NULL_IF_CONFIG_SMALL("Null video codec"), + }, + { + .id = AV_CODEC_ID_ANULL, + .type = AVMEDIA_TYPE_AUDIO, + .name = "anull", + .long_name = NULL_IF_CONFIG_SMALL("Null audio codec"), + }, }; static int descriptor_compare(const void *key, const void *member) diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 3e84098f35..0c574c9619 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -590,6 +590,16 @@ enum AVCodecID { * stream (only used by libavformat) */ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket + /** + * Dummy null video codec, useful mainly for development and debugging. + * Null encoder/decoder discard all input and never return any output. + */ + AV_CODEC_ID_VNULL, + /** + * Dummy null audio codec, useful mainly for development and debugging. + * Null encoder/decoder discard all input and never return any output. + */ + AV_CODEC_ID_ANULL, }; /** diff --git a/libavcodec/null.c b/libavcodec/null.c new file mode 100644 index 0000000000..d8e334437c --- /dev/null +++ b/libavcodec/null.c @@ -0,0 +1,97 @@ +/* + * Null codecs + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config_components.h" + +#include "codec_internal.h" +#include "decode.h" +#include "encode.h" + +#if CONFIG_VNULL_DECODER || CONFIG_ANULL_DECODER +static int null_decode(AVCodecContext *avctx, AVFrame *frame, + int *got_frame, AVPacket *avpkt) +{ + *got_frame = 0; + return avpkt->size; +} + +#if CONFIG_VNULL_DECODER +const FFCodec ff_vnull_decoder = { + .p.name = "vnull", + CODEC_LONG_NAME("null video"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_VNULL, + .p.capabilities = AV_CODEC_CAP_DR1, + FF_CODEC_DECODE_CB(null_decode), +}; +#endif + +#if CONFIG_ANULL_DECODER +const FFCodec ff_anull_decoder = { + .p.name = "anull", + CODEC_LONG_NAME("null audio"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_ANULL, + .p.capabilities = AV_CODEC_CAP_DR1, + FF_CODEC_DECODE_CB(null_decode), +}; +#endif + +#endif + +#if CONFIG_VNULL_ENCODER || CONFIG_ANULL_ENCODER +static int null_encode(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *frame, int *got_packet) +{ + *got_packet = 0; + return 0; +} + +#if CONFIG_VNULL_ENCODER +const FFCodec ff_vnull_encoder = { + .p.name = "vnull", + CODEC_LONG_NAME("null video"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_VNULL, + FF_CODEC_ENCODE_CB(null_encode), +}; +#endif + +#if CONFIG_ANULL_ENCODER +const FFCodec ff_anull_encoder = { + .p.name = "anull", + CODEC_LONG_NAME("null audio"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_ANULL, + .p.capabilities = AV_CODEC_CAP_VARIABLE_FRAME_SIZE, + .p.sample_fmts = (const enum AVSampleFormat[]){ + AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_U8P, + AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_NONE, + }, + FF_CODEC_ENCODE_CB(null_encode), +}; +#endif + +#endif

1 0