From: Niklas Haas <ffmpeg@haasn.xyz> To: ffmpeg-devel@ffmpeg.org Cc: Niklas Haas <git@haasn.dev> Subject: [FFmpeg-devel] [PATCH v2 06/13] avcodec/encode: enforce AVCodec capabilities at encode time Date: Fri, 13 Oct 2023 16:24:44 +0200 Message-ID: <20231013142706.23971-7-ffmpeg@haasn.xyz> (raw) In-Reply-To: <20231013142706.23971-1-ffmpeg@haasn.xyz> From: Niklas Haas <git@haasn.dev> In general, the logic is always the same: if the codec supports only a single format, enforce it if possible. Otherwise, throw an error when an incompatible format is thrown. To preserve backwards compatibility and make this check less pedantic than it needs to be, always consider 'AVCOL_*_UNKNOWN/UNSPECIFIED' a valid value. That way, we will only throw an error if the user explicitly set a color value that we explicitly know is unsupported. --- libavcodec/encode.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index a436be2657..f22b17f33e 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -611,6 +611,108 @@ static int encode_preinit_video(AVCodecContext *avctx) avctx->color_range = AVCOL_RANGE_JPEG; } + if (c->csps) { + for (i = 0; c->csps[i] != AVCOL_SPC_UNSPECIFIED; i++) + if (avctx->colorspace == c->csps[i]) + break; + if (c->csps[i] == AVCOL_SPC_UNSPECIFIED) { + av_log(avctx, AV_LOG_ERROR, + "Specified colorspace %s is not supported by the %s encoder.\n", + av_color_space_name(avctx->colorspace), c->name); + av_log(avctx, AV_LOG_ERROR, "Supported colorspaces:\n"); + for (int p = 0; c->csps[p] != AVCOL_SPC_UNSPECIFIED; p++) { + av_log(avctx, AV_LOG_ERROR, " %s\n", + av_color_space_name(c->csps[p])); + } + return AVERROR(EINVAL); + } + } + + if (c->color_ranges) { + for (i = 0; c->color_ranges[i] != AVCOL_RANGE_UNSPECIFIED; i++) { + if (avctx->color_range == c->color_ranges[i]) + break; + } + if (c->color_ranges[i] == AVCOL_RANGE_UNSPECIFIED) { + if (i == 1 && !avctx->color_range) { + avctx->color_range = c->color_ranges[0]; + } else if (avctx->color_range) { + av_log(avctx, AV_LOG_ERROR, + "Specified color range %s is not supported by the %s encoder.\n", + av_color_range_name(avctx->color_range), c->name); + av_log(avctx, AV_LOG_ERROR, "Supported color ranges:\n"); + for (int p = 0; c->color_ranges[p] != AVCOL_RANGE_UNSPECIFIED; p++) { + av_log(avctx, AV_LOG_ERROR, " %s\n", + av_color_range_name(c->color_ranges[p])); + } + return AVERROR(EINVAL); + } + } + } + + if (c->chroma_locs) { + for (i = 0; c->chroma_locs[i] != AVCHROMA_LOC_UNSPECIFIED; i++) + if (avctx->chroma_sample_location == c->chroma_locs[i]) + break; + if (c->chroma_locs[i] == AVCHROMA_LOC_UNSPECIFIED) { + if (i == 1 && !avctx->chroma_sample_location) { + avctx->chroma_sample_location = c->chroma_locs[0]; + } else if (avctx->chroma_sample_location) { + av_log(avctx, AV_LOG_ERROR, + "Specified chroma sample location %s is not supported by the %s encoder.\n", + av_chroma_location_name(avctx->chroma_sample_location), c->name); + av_log(avctx, AV_LOG_ERROR, "Supported chroma sample locations:\n"); + for (int p = 0; c->chroma_locs[p] != AVCHROMA_LOC_UNSPECIFIED; p++) { + av_log(avctx, AV_LOG_ERROR, " %s\n", + av_chroma_location_name(c->chroma_locs[p])); + } + return AVERROR(EINVAL); + } + } + } + + if (c->primaries) { + for (i = 0; c->primaries[i] != AVCOL_PRI_UNSPECIFIED; i++) + if (avctx->color_primaries == c->primaries[i]) + break; + if (c->primaries[i] == AVCOL_PRI_UNSPECIFIED) { + if (i == 1 && !avctx->color_primaries) { + avctx->color_primaries = c->primaries[0]; + } else if (avctx->color_primaries) { + av_log(avctx, AV_LOG_ERROR, + "Specified color primaries %s is not supported by the %s encoder.\n", + av_color_primaries_name(avctx->color_primaries), c->name); + av_log(avctx, AV_LOG_ERROR, "Supported color primaries:\n"); + for (int p = 0; c->primaries[p] != AVCOL_PRI_UNSPECIFIED; p++) { + av_log(avctx, AV_LOG_ERROR, " %s\n", + av_color_primaries_name(c->primaries[p])); + } + return AVERROR(EINVAL); + } + } + } + + if (c->trcs) { + for (i = 0; c->trcs[i] != AVCOL_TRC_UNSPECIFIED; i++) + if (avctx->color_trc == c->trcs[i]) + break; + if (c->trcs[i] == AVCOL_TRC_UNSPECIFIED) { + if (i == 1 && !avctx->color_trc) { + avctx->color_trc = c->trcs[0]; + } else if (avctx->color_trc) { + av_log(avctx, AV_LOG_ERROR, + "Specified color transfer characteristics %s is not supported by the %s encoder.\n", + av_color_transfer_name(avctx->color_trc), c->name); + av_log(avctx, AV_LOG_ERROR, "Supported color transfer characteristics:\n"); + for (int p = 0; c->trcs[p] != AVCOL_TRC_UNSPECIFIED; p++) { + av_log(avctx, AV_LOG_ERROR, " %s\n", + av_color_transfer_name(c->trcs[p])); + } + return AVERROR(EINVAL); + } + } + } + if ( avctx->bits_per_raw_sample < 0 || (avctx->bits_per_raw_sample > 8 && pixdesc->comp[0].depth <= 8)) { av_log(avctx, AV_LOG_WARNING, "Specified bit depth %d not possible with the specified pixel formats depth %d\n", -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-10-13 14:28 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-10-13 14:24 [FFmpeg-devel] [PATCH v2 00/13] YUVJ removal Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 01/13] avfilter/vf_scale: don't change range by default Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 02/13] avcodec: add extended AVCodec color metadata Niklas Haas 2023-10-13 17:10 ` Andreas Rheinhardt 2023-10-13 18:52 ` Vittorio Giovara 2023-10-14 10:29 ` Niklas Haas 2023-10-14 11:46 ` Niklas Haas 2023-10-20 13:54 ` Anton Khirnov 2023-10-20 14:11 ` Michael Niedermayer 2023-10-20 14:01 ` Anton Khirnov 2023-10-14 13:31 ` Leo Izen 2023-10-14 13:40 ` Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 03/13] fftools/ffmpeg_filter: auto-convert range if needed Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 04/13] lavfi/vf_colorspace: support prim/trc/csp passthrough Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 05/13] fftools/ffmpeg_filter: auto-insert colorspace filter Niklas Haas 2023-10-13 14:24 ` Niklas Haas [this message] 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 07/13] tests/fate: force MPEG range for rawvideo tests Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 08/13] tests/fate: allow conversion filters in jpg-icc test Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 09/13] lavc: set color_ranges for YUVJ-only codecs Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 10/13] lavfi/lavu/lavc: remove YUVJ pixel formats Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 11/13] swscale/utils: simplify JPEG handling function Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 12/13] tests/fate: remove unused YUVJ ref files Niklas Haas 2023-10-13 14:24 ` [FFmpeg-devel] [PATCH v2 13/13] avutil/pixdesc: remove old yuvj pixel format check Niklas Haas 2023-10-13 18:33 ` [FFmpeg-devel] [PATCH v2 00/13] YUVJ removal Vittorio Giovara 2023-10-13 21:14 ` Lynne 2023-10-13 22:21 ` Vittorio Giovara 2023-10-14 13:11 ` Lynne 2023-10-14 15:15 ` Vittorio Giovara 2023-10-14 15:18 ` Lynne 2023-10-20 12:14 ` Ronald S. Bultje 2023-10-20 16:14 ` Vittorio Giovara 2023-10-20 23:13 ` Ronald S. Bultje 2023-10-21 23:20 ` Michael Niedermayer 2023-10-24 0:56 ` Vittorio Giovara 2023-10-25 22:15 ` Michael Niedermayer 2023-10-20 11:30 ` Niklas Haas 2023-10-20 16:17 ` Vittorio Giovara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231013142706.23971-7-ffmpeg@haasn.xyz \ --to=ffmpeg@haasn.xyz \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=git@haasn.dev \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git