January 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/videotoolbox: make FFmpeg-to-VT mapping error more informative
by Jan Ekström 02 Jan '21

02 Jan '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Sat Jan 2 14:30:36 2021 +0200| [ed524136e0d0ae26c9f11df42baf72689499f99f] | committer: Jan Ekström avcodec/videotoolbox: make FFmpeg-to-VT mapping error more informative Now logs the actual failed-to-map pixel format as well as range. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed524136e0d0ae26c… --- libavcodec/videotoolbox.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 8773de3393..49e726a75f 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1088,7 +1088,13 @@ static int videotoolbox_common_init(AVCodecContext *avctx) vtctx->vt_ctx->cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt2(hw_frames->sw_format, full_range); if (!vtctx->vt_ctx->cv_pix_fmt_type) { - av_log(avctx, AV_LOG_ERROR, "Unknown sw_format.\n"); + const AVPixFmtDescriptor *attempted_format = + av_pix_fmt_desc_get(hw_frames->sw_format); + av_log(avctx, AV_LOG_ERROR, + "Failed to map underlying FFmpeg pixel format %s (%s range) to " + "a VideoToolbox format!\n", + attempted_format ? attempted_format->name : "<unknown>", + av_color_range_name(avctx->color_range)); err = AVERROR(EINVAL); goto fail; }

1 0

avcodec/utils: Check close before calling it
by Michael Niedermayer 02 Jan '21

02 Jan '21

