February 2022 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] libavutil/tests/md5: Avoid warnings
by softworkz 08 Jun '22

08 Jun '22

From: softworkz <softworkz(a)hotmail.com> Those are always showing up on Patchwork when FATE tests are failing, covering some possibly more useful information. Signed-off-by: softworkz <softworkz(a)hotmail.com> --- libavutil/tests/md5: Avoid warnings Those are always showing up on Patchwork when FATE tests are failing, covering some possibly more useful information. Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-20%2Fsoftwork… Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-20/softworkz/submit_md5-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/20 libavutil/tests/md5.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/tests/md5.c b/libavutil/tests/md5.c index 42e4538e0a..1f27c40987 100644 --- a/libavutil/tests/md5.c +++ b/libavutil/tests/md5.c @@ -33,8 +33,12 @@ int main(void) { uint8_t md5val[16]; int i; + +#if defined(__clang__) && defined(__clang_major__) && __clang_major__ < 4 volatile uint8_t in[1000]; // volatile to workaround http://llvm.org/bugs/show_bug.cgi?id=20849 - // FIXME remove volatile once it has been fixed and all fate clients are updated +#else + uint8_t in[1000]; +#endif for (i = 0; i < 1000; i++) in[i] = i * i; base-commit: 7512293cf912c65fa657eab680afd5e18fd47603 -- ffmpeg-codebot

5 8

GSoC 2022
by Thilo Borgmann 29 May '22

29 May '22

Hi! GSoC 2022 just started the org application phase. As usual, we'll send an application and need to gather project ideas for GSoC 2022. There is the 2022 GSoC page in our wiki now [1], please add your project idea before the application deadline there or send it to the ML for discussion. Application deadline is Feb. 21st. See the detailed timeline [2]. Furthermore, the project conditions as well as eligibility for contributors changed (again) this year. GSoC is not only for students anymore and project scope & schedule can be more freely choosen. See [3] for details! Thanks, Thilo [1] https://trac.ffmpeg.org/wiki/SponsoringPrograms/GSoC/2022 [2] https://developers.google.com/open-source/gsoc/timeline [3] https://opensource.googleblog.com/2021/11/expanding-google-summer-of-code-i…

2 2

[PATCH] Update ReadMe.md for PR submission and reference Developer Documentation
by softworkz 25 May '22

25 May '22

From: softworkz <softworkz(a)hotmail.com> Signed-off-by: softworkz <softworkz(a)hotmail.com> --- Update ReadMe.md for PR submission and reference Developer Documentation . Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-22%2Fsoftwork… Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-22/softworkz/patch-2-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/22 README.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8c23f2870..07f717a4f9 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,20 @@ GPL. Please refer to the LICENSE file for detailed information. ## Contributing +### Mailing List + Patches should be submitted to the ffmpeg-devel mailing list using -`git format-patch` or `git send-email`. Github pull requests should be -avoided because they are not part of our review process and will be ignored. +`git format-patch` or `git send-email` as described in the +[Developer Documentation](https://www.ffmpeg.org/developer.html#Contributing). + +### Pull Requests + +There is a new experimental way that allows submitting Pull Requests +and having them forwarded to the ffmpeg Mailing List. + +Please submit your Pull Requests here: **https://github.com/ffstaging/FFmpeg**. + +Then, follow the instructions from the automatic CodeBot response. +Besides the submission procedure, the +[Developer Documentation](https://www.ffmpeg.org/developer.html#Contributing) +applies in the same way like when submitting to the ML directly. base-commit: e1a14479a81f5366b95df543992a7fe637cf2dde -- ffmpeg-codebot

3 3

[PATCH v3 1/2] avutil/frame: Add av_frame_copy_side_data() function
by Soft Works 23 May '22

23 May '22

Signed-off-by: softworkz <softworkz(a)hotmail.com> --- V3: Split commits, add version bump, use flag param doc/APIchanges | 3 +++ libavutil/frame.c | 58 ++++++++++++++++++++++++++------------------- libavutil/frame.h | 16 +++++++++++++ libavutil/version.h | 4 ++-- 4 files changed, 54 insertions(+), 27 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index bc9f4e38da..409f66ec4d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-12-02 - xxxxxxxxxx - lavu 57.10.100 - frame.h + Add av_frame_copy_side_data() and AV_FRAME_COPY_PROPS_FORCECOPY flag. + 2021-11-22 - xxxxxxxxxx - lavu 57.9.100 - pixfmt.h Add AV_PIX_FMT_P210, AV_PIX_FMT_P410, AV_PIX_FMT_P216, and AV_PIX_FMT_P416. diff --git a/libavutil/frame.c b/libavutil/frame.c index d4d3ad6988..f5177c2667 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -256,6 +256,36 @@ int av_frame_get_buffer(AVFrame *frame, int align) return AVERROR(EINVAL); } +int av_frame_copy_side_data(AVFrame* dst, const AVFrame* src, int flags) +{ + for (unsigned i = 0; i < src->nb_side_data; i++) { + const AVFrameSideData *sd_src = src->side_data[i]; + AVFrameSideData *sd_dst; + if ( sd_src->type == AV_FRAME_DATA_PANSCAN + && (src->width != dst->width || src->height != dst->height)) + continue; + if (flags & AV_FRAME_COPY_PROPS_FORCECOPY) { + sd_dst = av_frame_new_side_data(dst, sd_src->type, + sd_src->size); + if (!sd_dst) { + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + memcpy(sd_dst->data, sd_src->data, sd_src->size); + } else { + AVBufferRef *ref = av_buffer_ref(sd_src->buf); + sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); + if (!sd_dst) { + av_buffer_unref(&ref); + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + } + av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); + } + return 0; +} + static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { int ret, i; @@ -293,31 +323,9 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) av_dict_copy(&dst->metadata, src->metadata, 0); - for (i = 0; i < src->nb_side_data; i++) { - const AVFrameSideData *sd_src = src->side_data[i]; - AVFrameSideData *sd_dst; - if ( sd_src->type == AV_FRAME_DATA_PANSCAN - && (src->width != dst->width || src->height != dst->height)) - continue; - if (force_copy) { - sd_dst = av_frame_new_side_data(dst, sd_src->type, - sd_src->size); - if (!sd_dst) { - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - memcpy(sd_dst->data, sd_src->data, sd_src->size); - } else { - AVBufferRef *ref = av_buffer_ref(sd_src->buf); - sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); - if (!sd_dst) { - av_buffer_unref(&ref); - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - } - av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); - } + if (ret = av_frame_copy_side_data(dst, src, + force_copy ? AV_FRAME_COPY_PROPS_FORCECOPY : 0) < 0) + return ret; ret = av_buffer_replace(&dst->opaque_ref, src->opaque_ref); ret |= av_buffer_replace(&dst->private_ref, src->private_ref); diff --git a/libavutil/frame.h b/libavutil/frame.h index 753234792e..58da8c4cc3 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -812,6 +812,22 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src); */ int av_frame_copy_props(AVFrame *dst, const AVFrame *src); +/** + * Copy actual data buffers instead of references. + */ +#define AV_FRAME_COPY_PROPS_FORCECOPY 1 + +/** + * Copy only side-data from src to dst. + * + * @param dst a frame to which the side data should be copied. + * @param src a frame from which to copy the side data. + * @param flags flags of type AV_FRAME_COPY_PROPS_*, controlling copy behavior. + * + * @return >= 0 on success, a negative AVERROR on error. + */ +int av_frame_copy_side_data(AVFrame* dst, const AVFrame* src, int flags); + /** * Get the buffer reference a given data plane is stored in. * diff --git a/libavutil/version.h b/libavutil/version.h index a2615cd299..0acb88cf40 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 9 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 10 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ -- 2.30.2.windows.1

