From patchwork Wed Oct 11 14:55:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b22:b0:15d:8365:d4b8 with SMTP id fp34csp965568pzb; Wed, 11 Oct 2023 08:10:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFaBVJCqdPhlvfj9DG6eAhiyUHucvuF+vnJVM6tBcttl4pxaJCBFcS3iZqAf9aY0h5FHQUH X-Received: by 2002:a17:907:2704:b0:9ae:961a:de81 with SMTP id w4-20020a170907270400b009ae961ade81mr17272368ejk.27.1697037001846; Wed, 11 Oct 2023 08:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697037001; cv=none; d=google.com; s=arc-20160816; b=lKF4OtoZkXmnxPJKi8EEquoqq9W4zhnIc9lflMCr2dRrlZJ9P5b+s5zdU6tgsiKq/d 2qL9qiBZ5gAm/F3yNZMsk4tQ2QwHAONMNpH9BoCQ1btcqOmjXPxDrtU6kqhtfDaZPg6m jwAy3AhJKzx5QBjgXpKYGVJ0ioNro9LVwPloZSoidAxDq6bOy93iqk5YqaEZS+Pzevf8 Ee9sSaXzC5VZ4knmNtrpTfSVJzxU8Qx0XWkOWQKQFLJJ1uNMYLUoIbidLFw4hMI1J7VP 7NRkzjNSJwawIvoWLsOmMO0qSXs6+isQVaxu0OyaGB8nJ6dqhejeIOtEGwgG70FgCOl6 Vm7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=KkJQfEEi91IsT8l6u8iyfois84ohFWBDpUdweJK8zkA=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ZSrTvXTPf66Dpg9b2eiNJJduhGphyqeC1+eYHpK0iLSIfQ9xU2TJmAC1sJZmPLgEOo Ijiy4CINu4Dhno4H20jRmgy6El6kQ89yS05yDnt42XdA3Xsh1YaIbc7PFSInPFOHSbxF w21Ccky9PDpaL6MQEFoxE/GL5To1ah2Rp44BRHEaC7kibYZVsyxL2MnqDfx6lCYGSS6L n/FICr6YvaIzaaGEQDDdhiAwMzXHDGc1SYQ+XIYBL1bKDWNhqyikmsd3o19nt6PEAlYK d+ZIY24t/HnaQKywjrynvoQWlrVUxq6jYw1lL8HFZVd2bN6Nt89bSRlV3B6ph7CLHECu dOXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ELrkx0Mf; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p6-20020a1709061b4600b0098e003216basi6797187ejg.110.2023.10.11.08.09.57; Wed, 11 Oct 2023 08:10:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ELrkx0Mf; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 900B268CBC7; Wed, 11 Oct 2023 18:09:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sMwzn9a/l7nM 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",