ffmpeg | branch: release/3.2 | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Jul 21 00:08:55 2019 +0200| [cb456b8fb00e04bedf117cb4b72c87a9c3db5145] | committer: James Almer avcodec/utils: Check close before calling it Fixes: NULL pointer dereference Fixes: 15733/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IDF_fuzzer-5658616977162240 Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 8df6884832ec413cf032dfaa45c23b1c7876670c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb456b8fb00e04bed… --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8f19237d3f..c8f4ff7973 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1720,7 +1720,7 @@ end: return ret; free_and_end: - if (avctx->codec && + if (avctx->codec && avctx->codec->close && (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)) avctx->codec->close(avctx);

1 0

Mark some pointers as const
by Andreas Rheinhardt 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Sun Dec 27 17:36:59 2020 +0100| [2c6f532e0a29527347418d2d8c4ccfe57a6ace0e] | committer: Andreas Rheinhardt Mark some pointers as const Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c6f532e0a2952734… --- fftools/ffmpeg_opt.c | 86 ++++++++++++++--------------- libavcodec/aacenctab.c | 4 +- libavcodec/aacenctab.h | 4 +- libavcodec/av1dec.c | 2 +- libavcodec/cbs.c | 2 +- libavcodec/h2645_parse.c | 4 +- libavcodec/h264dec.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/mjpegdec.c | 2 +- libavcodec/mpeg12dec.c | 4 +- libavcodec/mpeg4videodec.c | 2 +- libavcodec/opustab.c | 2 +- libavcodec/opustab.h | 2 +- libavcodec/vc1dec.c | 4 +- libavcodec/vp8.c | 2 +- libavcodec/vp9.c | 2 +- libavfilter/af_afftfilt.c | 2 +- libavfilter/af_aiir.c | 2 +- libavfilter/dnn/dnn_backend_native_layers.c | 2 +- libavfilter/dnn/dnn_backend_native_layers.h | 2 +- libavfilter/vf_geq.c | 4 +- libavfilter/vf_qp.c | 4 +- libavfilter/vf_selectivecolor.c | 2 +- libavfilter/vf_tonemap_opencl.c | 6 +- libavformat/utils.c | 2 +- libavutil/spherical.c | 2 +- 26 files changed, 77 insertions(+), 77 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 242468fc64..c295514401 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -51,49 +51,49 @@ #define SPECIFIER_OPT_FMT_f "%f" #define SPECIFIER_OPT_FMT_dbl "%lf" -static const char *opt_name_codec_names[] = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL}; -static const char *opt_name_audio_channels[] = {"ac", NULL}; -static const char *opt_name_audio_sample_rate[] = {"ar", NULL}; -static const char *opt_name_frame_rates[] = {"r", NULL}; -static const char *opt_name_frame_sizes[] = {"s", NULL}; -static const char *opt_name_frame_pix_fmts[] = {"pix_fmt", NULL}; -static const char *opt_name_ts_scale[] = {"itsscale", NULL}; -static const char *opt_name_hwaccels[] = {"hwaccel", NULL}; -static const char *opt_name_hwaccel_devices[] = {"hwaccel_device", NULL}; -static const char *opt_name_hwaccel_output_formats[] = {"hwaccel_output_format", NULL}; -static const char *opt_name_autorotate[] = {"autorotate", NULL}; -static const char *opt_name_autoscale[] = {"autoscale", NULL}; -static const char *opt_name_max_frames[] = {"frames", "aframes", "vframes", "dframes", NULL}; -static const char *opt_name_bitstream_filters[] = {"bsf", "absf", "vbsf", NULL}; -static const char *opt_name_codec_tags[] = {"tag", "atag", "vtag", "stag", NULL}; -static const char *opt_name_sample_fmts[] = {"sample_fmt", NULL}; -static const char *opt_name_qscale[] = {"q", "qscale", NULL}; -static const char *opt_name_forced_key_frames[] = {"forced_key_frames", NULL}; -static const char *opt_name_force_fps[] = {"force_fps", NULL}; -static const char *opt_name_frame_aspect_ratios[] = {"aspect", NULL}; -static const char *opt_name_rc_overrides[] = {"rc_override", NULL}; -static const char *opt_name_intra_matrices[] = {"intra_matrix", NULL}; -static const char *opt_name_inter_matrices[] = {"inter_matrix", NULL}; -static const char *opt_name_chroma_intra_matrices[] = {"chroma_intra_matrix", NULL}; -static const char *opt_name_top_field_first[] = {"top", NULL}; -static const char *opt_name_presets[] = {"pre", "apre", "vpre", "spre", NULL}; -static const char *opt_name_copy_initial_nonkeyframes[] = {"copyinkfr", NULL}; -static const char *opt_name_copy_prior_start[] = {"copypriorss", NULL}; -static const char *opt_name_filters[] = {"filter", "af", "vf", NULL}; -static const char *opt_name_filter_scripts[] = {"filter_script", NULL}; -static const char *opt_name_reinit_filters[] = {"reinit_filter", NULL}; -static const char *opt_name_fix_sub_duration[] = {"fix_sub_duration", NULL}; -static const char *opt_name_canvas_sizes[] = {"canvas_size", NULL}; -static const char *opt_name_pass[] = {"pass", NULL}; -static const char *opt_name_passlogfiles[] = {"passlogfile", NULL}; -static const char *opt_name_max_muxing_queue_size[] = {"max_muxing_queue_size", NULL}; -static const char *opt_name_muxing_queue_data_threshold[] = {"muxing_queue_data_threshold", NULL}; -static const char *opt_name_guess_layout_max[] = {"guess_layout_max", NULL}; -static const char *opt_name_apad[] = {"apad", NULL}; -static const char *opt_name_discard[] = {"discard", NULL}; -static const char *opt_name_disposition[] = {"disposition", NULL}; -static const char *opt_name_time_bases[] = {"time_base", NULL}; -static const char *opt_name_enc_time_bases[] = {"enc_time_base", NULL}; +static const char *const opt_name_codec_names[] = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL}; +static const char *const opt_name_audio_channels[] = {"ac", NULL}; +static const char *const opt_name_audio_sample_rate[] = {"ar", NULL}; +static const char *const opt_name_frame_rates[] = {"r", NULL}; +static const char *const opt_name_frame_sizes[] = {"s", NULL}; +static const char *const opt_name_frame_pix_fmts[] = {"pix_fmt", NULL}; +static const char *const opt_name_ts_scale[] = {"itsscale", NULL}; +static const char *const opt_name_hwaccels[] = {"hwaccel", NULL}; +static const char *const opt_name_hwaccel_devices[] = {"hwaccel_device", NULL}; +static const char *const opt_name_hwaccel_output_formats[] = {"hwaccel_output_format", NULL}; +static const char *const opt_name_autorotate[] = {"autorotate", NULL}; +static const char *const opt_name_autoscale[] = {"autoscale", NULL}; +static const char *const opt_name_max_frames[] = {"frames", "aframes", "vframes", "dframes", NULL}; +static const char *const opt_name_bitstream_filters[] = {"bsf", "absf", "vbsf", NULL}; +static const char *const opt_name_codec_tags[] = {"tag", "atag", "vtag", "stag", NULL}; +static const char *const opt_name_sample_fmts[] = {"sample_fmt", NULL}; +static const char *const opt_name_qscale[] = {"q", "qscale", NULL}; +static const char *const opt_name_forced_key_frames[] = {"forced_key_frames", NULL}; +static const char *const opt_name_force_fps[] = {"force_fps", NULL}; +static const char *const opt_name_frame_aspect_ratios[] = {"aspect", NULL}; +static const char *const opt_name_rc_overrides[] = {"rc_override", NULL}; +static const char *const opt_name_intra_matrices[] = {"intra_matrix", NULL}; +static const char *const opt_name_inter_matrices[] = {"inter_matrix", NULL}; +static const char *const opt_name_chroma_intra_matrices[] = {"chroma_intra_matrix", NULL}; +static const char *const opt_name_top_field_first[] = {"top", NULL}; +static const char *const opt_name_presets[] = {"pre", "apre", "vpre", "spre", NULL}; +static const char *const opt_name_copy_initial_nonkeyframes[] = {"copyinkfr", NULL}; +static const char *const opt_name_copy_prior_start[] = {"copypriorss", NULL}; +static const char *const opt_name_filters[] = {"filter", "af", "vf", NULL}; +static const char *const opt_name_filter_scripts[] = {"filter_script", NULL}; +static const char *const opt_name_reinit_filters[] = {"reinit_filter", NULL}; +static const char *const opt_name_fix_sub_duration[] = {"fix_sub_duration", NULL}; +static const char *const opt_name_canvas_sizes[] = {"canvas_size", NULL}; +static const char *const opt_name_pass[] = {"pass", NULL}; +static const char *const opt_name_passlogfiles[] = {"passlogfile", NULL}; +static const char *const opt_name_max_muxing_queue_size[] = {"max_muxing_queue_size", NULL}; +static const char *const opt_name_muxing_queue_data_threshold[] = {"muxing_queue_data_threshold", NULL}; +static const char *const opt_name_guess_layout_max[] = {"guess_layout_max", NULL}; +static const char *const opt_name_apad[] = {"apad", NULL}; +static const char *const opt_name_discard[] = {"discard", NULL}; +static const char *const opt_name_disposition[] = {"disposition", NULL}; +static const char *const opt_name_time_bases[] = {"time_base", NULL}; +static const char *const opt_name_enc_time_bases[] = {"enc_time_base", NULL}; #define WARN_MULTIPLE_OPT_USAGE(name, type, so, st)\ {\ diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c index f3d70fbe31..874365a593 100644 --- a/libavcodec/aacenctab.c +++ b/libavcodec/aacenctab.c @@ -88,7 +88,7 @@ static const uint8_t swb_size_1024_8[] = { 32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 80 }; -const uint8_t *ff_aac_swb_size_128[] = { +const uint8_t *const ff_aac_swb_size_128[] = { swb_size_128_96, swb_size_128_96, swb_size_128_64, swb_size_128_48, swb_size_128_48, swb_size_128_48, swb_size_128_24, swb_size_128_24, swb_size_128_16, @@ -96,7 +96,7 @@ const uint8_t *ff_aac_swb_size_128[] = { swb_size_128_8 }; -const uint8_t *ff_aac_swb_size_1024[] = { +const uint8_t *const ff_aac_swb_size_1024[] = { swb_size_1024_96, swb_size_1024_96, swb_size_1024_64, swb_size_1024_48, swb_size_1024_48, swb_size_1024_32, swb_size_1024_24, swb_size_1024_24, swb_size_1024_16, diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index 64932d709f..dbbdf61dfd 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -38,9 +38,9 @@ #define AAC_MAX_CHANNELS 16 -extern const uint8_t *ff_aac_swb_size_1024[]; +extern const uint8_t *const ff_aac_swb_size_1024[]; extern const int ff_aac_swb_size_1024_len; -extern const uint8_t *ff_aac_swb_size_128[]; +extern const uint8_t *const ff_aac_swb_size_128[]; extern const int ff_aac_swb_size_128_len; /* Supported layouts without using a PCE */ diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index f1cc5150c3..75eece0c23 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1110,7 +1110,7 @@ AVCodec ff_av1_decoder = { FF_CODEC_CAP_SETS_PKT_DTS, .flush = av1_decode_flush, .profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), - .hw_configs = (const AVCodecHWConfigInternal * []) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_AV1_DXVA2_HWACCEL HWACCEL_DXVA2(av1), #endif diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index f98531e131..e7025cce07 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -28,7 +28,7 @@ #include "cbs_internal.h" -static const CodedBitstreamType *cbs_type_table[] = { +static const CodedBitstreamType *const cbs_type_table[] = { #if CONFIG_CBS_AV1 &ff_cbs_type_av1, #endif diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 0f98b49fbe..a36ef4f5a0 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -146,7 +146,7 @@ nsc: return si; } -static const char *hevc_nal_type_name[64] = { +static const char *const hevc_nal_type_name[64] = { "TRAIL_N", // HEVC_NAL_TRAIL_N "TRAIL_R", // HEVC_NAL_TRAIL_R "TSA_N", // HEVC_NAL_TSA_N @@ -219,7 +219,7 @@ static const char *hevc_nal_unit_name(int nal_type) return hevc_nal_type_name[nal_type]; } -static const char *h264_nal_type_name[32] = { +static const char *const h264_nal_type_name[32] = { "Unspecified 0", //H264_NAL_UNSPECIFIED "Coded slice of a non-IDR picture", // H264_NAL_SLICE "Coded slice data partition A", // H264_NAL_DPA diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 46495d586f..8856be0f59 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -1054,7 +1054,7 @@ AVCodec ff_h264_decoder = { .capabilities = /*AV_CODEC_CAP_DRAW_HORIZ_BAND |*/ AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_H264_DXVA2_HWACCEL HWACCEL_DXVA2(h264), #endif diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index be814bba80..305e32c450 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3675,7 +3675,7 @@ AVCodec ff_hevc_decoder = { .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS, .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_HEVC_DXVA2_HWACCEL HWACCEL_DXVA2(hevc), #endif diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index f2ce82fc5f..8876afd966 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2990,7 +2990,7 @@ AVCodec ff_mjpeg_decoder = { .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_SETS_PKT_DTS, - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_MJPEG_NVDEC_HWACCEL HWACCEL_NVDEC(mjpeg), #endif diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b9bd7daa25..3330967f64 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2904,7 +2904,7 @@ AVCodec ff_mpeg1video_decoder = { .flush = flush, .max_lowres = 3, .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context), - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_MPEG1_NVDEC_HWACCEL HWACCEL_NVDEC(mpeg1), #endif @@ -2938,7 +2938,7 @@ AVCodec ff_mpeg2video_decoder = { .flush = flush, .max_lowres = 3, .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_MPEG2_DXVA2_HWACCEL HWACCEL_DXVA2(mpeg2), #endif diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index d85109c857..c88de63f36 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3593,7 +3593,7 @@ AVCodec ff_mpeg4_decoder = { .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg4_video_profiles), .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg4_update_thread_context), .priv_class = &mpeg4_class, - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_MPEG4_NVDEC_HWACCEL HWACCEL_NVDEC(mpeg4), #endif diff --git a/libavcodec/opustab.c b/libavcodec/opustab.c index 29eb05a12a..b23ca4feac 100644 --- a/libavcodec/opustab.c +++ b/libavcodec/opustab.c @@ -1132,7 +1132,7 @@ DECLARE_ALIGNED(32, static const float, ff_celt_window_padded)[136] = { 1.00000000f, 1.00000000f, 1.00000000f, }; -const float *ff_celt_window = &ff_celt_window_padded[8]; +const float *const ff_celt_window = &ff_celt_window_padded[8]; /* square of the window, used for the postfilter */ const float ff_celt_window2[120] = { diff --git a/libavcodec/opustab.h b/libavcodec/opustab.h index cdd0456e3c..4525837942 100644 --- a/libavcodec/opustab.h +++ b/libavcodec/opustab.h @@ -156,7 +156,7 @@ extern const uint16_t ff_celt_qn_exp2[]; extern const float ff_celt_postfilter_taps[3][3]; extern const float ff_celt_window2[120]; -extern const float *ff_celt_window; +extern const float *const ff_celt_window; extern const uint32_t * const ff_celt_pvq_u_row[15]; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 7809234ff7..47940fb886 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1217,7 +1217,7 @@ AVCodec ff_vc1_decoder = { .flush = ff_mpeg_flush, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .pix_fmts = vc1_hwaccel_pixfmt_list_420, - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_VC1_DXVA2_HWACCEL HWACCEL_DXVA2(vc1), #endif @@ -1254,7 +1254,7 @@ AVCodec ff_wmv3_decoder = { .flush = ff_mpeg_flush, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .pix_fmts = vc1_hwaccel_pixfmt_list_420, - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_WMV3_DXVA2_HWACCEL HWACCEL_DXVA2(wmv3), #endif diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 9440969728..5fa7971f8f 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2966,7 +2966,7 @@ AVCodec ff_vp8_decoder = { AV_CODEC_CAP_SLICE_THREADS, .flush = vp8_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_VP8_VAAPI_HWACCEL HWACCEL_VAAPI(vp8), #endif diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 294059f863..4659f94ee8 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1894,7 +1894,7 @@ AVCodec ff_vp9_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context), .profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles), .bsfs = "vp9_superframe_split", - .hw_configs = (const AVCodecHWConfigInternal*[]) { + .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_VP9_DXVA2_HWACCEL HWACCEL_DXVA2(vp9), #endif diff --git a/libavfilter/af_afftfilt.c b/libavfilter/af_afftfilt.c index a6156bf852..9b9001a44b 100644 --- a/libavfilter/af_afftfilt.c +++ b/libavfilter/af_afftfilt.c @@ -118,7 +118,7 @@ static double realf(void *priv, double x, double ch) { return getreal(priv, x, c static double imagf(void *priv, double x, double ch) { return getimag(priv, x, ch); } static const char *const func2_names[] = { "real", "imag", NULL }; -double (*func2[])(void *, double, double) = { realf, imagf, NULL }; +static double (*const func2[])(void *, double, double) = { realf, imagf, NULL }; static int config_input(AVFilterLink *inlink) { diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 59d2232ac9..f2e9d8e4e2 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -453,7 +453,7 @@ static int read_zp_coefficients(AVFilterContext *ctx, char *item_str, int nb_ite return 0; } -static const char *format[] = { "%lf", "%lf %lfi", "%lf %lfr", "%lf %lfd", "%lf %lfi" }; +static const char *const format[] = { "%lf", "%lf %lfi", "%lf %lfr", "%lf %lfd", "%lf %lfi" }; static int read_channels(AVFilterContext *ctx, int channels, uint8_t *item_str, int ab) { diff --git a/libavfilter/dnn/dnn_backend_native_layers.c b/libavfilter/dnn/dnn_backend_native_layers.c index 638a94e9a3..a23b34f823 100644 --- a/libavfilter/dnn/dnn_backend_native_layers.c +++ b/libavfilter/dnn/dnn_backend_native_layers.c @@ -29,7 +29,7 @@ #include "dnn_backend_native_layer_avgpool.h" #include "dnn_backend_native_layer_dense.h" -LayerFunc layer_funcs[DLT_COUNT] = { +const LayerFunc layer_funcs[DLT_COUNT] = { {NULL, NULL}, {dnn_execute_layer_conv2d, dnn_load_layer_conv2d}, {dnn_execute_layer_depth2space, dnn_load_layer_depth2space}, diff --git a/libavfilter/dnn/dnn_backend_native_layers.h b/libavfilter/dnn/dnn_backend_native_layers.h index dc76ace65a..b9e8a131d5 100644 --- a/libavfilter/dnn/dnn_backend_native_layers.h +++ b/libavfilter/dnn/dnn_backend_native_layers.h @@ -33,6 +33,6 @@ typedef struct LayerFunc { LAYER_LOAD_FUNC pf_load; }LayerFunc; -extern LayerFunc layer_funcs[DLT_COUNT]; +extern const LayerFunc layer_funcs[DLT_COUNT]; #endif diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index d7abf96a68..072cef3ca3 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -270,7 +270,7 @@ static av_cold int geq_init(AVFilterContext *ctx) } for (plane = 0; plane < NB_PLANES; plane++) { - static double (*p[])(void *, double, double) = { + static double (*const p[])(void *, double, double) = { lum , cb , cr , alpha , lumsum, cbsum, crsub, alphasum, }; @@ -283,7 +283,7 @@ static av_cold int geq_init(AVFilterContext *ctx) "gsum", "bsum", "rsum", "alphasum", "psum", NULL }; const char *const *func2_names = geq->is_rgb ? func2_rgb_names : func2_yuv_names; - double (*func2[])(void *, double, double) = { + double (*const func2[])(void *, double, double) = { lum , cb , cr , alpha , p[plane], lumsum, cbsum, crsub, alphasum, p[plane + 4], NULL }; diff --git a/libavfilter/vf_qp.c b/libavfilter/vf_qp.c index 306e8e4594..af46fe0ece 100644 --- a/libavfilter/vf_qp.c +++ b/libavfilter/vf_qp.c @@ -55,7 +55,7 @@ static int config_input(AVFilterLink *inlink) int i; int ret; AVExpr *e = NULL; - static const char *var_names[] = { "known", "qp", "x", "y", "w", "h", NULL }; + static const char *const var_names[] = { "known", "qp", "x", "y", "w", "h", NULL }; if (!s->qp_expr_str) return 0; @@ -144,7 +144,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVVideoBlockParams *b = av_video_enc_params_block(par_out, block_idx); int qp = sd_in ? in_qp_global + BLOCK_QP_DELTA(block_idx) : NAN; double var_values[] = { !!sd_in, qp, x, y, s->qstride, s->h, 0}; - static const char *var_names[] = { "known", "qp", "x", "y", "w", "h", NULL }; + static const char *const var_names[] = { "known", "qp", "x", "y", "w", "h", NULL }; double temp_val; ret = av_expr_parse_and_eval(&temp_val, s->qp_expr_str, diff --git a/libavfilter/vf_selectivecolor.c b/libavfilter/vf_selectivecolor.c index d8f339d540..9bd79a3e60 100644 --- a/libavfilter/vf_selectivecolor.c +++ b/libavfilter/vf_selectivecolor.c @@ -61,7 +61,7 @@ enum correction_method { NB_CORRECTION_METHODS, }; -static const char *color_names[NB_RANGES] = { +static const char *const color_names[NB_RANGES] = { "red", "yellow", "green", "cyan", "blue", "magenta", "white", "neutral", "black" }; diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index b880228727..2681ebd1b5 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -71,12 +71,12 @@ typedef struct TonemapOpenCLContext { cl_mem util_mem; } TonemapOpenCLContext; -static const char *linearize_funcs[AVCOL_TRC_NB] = { +static const char *const linearize_funcs[AVCOL_TRC_NB] = { [AVCOL_TRC_SMPTE2084] = "eotf_st2084", [AVCOL_TRC_ARIB_STD_B67] = "inverse_oetf_hlg", }; -static const char *delinearize_funcs[AVCOL_TRC_NB] = { +static const char *const delinearize_funcs[AVCOL_TRC_NB] = { [AVCOL_TRC_BT709] = "inverse_eotf_bt1886", [AVCOL_TRC_BT2020_10] = "inverse_eotf_bt1886", }; @@ -91,7 +91,7 @@ static const struct WhitepointCoefficients whitepoint_table[AVCOL_PRI_NB] = { [AVCOL_PRI_BT2020] = { 0.3127, 0.3290 }, }; -static const char *tonemap_func[TONEMAP_MAX] = { +static const char *const tonemap_func[TONEMAP_MAX] = { [TONEMAP_NONE] = "direct", [TONEMAP_LINEAR] = "linear", [TONEMAP_GAMMA] = "gamma", diff --git a/libavformat/utils.c b/libavformat/utils.c index 1a87d9422a..f63ff3074a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2874,7 +2874,7 @@ skip_duration_calc: } /* 1:1 map to AVDurationEstimationMethod */ -static const char *duration_name[] = { +static const char *const duration_name[] = { [AVFMT_DURATION_FROM_PTS] = "pts", [AVFMT_DURATION_FROM_STREAM] = "stream", [AVFMT_DURATION_FROM_BITRATE] = "bit rate", diff --git a/libavutil/spherical.c b/libavutil/spherical.c index 4be55f36cf..4a7f3e49ca 100644 --- a/libavutil/spherical.c +++ b/libavutil/spherical.c @@ -51,7 +51,7 @@ void av_spherical_tile_bounds(const AVSphericalMapping *map, *bottom = orig_height - height - *top; } -static const char *spherical_projection_names[] = { +static const char *const spherical_projection_names[] = { [AV_SPHERICAL_EQUIRECTANGULAR] = "equirectangular", [AV_SPHERICAL_CUBEMAP] = "cubemap", [AV_SPHERICAL_EQUIRECTANGULAR_TILE] = "tiled equirectangular",

1 0

lavc/mjpegdec: cosmetics, org->orig
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sat Dec 12 14:53:30 2020 +0100| [15baa0c1acd21be99408e6782ae28d868b847b13] | committer: Anton Khirnov lavc/mjpegdec: cosmetics, org->orig > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15baa0c1acd21be99… --- libavcodec/mjpegdec.c | 6 +++--- libavcodec/mjpegdec.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 11fb809c10..f2ce82fc5f 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -172,7 +172,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->start_code = -1; s->first_picture = 1; s->got_picture = 0; - s->org_height = avctx->coded_height; + s->orig_height = avctx->coded_height; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; avctx->colorspace = AVCOL_SPC_BT470BG; s->hwaccel_pix_fmt = s->hwaccel_sw_pix_fmt = AV_PIX_FMT_NONE; @@ -466,8 +466,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) /* test interlaced mode */ if (s->first_picture && (s->multiscope != 2 || s->avctx->time_base.den >= 25 * s->avctx->time_base.num) && - s->org_height != 0 && - s->height < ((s->org_height * 3) / 4)) { + s->orig_height != 0 && + s->height < ((s->orig_height * 3) / 4)) { s->interlaced = 1; s->bottom_field = s->interlace_polarity; s->picture_ptr->interlaced_frame = 1; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index fcbe58bcb8..a824b5029c 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -60,7 +60,7 @@ typedef struct MJpegDecodeContext { VLC vlcs[3][4]; int qscale[4]; ///< quantizer scale calculated from quant_matrixes - int org_height; /* size given at codec init */ + int orig_height; /* size given at codec init */ int first_picture; /* true if decoding first picture */ int interlaced; /* true if interlaced */ int bottom_field; /* true if bottom field */

1 0

fate: add tests for AVID
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sat Dec 12 13:40:47 2020 +0100| [b0f1a86aaf0b360e2d2cd84aceee1e3264c7e7e5] | committer: Anton Khirnov fate: add tests for AVID Samples cut from tickets 971 and 4741 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0f1a86aaf0b360e2… --- tests/fate/video.mak | 6 ++++++ tests/ref/fate/avid-interlaced | 7 +++++++ tests/ref/fate/avid-meridian | 15 +++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 4877740863..a5f3107c38 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -43,6 +43,12 @@ fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2 fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an +FATE_VIDEO-$(call DEMDEC, AVI, AVRN) += fate-avid-interlaced +fate-avid-interlaced: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avid_ntsc_interlaced.avi + +FATE_VIDEO-$(call DEMDEC, MOV, AVRN) += fate-avid-meridian +fate-avid-meridian: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov + FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 -vf scale -af aresample diff --git a/tests/ref/fate/avid-interlaced b/tests/ref/fate/avid-interlaced new file mode 100644 index 0000000000..2efa5839cb --- /dev/null +++ b/tests/ref/fate/avid-interlaced @@ -0,0 +1,7 @@ +#tb 0: 100/2397 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 720x486 +#sar 0: 0/1 +0, 0, 0, 1, 699840, 0xc59a264e +0, 1, 1, 1, 699840, 0x06f13712 diff --git a/tests/ref/fate/avid-meridian b/tests/ref/fate/avid-meridian new file mode 100644 index 0000000000..313351ed06 --- /dev/null +++ b/tests/ref/fate/avid-meridian @@ -0,0 +1,15 @@ +#tb 0: 20859/500000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 0/1 +0, 0, 0, 1, 153600, 0xbfd35869 +0, 1, 1, 1, 153600, 0xbe7c74a0 +0, 2, 2, 1, 153600, 0x9f2524ee +0, 3, 3, 1, 153600, 0x3c8df375 +0, 4, 4, 1, 153600, 0xe0ac5d7d +0, 5, 5, 1, 153600, 0xf0c6da50 +0, 6, 6, 1, 153600, 0xbd50751f +0, 7, 7, 1, 153600, 0x51caf5f7 +0, 8, 8, 1, 153600, 0x27752d4f +0, 9, 9, 1, 153600, 0x63a0d0dc

1 0

api-seek-test: use non-obsolete decoding API
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Dec 10 20:55:43 2020 +0100| [bb2651a9215cbd74b70bee820e833e19b2300261] | committer: Anton Khirnov api-seek-test: use non-obsolete decoding API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb2651a9215cbd74b… --- tests/api/api-seek-test.c | 104 +++++++++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 42 deletions(-) diff --git a/tests/api/api-seek-test.c b/tests/api/api-seek-test.c index ae33581244..bb9f5c89b3 100644 --- a/tests/api/api-seek-test.c +++ b/tests/api/api-seek-test.c @@ -73,16 +73,14 @@ static int compare_crc_in_array(uint32_t crc, int64_t pts) } static int compute_crc_of_packets(AVFormatContext *fmt_ctx, int video_stream, - AVCodecContext *ctx, AVFrame *fr, uint64_t ts_start, uint64_t ts_end, int no_seeking) + AVCodecContext *ctx, AVPacket *pkt, AVFrame *fr, + uint64_t ts_start, uint64_t ts_end, int no_seeking) { int number_of_written_bytes; - int got_frame = 0; int result; - int end_of_stream = 0; int byte_buffer_size; uint8_t *byte_buffer; uint32_t crc; - AVPacket pkt; byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 16); byte_buffer = av_malloc(byte_buffer_size); @@ -101,53 +99,66 @@ static int compute_crc_of_packets(AVFormatContext *fmt_ctx, int video_stream, avcodec_flush_buffers(ctx); } - av_init_packet(&pkt); do { - if (!end_of_stream) - if (av_read_frame(fmt_ctx, &pkt) < 0) - end_of_stream = 1; - if (end_of_stream) { - pkt.data = NULL; - pkt.size = 0; + result = av_read_frame(fmt_ctx, pkt); + if (result >= 0 && pkt->stream_index != video_stream) { + av_packet_unref(pkt); + continue; } - if (pkt.stream_index == video_stream || end_of_stream) { - got_frame = 0; - if ((pkt.pts == AV_NOPTS_VALUE) && (!end_of_stream)) { + + if (result < 0) + result = avcodec_send_packet(ctx, NULL); + else { + if (pkt->pts == AV_NOPTS_VALUE) { av_log(NULL, AV_LOG_ERROR, "Error: frames doesn't have pts values\n"); return -1; } - result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt); - if (result < 0) { + result = avcodec_send_packet(ctx, pkt); + } + + av_packet_unref(pkt); + + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); + return result; + } + + while (result >= 0) { + result = avcodec_receive_frame(ctx, fr); + if (result == AVERROR_EOF) + goto finish; + else if (result == AVERROR(EAGAIN)) { + result = 0; + break; + } else if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n"); return result; } - if (got_frame) { - number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, - (const uint8_t* const *)fr->data, (const int*) fr->linesize, - ctx->pix_fmt, ctx->width, ctx->height, 1); - if (number_of_written_bytes < 0) { - av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); - return number_of_written_bytes; - } - if ((!no_seeking) && (fr->pts > ts_end)) - break; - crc = av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes); - printf("%10"PRId64", 0x%08"PRIx32"\n", fr->pts, crc); - if (no_seeking) { - if (add_crc_to_array(crc, fr->pts) < 0) - return -1; - } - else { - if (compare_crc_in_array(crc, fr->pts) < 0) - return -1; - } + + number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, + (const uint8_t* const *)fr->data, (const int*) fr->linesize, + ctx->pix_fmt, ctx->width, ctx->height, 1); + if (number_of_written_bytes < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); + return number_of_written_bytes; + } + if ((!no_seeking) && (fr->pts > ts_end)) + break; + crc = av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes); + printf("%10"PRId64", 0x%08"PRIx32"\n", fr->pts, crc); + if (no_seeking) { + if (add_crc_to_array(crc, fr->pts) < 0) + return -1; + } + else { + if (compare_crc_in_array(crc, fr->pts) < 0) + return -1; } + av_frame_unref(fr); } - av_packet_unref(&pkt); - av_init_packet(&pkt); - } while ((!end_of_stream || got_frame) && (no_seeking || (fr->pts + fr->pkt_duration <= ts_end))); + } while (result >= 0 && (no_seeking || (fr->pts + fr->pkt_duration <= ts_end))); - av_packet_unref(&pkt); +finish: av_freep(&byte_buffer); return 0; @@ -176,6 +187,7 @@ static int seek_test(const char *input_filename, const char *start, const char * AVCodec *codec = NULL; AVCodecContext *ctx= NULL; AVCodecParameters *origin_par = NULL; + AVPacket *pkt = NULL; AVFrame *fr = NULL; AVFormatContext *fmt_ctx = NULL; int video_stream; @@ -250,13 +262,20 @@ static int seek_test(const char *input_filename, const char *start, const char * goto end; } - result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, 0, 0, 1); + pkt = av_packet_alloc(); + if (!pkt) { + av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); + result = AVERROR(ENOMEM); + goto end; + } + + result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, pkt, fr, 0, 0, 1); if (result != 0) goto end; for (i = start_ts; i < end_ts; i += 100) { for (j = i + 100; j < end_ts; j += 100) { - result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, i, j, 0); + result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, pkt, fr, i, j, 0); if (result != 0) break; } @@ -265,6 +284,7 @@ static int seek_test(const char *input_filename, const char *start, const char * end: av_freep(&crc_array); av_freep(&pts_array); + av_packet_free(&pkt); av_frame_free(&fr); avformat_close_input(&fmt_ctx); avcodec_free_context(&ctx);

1 0

api-band-test: use non-obsolete decoding API
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Dec 10 20:55:43 2020 +0100| [88e098029d1d9449d6a5bcf390cd27036a0458ef] | committer: Anton Khirnov api-band-test: use non-obsolete decoding API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88e098029d1d9449d… --- tests/api/api-band-test.c | 90 ++++++++++++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 37 deletions(-) diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c index 257e741694..34bed1d6be 100644 --- a/tests/api/api-band-test.c +++ b/tests/api/api-band-test.c @@ -71,14 +71,12 @@ static int video_decode(const char *input_filename) AVCodecParameters *origin_par = NULL; uint8_t *byte_buffer = NULL; AVFrame *fr = NULL; - AVPacket pkt; + AVPacket *pkt; AVFormatContext *fmt_ctx = NULL; int number_of_written_bytes; int video_stream; - int got_frame = 0; int byte_buffer_size; int result; - int end_of_stream = 0; draw_horiz_band_called = 0; @@ -135,6 +133,12 @@ static int video_decode(const char *input_filename) return AVERROR(ENOMEM); } + pkt = av_packet_alloc(); + if (!pkt) { + av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); + return AVERROR(ENOMEM); + } + if (strcmp(codec->name, "flv") && strcmp(codec->name, "mpeg4") && strcmp(codec->name, "huffyuv")) { av_log(NULL, AV_LOG_ERROR, "Wrong codec\n"); return -1; @@ -155,48 +159,60 @@ static int video_decode(const char *input_filename) memset(slice_byte_buffer, 0, byte_buffer_size); slice_byte_buffer_size = byte_buffer_size; - av_init_packet(&pkt); - do { - if (!end_of_stream) { - if (av_read_frame(fmt_ctx, &pkt) < 0) { - end_of_stream = 1; - } + result = 0; + while (result >= 0) { + result = av_read_frame(fmt_ctx, pkt); + if (result >= 0 && pkt->stream_index != video_stream) { + av_packet_unref(pkt); + continue; } - if (end_of_stream) { - pkt.data = NULL; - pkt.size = 0; + + if (result < 0) + result = avcodec_send_packet(ctx, NULL); + else + result = avcodec_send_packet(ctx, pkt); + + av_packet_unref(pkt); + + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); + return result; } - if (pkt.stream_index == video_stream || end_of_stream) { - got_frame = 0; - result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt); - if (result < 0) { + + while (result >= 0) { + result = avcodec_receive_frame(ctx, fr); + if (result == AVERROR_EOF) + goto finish; + else if (result == AVERROR(EAGAIN)) { + result = 0; + break; + } else if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n"); return result; } - if (got_frame) { - number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, - (const uint8_t* const *)fr->data, (const int*) fr->linesize, - ctx->pix_fmt, ctx->width, ctx->height, 1); - if (number_of_written_bytes < 0) { - av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); - return number_of_written_bytes; - } - if (draw_horiz_band_called == 0) { - av_log(NULL, AV_LOG_ERROR, "draw_horiz_band haven't been called!\n"); - return -1; - } - if (av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes) != - av_adler32_update(0, (const uint8_t*)slice_byte_buffer, number_of_written_bytes)) { - av_log(NULL, AV_LOG_ERROR, "Decoded frames with and without draw_horiz_band are not the same!\n"); - return -1; - } + + number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, + (const uint8_t* const *)fr->data, (const int*) fr->linesize, + ctx->pix_fmt, ctx->width, ctx->height, 1); + if (number_of_written_bytes < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); + return number_of_written_bytes; + } + if (draw_horiz_band_called == 0) { + av_log(NULL, AV_LOG_ERROR, "draw_horiz_band haven't been called!\n"); + return -1; + } + if (av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes) != + av_adler32_update(0, (const uint8_t*)slice_byte_buffer, number_of_written_bytes)) { + av_log(NULL, AV_LOG_ERROR, "Decoded frames with and without draw_horiz_band are not the same!\n"); + return -1; } - av_packet_unref(&pkt); - av_init_packet(&pkt); + av_frame_unref(fr); } - } while (!end_of_stream || got_frame); + } - av_packet_unref(&pkt); +finish: + av_packet_free(&pkt); av_frame_free(&fr); avformat_close_input(&fmt_ctx); avcodec_free_context(&ctx);

1 0

api-h264-test: use non-obsolete decoding API
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Dec 10 20:55:43 2020 +0100| [94988f91076bfee933412b9d5c655e7a26a57194] | committer: Anton Khirnov api-h264-test: use non-obsolete decoding API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94988f91076bfee93… --- tests/api/api-h264-test.c | 85 +++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c index 678a1ea166..04bdfbc9d2 100644 --- a/tests/api/api-h264-test.c +++ b/tests/api/api-h264-test.c @@ -37,15 +37,13 @@ static int video_decode_example(const char *input_filename) AVCodecParameters *origin_par = NULL; AVFrame *fr = NULL; uint8_t *byte_buffer = NULL; - AVPacket pkt; + AVPacket *pkt; AVFormatContext *fmt_ctx = NULL; int number_of_written_bytes; int video_stream; - int got_frame = 0; int byte_buffer_size; int i = 0; int result; - int end_of_stream = 0; result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL); if (result < 0) { @@ -97,6 +95,12 @@ static int video_decode_example(const char *input_filename) return AVERROR(ENOMEM); } + pkt = av_packet_alloc(); + if (!pkt) { + av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); + return AVERROR(ENOMEM); + } + byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 16); byte_buffer = av_malloc(byte_buffer_size); if (!byte_buffer) { @@ -106,43 +110,60 @@ static int video_decode_example(const char *input_filename) printf("#tb %d: %d/%d\n", video_stream, fmt_ctx->streams[video_stream]->time_base.num, fmt_ctx->streams[video_stream]->time_base.den); i = 0; - av_init_packet(&pkt); - do { - if (!end_of_stream) - if (av_read_frame(fmt_ctx, &pkt) < 0) - end_of_stream = 1; - if (end_of_stream) { - pkt.data = NULL; - pkt.size = 0; + + result = 0; + while (result >= 0) { + result = av_read_frame(fmt_ctx, pkt); + if (result >= 0 && pkt->stream_index != video_stream) { + av_packet_unref(pkt); + continue; + } + + if (result < 0) + result = avcodec_send_packet(ctx, NULL); + else { + if (pkt->pts == AV_NOPTS_VALUE) + pkt->pts = pkt->dts = i; + result = avcodec_send_packet(ctx, pkt); } - if (pkt.stream_index == video_stream || end_of_stream) { - got_frame = 0; - if (pkt.pts == AV_NOPTS_VALUE) - pkt.pts = pkt.dts = i; - result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt); - if (result < 0) { + av_packet_unref(pkt); + + if (result < 0) { + av_log(NULL, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); + return result; + } + + while (result >= 0) { + result = avcodec_receive_frame(ctx, fr); + if (result == AVERROR_EOF) + goto finish; + else if (result == AVERROR(EAGAIN)) { + result = 0; + break; + } else if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n"); return result; } - if (got_frame) { - number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, - (const uint8_t* const *)fr->data, (const int*) fr->linesize, - ctx->pix_fmt, ctx->width, ctx->height, 1); - if (number_of_written_bytes < 0) { - av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); - return number_of_written_bytes; - } - printf("%d, %s, %s, %8"PRId64", %8d, 0x%08lx\n", video_stream, - av_ts2str(fr->pts), av_ts2str(fr->pkt_dts), fr->pkt_duration, - number_of_written_bytes, av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes)); + + number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, + (const uint8_t* const *)fr->data, (const int*) fr->linesize, + ctx->pix_fmt, ctx->width, ctx->height, 1); + if (number_of_written_bytes < 0) { + av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); + av_frame_unref(fr); + return number_of_written_bytes; } - av_packet_unref(&pkt); - av_init_packet(&pkt); + printf("%d, %s, %s, %8"PRId64", %8d, 0x%08lx\n", video_stream, + av_ts2str(fr->pts), av_ts2str(fr->pkt_dts), fr->pkt_duration, + number_of_written_bytes, av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes)); + + av_frame_unref(fr); } i++; - } while (!end_of_stream || got_frame); + } - av_packet_unref(&pkt); +finish: + av_packet_free(&pkt); av_frame_free(&fr); avformat_close_input(&fmt_ctx); avcodec_free_context(&ctx);

1 0

lavfi/vf_uspp: convert to the video_enc_params API
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Apr 17 10:32:12 2020 +0200| [c6357311f3808c9640f1604172e5cecc6eea0b1c] | committer: Anton Khirnov lavfi/vf_uspp: convert to the video_enc_params API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6357311f3808c964… --- libavfilter/Makefile | 2 +- libavfilter/vf_uspp.c | 53 +++++++++++++++++++++------------------------------ 2 files changed, 23 insertions(+), 32 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index bb0367e828..ad1046d526 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -450,7 +450,7 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_UNSHARP_OPENCL_FILTER) += vf_unsharp_opencl.o opencl.o \ opencl/unsharp.o OBJS-$(CONFIG_UNTILE_FILTER) += vf_untile.o -OBJS-$(CONFIG_USPP_FILTER) += vf_uspp.o +OBJS-$(CONFIG_USPP_FILTER) += vf_uspp.o qp_table.o OBJS-$(CONFIG_V360_FILTER) += vf_v360.o OBJS-$(CONFIG_VAGUEDENOISER_FILTER) += vf_vaguedenoiser.o OBJS-$(CONFIG_VECTORSCOPE_FILTER) += vf_vectorscope.o diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index 1acef67ffb..8b39f53c3d 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -33,6 +33,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "internal.h" +#include "qp_table.h" #include "avfilter.h" #define MAX_LEVEL 8 /* quality levels */ @@ -52,8 +53,8 @@ typedef struct USPPContext { AVCodecContext *avctx_enc[BLOCK*BLOCK]; AVFrame *frame; AVFrame *frame_dec; - uint8_t *non_b_qp_table; - int non_b_qp_alloc_size; + int8_t *non_b_qp_table; + int non_b_qp_stride; int use_bframe_qp; } USPPContext; @@ -386,45 +387,32 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFrame *out = in; int qp_stride = 0; - uint8_t *qp_table = NULL; + int8_t *qp_table = NULL; + int ret = 0; /* if we are not in a constant user quantizer mode and we don't want to use * the quantizers from the B-frames (B-frames often have a higher QP), we * need to save the qp table from the last non B-frame; this is what the * following code block does */ - if (!uspp->qp) { - qp_table = av_frame_get_qp_table(in, &qp_stride, &uspp->qscale_type); - - if (qp_table && !uspp->use_bframe_qp && in->pict_type != AV_PICTURE_TYPE_B) { - int w, h; - - /* if the qp stride is not set, it means the QP are only defined on - * a line basis */ - if (!qp_stride) { - w = AV_CEIL_RSHIFT(inlink->w, 4); - h = 1; - } else { - w = qp_stride; - h = AV_CEIL_RSHIFT(inlink->h, 4); - } - - if (w * h > uspp->non_b_qp_alloc_size) { - int ret = av_reallocp_array(&uspp->non_b_qp_table, w, h); - if (ret < 0) { - uspp->non_b_qp_alloc_size = 0; - return ret; - } - uspp->non_b_qp_alloc_size = w * h; - } + if (!uspp->qp && (uspp->use_bframe_qp || in->pict_type != AV_PICTURE_TYPE_B)) { + ret = ff_qp_table_extract(in, &qp_table, &qp_stride, NULL, &uspp->qscale_type); + if (ret < 0) { + av_frame_free(&in); + return ret; + } - av_assert0(w * h <= uspp->non_b_qp_alloc_size); - memcpy(uspp->non_b_qp_table, qp_table, w * h); + if (!uspp->use_bframe_qp && in->pict_type != AV_PICTURE_TYPE_B) { + av_freep(&uspp->non_b_qp_table); + uspp->non_b_qp_table = qp_table; + uspp->non_b_qp_stride = qp_stride; } } if (uspp->log2_count && !ctx->is_disabled) { - if (!uspp->use_bframe_qp && uspp->non_b_qp_table) + if (!uspp->use_bframe_qp && uspp->non_b_qp_table) { qp_table = uspp->non_b_qp_table; + qp_stride = uspp->non_b_qp_stride; + } if (qp_table || uspp->qp) { @@ -456,7 +444,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) inlink->w, inlink->h); av_frame_free(&in); } - return ff_filter_frame(outlink, out); + ret = ff_filter_frame(outlink, out); + if (qp_table != uspp->non_b_qp_table) + av_freep(&qp_table); + return ret; } static av_cold void uninit(AVFilterContext *ctx)

1 0

lavfi/vf_codecview: convert to the video_enc_params API
by Anton Khirnov 01 Jan '21

01 Jan '21

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Apr 17 10:32:12 2020 +0200| [7f7eb137d6e04d73eb851fc847a54a47384748dc] | committer: Anton Khirnov lavfi/vf_codecview: convert to the video_enc_params API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f7eb137d6e04d73e… --- libavfilter/Makefile | 2 +- libavfilter/vf_codecview.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 1be93e443a..bb0367e828 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -193,7 +193,7 @@ OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o OBJS-$(CONFIG_CHROMANR_FILTER) += vf_chromanr.o OBJS-$(CONFIG_CHROMASHIFT_FILTER) += vf_chromashift.o OBJS-$(CONFIG_CIESCOPE_FILTER) += vf_ciescope.o -OBJS-$(CONFIG_CODECVIEW_FILTER) += vf_codecview.o +OBJS-$(CONFIG_CODECVIEW_FILTER) += vf_codecview.o qp_table.o OBJS-$(CONFIG_COLORBALANCE_FILTER) += vf_colorbalance.o OBJS-$(CONFIG_COLORCHANNELMIXER_FILTER) += vf_colorchannelmixer.o OBJS-$(CONFIG_COLORKEY_FILTER) += vf_colorkey.o diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index 331bfba777..197dc96136 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -33,6 +33,7 @@ #include "libavutil/motion_vector.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "qp_table.h" #include "internal.h" #define MV_P_FOR (1<<0) @@ -219,8 +220,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterLink *outlink = ctx->outputs[0]; if (s->qp) { - int qstride, qp_type; - int8_t *qp_table = av_frame_get_qp_table(frame, &qstride, &qp_type); + int qstride, qp_type, ret; + int8_t *qp_table; + + ret = ff_qp_table_extract(frame, &qp_table, &qstride, NULL, &qp_type); + if (ret < 0) { + av_frame_free(&frame); + return ret; + } if (qp_table) { int x, y; @@ -240,6 +247,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) pv += lzv; } } + av_freep(&qp_table); } if (s->mv || s->mv_type) {

1 0