5 8

[RFC] QSV: Introduce min Compile-SDK Version and check for Runtime-Versions instead
by Soft Works 22 May '22

22 May '22

Hi, this is a follow-up to my recently submitted patch: “avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11)” That patch only fixes the one important regression from multiple issues which have been introduced by recent changes. Those changes have gone in a less than ideal direction, because they have introduced checks based on the version of the MSDK which ffmpeg is being compiled against, but they didn’t add checks for the runtime libmfx/MSDK versions – and this causes failures, sometimes even for functionality which has worked before (=>regressions). Background - the compile-sdk version determines which features can be used but only when - the runtime SDK version supports it and - the hardware (GPU gen) supports it - ALL compile-sdk versions can interface with ALL runtime MSDK versions (basically), no matter whether runtime version is newer or older - At least on Windows, some hw is stuck at a certain runtime version, e.g.: there are new drivers for Broadwell, but the MSDK runtime is always 1.11 Conclusion Adding checks for the runtime MSDK versions is required wherever a feature might not be supported by older MSDK runtimes - I think that's an obvious necessity. Question Having both - run-time and compile-time checks all over the code is adding a lot of complexity and makes it difficult to maintain and work with. Hence, I'm wondering whether we couldn't/shouldn't introduce a minimum MSDK compile-time version, for example 1.22, or even later? This would allow simplification of the QSV code in many places where run-time version checks are actually needed instead. Over time, there have been better and worse MSDK versions, and there should still be enough room for choosing, but I don't think there's any reason why somebody would still want to compile against some really old (e.g. < 1.22) MSDK version. Please share your thoughts on this subject.. softworkz

