From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6675E45E56 for ; Wed, 11 Oct 2023 15:09:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C39168CC2D; Wed, 11 Oct 2023 18:09:05 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C7E268CC00 for ; Wed, 11 Oct 2023 18:08:59 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 8D1D44BC3B; Wed, 11 Oct 2023 17:08:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1697036934; bh=d25rzPzhHwGz9WqLmnDGV9GQwZ5386g7utiVSedl6Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ELrkx0MfRYbSm+AK/Pu6cvjBhvi8Vbsw9W5BbtXpibvkS2hO3ErPNWUygzH+VXtyr nr/UgmdsmVeJO8NRFySLLzNDNrP+ItlZdJ26d/obSYQsfEeSLpF4dNUBuGr1RMSVvA DAAZ+GKvNYk9MtqI0f3JNfc1869n1iBI8Eg5dH+s= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Oct 2023 16:55:39 +0200 Message-ID: <20231011150848.117897-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231011150848.117897-1-ffmpeg@haasn.xyz> References: <20231011150848.117897-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/encode: enforce AVCodec capabilities at encode time X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas 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".