2 5

[PATCH 1/3] avcodec/libaomenc: Add parameter for avif single image encoding
by Vignesh Venkatasubramanian 13 May '22

13 May '22

Add a parameter to libaom-av1 encoder to enforce some of the single image constraints in the AV1 encoder. Setting this flag will limit the encoder to producing exactly one frame and the sequence header that is produced by the encoder will be conformant to the AVIF specification [1]. Part of Fixing Trac ticket #7621 [1] https://aomediacodec.github.io/av1-avif Signed-off-by:: Vignesh Venkatasubramanian <vigneshv(a)google.com> --- libavcodec/libaomenc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 963cc1bcbc..0398060a2f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -99,6 +99,7 @@ typedef struct AOMEncoderContext { int enable_restoration; int usage; int tune; + int is_avif; int enable_rect_partitions; int enable_1to4_partitions; int enable_ab_partitions; @@ -746,6 +747,18 @@ static av_cold int aom_init(AVCodecContext *avctx, if (res < 0) return res; + if (ctx->is_avif) { + // Set the maximum number of frames to 1. This will let libaom set + // still_picture and reduced_still_picture_header to 1 in the Sequence + // Header as required by AVIF still images. + enccfg.g_limit = 1; + // Reduce memory usage for still images. + enccfg.g_lag_in_frames = 0; + // All frames will be key frames. + enccfg.kf_max_dist = 0; + enccfg.kf_mode = AOM_KF_DISABLED; + } + /* Construct Encoder Context */ res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, flags); if (res != AOM_CODEC_OK) { @@ -1290,6 +1303,7 @@ static const AVOption options[] = { { "psnr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_PSNR}, 0, 0, VE, "tune"}, { "ssim", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_SSIM}, 0, 0, VE, "tune"}, FF_AV1_PROFILE_OPTS + { "avif-image", "Encode in single frame mode for still AVIF images.", OFFSET(is_avif), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, { "enable-rect-partitions", "Enable rectangular partitions", OFFSET(enable_rect_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-1to4-partitions", "Enable 1:4/4:1 partitions", OFFSET(enable_1to4_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-ab-partitions", "Enable ab shape partitions", OFFSET(enable_ab_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, -- 2.35.1.265.g69c8d7142f-goog

6 70

[PATCH 00/87 v2] Major bump
by James Almer 12 May '22

12 May '22

7 120

[PATCH] avcodec/cbs_jpeg: Fix size of huffman symbol table array
by Andreas Rheinhardt 30 Apr '22

30 Apr '22

L[i] can be in the range of 0-255, see table B.5 of ITU T.81. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/cbs_jpeg.h | 2 +- libavcodec/cbs_jpeg_syntax_template.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_jpeg.h b/libavcodec/cbs_jpeg.h index 6305f0ee86..9dbebd259f 100644 --- a/libavcodec/cbs_jpeg.h +++ b/libavcodec/cbs_jpeg.h @@ -99,7 +99,7 @@ typedef struct JPEGRawHuffmanTable { uint8_t Tc; uint8_t Th; uint8_t L[16]; - uint8_t V[224]; + uint8_t V[256]; } JPEGRawHuffmanTable; typedef struct JPEGRawHuffmanTableSpecification { diff --git a/libavcodec/cbs_jpeg_syntax_template.c b/libavcodec/cbs_jpeg_syntax_template.c index 6eda56d623..e06abdc674 100644 --- a/libavcodec/cbs_jpeg_syntax_template.c +++ b/libavcodec/cbs_jpeg_syntax_template.c @@ -84,12 +84,12 @@ static int FUNC(huffman_table)(CodedBitstreamContext *ctx, RWContext *rw, u(4, Th, 0, 3); for (i = 0; i < 16; i++) - us(8, L[i], i, 0, 224); + us(8, L[i], i, 0, 255); ij = 0; for (i = 0; i < 16; i++) { for (j = 0; j < current->L[i]; j++) { - if (ij >= 224) + if (ij >= FF_ARRAY_ELEMS(current->V)) return AVERROR_INVALIDDATA; us(8, V[ij], ij, 0, 255); ++ij; -- 2.32.0

2 4

[PATCH] avcodec/wmadec: fix WMA gapless playback
by Paul B Mahol 28 Apr '22

28 Apr '22

From: bnnm <bananaman255(a)gmail.com> Fixes trac issue #7473. Removes encoder delay (skip samples) and writes remaining frame samples after EOF to get correct sample count. Output is now accurate vs players that use Microsoft's codecs (Windows Media Format Runtime). Tested vs encode>decode WMAv2 with MS's codecs and most sample rate/bit rate/channel/mode combinations in ASF/XWMA. WMAv1 appears to use the same delay, from FFmpeg samples. Signed-off-by: bnnm <bananaman255(a)gmail.com> Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavcodec/wma.h | 2 ++ libavcodec/wmadec.c | 22 ++++++++++++++++++++-- tests/fate/wma.mak | 8 ++++---- tests/ref/fate/flcl1905 | 3 +-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/libavcodec/wma.h b/libavcodec/wma.h index aea7ba28ab..80e52687fd 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -135,6 +135,8 @@ typedef struct WMACodecContext { float lsp_pow_m_table2[(1 << LSP_POW_BITS)]; AVFloatDSPContext *fdsp; + int eof_done; /* decode flag to output remaining samples after EOF */ + #ifdef TRACE int frame_count; #endif /* TRACE */ diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index cc67244344..9955aaa7d6 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -135,6 +135,8 @@ static av_cold int wma_decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + avctx->internal->skip_samples = s->frame_len * 2; + return 0; } @@ -829,7 +831,20 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, ff_tlog(avctx, "***decode_superframe:\n"); if (buf_size == 0) { + if (s->eof_done) + return 0; + + frame->nb_samples = s->frame_len; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + for (i = 0; i < s->avctx->channels; i++) + memcpy(frame->extended_data[i], &s->frame_out[i][0], + frame->nb_samples * sizeof(s->frame_out[i][0])); + s->last_superframe_len = 0; + s->eof_done = 1; + *got_frame_ptr = 1; return 0; } if (buf_size < avctx->block_align) { @@ -975,6 +990,9 @@ static av_cold void flush(AVCodecContext *avctx) s->last_bitoffset = s->last_superframe_len = 0; + + s->eof_done = 0; + avctx->internal->skip_samples = s->frame_len * 2; } #if CONFIG_WMAV1_DECODER @@ -988,7 +1006,7 @@ const AVCodec ff_wmav1_decoder = { .close = ff_wma_end, .decode = wma_decode_superframe, .flush = flush, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, @@ -1005,7 +1023,7 @@ const AVCodec ff_wmav2_decoder = { .close = ff_wma_end, .decode = wma_decode_superframe, .flush = flush, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index bc530998e8..c13874ebfc 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -40,14 +40,14 @@ fate-wmavoice: $(FATE_WMAVOICE-yes) FATE_WMA_ENCODE-$(call ENCDEC, WMAV1, ASF) += fate-wmav1-encode fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav1 -b:a 128k -fate-wmav1-encode: CMP_SHIFT = -8192 -fate-wmav1-encode: CMP_TARGET = 291.06 +fate-wmav1-encode: CMP_SHIFT = 8192 +fate-wmav1-encode: CMP_TARGET = 299.99 fate-wmav1-encode: SIZE_TOLERANCE = 4632 FATE_WMA_ENCODE-$(call ENCDEC, WMAV2, ASF) += fate-wmav2-encode fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav2 -b:a 128k -fate-wmav2-encode: CMP_SHIFT = -8192 -fate-wmav2-encode: CMP_TARGET = 258.32 +fate-wmav2-encode: CMP_SHIFT = 8192 +fate-wmav2-encode: CMP_TARGET = 267.92 fate-wmav2-encode: SIZE_TOLERANCE = 4632 $(FATE_WMA_ENCODE-yes): CMP = stddev diff --git a/tests/ref/fate/flcl1905 b/tests/ref/fate/flcl1905 index 5f5245ebcf..d702139db8 100644 --- a/tests/ref/fate/flcl1905 +++ b/tests/ref/fate/flcl1905 @@ -1,6 +1,4 @@ packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=22528|duration_time=0.510839|size=4092|pos=56|flags=K_ -frame|media_type=audio|stream_index=0|key_frame=1|pts=0|pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown -frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown @@ -191,3 +189,4 @@ frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown packet|codec_type=audio|stream_index=0|pts=360448|pts_time=8.173424|dts=360448|dts_time=8.173424|duration=44|duration_time=0.000998|size=8|pos=65528|flags=K_ +frame|media_type=audio|stream_index=0|key_frame=1|pts=N/A|pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=N/A|pkt_duration_time=N/A|pkt_pos=N/A|pkt_size=0|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown -- 2.17.1

2 2

[PATCH] avcodec/openh264: return (DE|EN)CODER_NOT_FOUND if version check fails
by Andreas Schneider 27 Apr '22

27 Apr '22

Signed-off-by: Andreas Schneider <asn(a)cryptomilk.org> --- libavcodec/libopenh264dec.c | 2 +- libavcodec/libopenh264enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index 7f5e85402a..97d3630df6 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -56,7 +56,7 @@ static av_cold int svc_decode_init(AVCodecContext *avctx) WelsTraceCallback callback_function; if ((err = ff_libopenh264_check_version(avctx)) < 0) - return err; + return AVERROR_DECODER_NOT_FOUND; if (WelsCreateDecoder(&s->decoder)) { av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n"); diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 7c0501a2eb..7649e7b025 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -137,7 +137,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) AVCPBProperties *props; if ((err = ff_libopenh264_check_version(avctx)) < 0) - return err; + return AVERROR_ENCODER_NOT_FOUND; if (WelsCreateSVCEncoder(&s->encoder)) { av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n"); -- 2.35.1

3 3