From patchwork Fri Sep 29 20:35:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Mather X-Patchwork-Id: 44035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp28160pzf; Fri, 29 Sep 2023 13:36:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfqkZ0JNzsQzuELkOE2P3uuTWKJZoPFUVugIfKwOQsErKgSsWa5Q1Bzm8GTVZ/OO0DkLzB X-Received: by 2002:a17:906:209e:b0:9a2:120a:5779 with SMTP id 30-20020a170906209e00b009a2120a5779mr5494605ejq.60.1696019785701; Fri, 29 Sep 2023 13:36:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696019785; cv=none; d=google.com; s=arc-20160816; b=Duk4PCG+DDFyRdWmZ6a/3ziUNB/3p84KZVtHKHPr7W5Vqxd0Pj952Wf/DqV9QawTvq 350o2E8uqzkQ0N/J0no3Dfgdzu3bRpWpEkqXteUQOg7fIFsqUi3X05HWzSwUbfL5GI1/ fO2aVyNr9xYKntc/55M65vwv2PjPuNZky7tMMK+w51r5hvLKfeCifI4yVgJS4Ct45ryb U1NM5Mkh0PgN8B2MzI54AKhbDlnu34clLbn45KRgspX2r4syn8LT1/IU9Cyn12XOVtao bkAgvB/ecZePIHia2BI6s/WM/sd2X/oNYjAuj2yhPMo+poEhif6e1hP3i9WYcZTnWY3n NTuw== 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:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=VG1eY5iOhbwNxWHPb7XE3ijqglepliC8mPUUPxMXbBY=; fh=AHItY7UTU8Hy6V70XkXuM/6WNlKn4HyrOMqcDQzM788=; b=o/v6rbyuUtqrC+d6+bPxLhVtJQ2V+DuiTyEnVb1Bx5PFDj3dXB8IHcr/KeKGB8LTLU J5ag/kbVw1hEE6HPAXNTZzMUximo2Hk3v3D5o6tOsPXSG03ozosW3ISpwFcXS0sVeyun WMGO36b/khSPtm11jpyyV+IVmZ0B3LxDCyQkV25UKegReiGPpTQngcqfHpePSVXbyAQg 5houQutobZt1WpoZZhCuRu0wXul0gkG4CS7LP0jhr14YRgmIecp/ZRM8Szu+YcvX420c 3et3evMKVnc1IkN+Kcfo/KLtPzQxZVzt3IYLkPrzdVXkKjSR3dEYS4XLm8uIZYNoMwaU ECFw== ARC-Authentication-Results: i=1; mx.google.com; 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 x22-20020a1709064a9600b0099ceec0a4aesi15454481eju.969.2023.09.29.13.36.25; Fri, 29 Sep 2023 13:36:25 -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; 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 6DE3568CC51; Fri, 29 Sep 2023 23:36:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0485668CB93 for ; Fri, 29 Sep 2023 23:36:06 +0300 (EEST) Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6c644a1845cso516749a34.2 for ; Fri, 29 Sep 2023 13:36:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696019765; x=1696624565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d1atbCYILaQ7jT0ExAwUZB3ymF7j9oHpNZvWZFfweig=; b=XAHytSe274RylwRZKLd3GxxXdDpQEpzJay0rXF81AgBPHudba1fomgkRdqKrymCI7M fycBXRZV7VdvLfBGxIytjKmMQ0xqLIm+gj/idYQpjR0HLO1fo3ieA2MoU4uchJTUPZ6E 2DX30F1eBZMc+P+p1/gsuENRX8Y+xF1sUHiGvbKSNzYpuBpkx2oK00dW8Pmislnk2VQa K5vUNDzl21IXswuLVrQZuQILEoY7iXOxKpPjL0E/v9918180UDmozX2rCYeCkzRHzhbr 7j7b7wppbhMkviP04rzzw4oWuUTADHu5dvUBm0NvqvP2TNvJBi5eFwAFQg6dvtpJkRMg Sb7g== X-Gm-Message-State: AOJu0YxlaJlxFDzI1M8IE8rH13EAml+sKJxdLRUwEKUJD7Pe7XSdVmQh evw4hYkCRxoNVLHuDAQ7TOpjbtKciNKQ1crS3tQtlQ== X-Received: by 2002:a05:6830:65c1:b0:6b9:f1d3:160 with SMTP id co1-20020a05683065c100b006b9f1d30160mr6911826otb.11.1696019764972; Fri, 29 Sep 2023 13:36:04 -0700 (PDT) Received: from provost.sidefx.com ([167.100.93.16]) by smtp.gmail.com with ESMTPSA id r6-20020a81c306000000b0059bcadded9dsm5668283ywk.116.2023.09.29.13.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 13:36:04 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Sep 2023 16:35:59 -0400 Message-Id: <20230929203559.65832-1-johnmather@sidefx.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230912174029.41862-1-johnmather@sidefx.com> References: <20230912174029.41862-1-johnmather@sidefx.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libkvazaar: Simplified codec context color settings. 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: , X-Patchwork-Original-From: John Mather via ffmpeg-devel From: John Mather Reply-To: FFmpeg development discussions and patches Cc: John Mather Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c7K+b5stE9Kj Both FFmpeg and libkvazaar follow H.273, so we don't have to utilize a large LUT. Signed-off-by: John Mather --- libavcodec/libkvazaar.c | 62 ++++++----------------------------------- 1 file changed, 8 insertions(+), 54 deletions(-) diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index cd87a9106d..984f78ba65 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -56,10 +56,6 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx) const kvz_api *const api = ctx->api = kvz_api_get(8); kvz_config *cfg = NULL; kvz_encoder *enc = NULL; - int8_t kvz_fullrange = -1; - int8_t kvz_colorprim = -1; - int8_t kvz_transfer = -1; - int8_t kvz_colormatrix = -1; /* Kvazaar requires width and height to be multiples of eight. */ if (avctx->width % 8 || avctx->height % 8) { @@ -105,56 +101,14 @@ FF_ENABLE_DEPRECATION_WARNINGS cfg->rc_algorithm = KVZ_LAMBDA; } - switch (avctx->color_range) { - case AVCOL_RANGE_JPEG: kvz_fullrange = 1; break; - case AVCOL_RANGE_MPEG: kvz_fullrange = 0; break; - default: kvz_fullrange = 0; - } - cfg->vui.fullrange = kvz_fullrange; - - switch (avctx->color_primaries) { - case AVCOL_PRI_BT709: kvz_colorprim = 1; break; - case AVCOL_PRI_BT470M: kvz_colorprim = 4; break; - case AVCOL_PRI_BT470BG: kvz_colorprim = 5; break; - case AVCOL_PRI_SMPTE170M: kvz_colorprim = 6; break; - case AVCOL_PRI_SMPTE240M: kvz_colorprim = 7; break; - case AVCOL_PRI_FILM: kvz_colorprim = 8; break; - case AVCOL_PRI_BT2020: kvz_colorprim = 9; break; - default: kvz_colorprim = 2; // undef - } - cfg->vui.colorprim = kvz_colorprim; - - switch (avctx->color_trc) { - case AVCOL_TRC_BT709: kvz_transfer = 1; break; - case AVCOL_TRC_GAMMA22: kvz_transfer = 4; break; // bt470m - case AVCOL_TRC_GAMMA28: kvz_transfer = 5; break; // bt470bg - case AVCOL_TRC_SMPTE170M: kvz_transfer = 6; break; - case AVCOL_TRC_SMPTE240M: kvz_transfer = 7; break; - case AVCOL_TRC_LINEAR: kvz_transfer = 8; break; - case AVCOL_TRC_LOG: kvz_transfer = 9; break; // log100 - case AVCOL_TRC_LOG_SQRT: kvz_transfer = 10; break; // log316 - case AVCOL_TRC_IEC61966_2_4: kvz_transfer = 11; break; - case AVCOL_TRC_BT1361_ECG: kvz_transfer = 12; break; // bt1361e - case AVCOL_TRC_IEC61966_2_1: kvz_transfer = 13; break; - case AVCOL_TRC_BT2020_10: kvz_transfer = 14; break; - case AVCOL_TRC_BT2020_12: kvz_transfer = 15; break; - default: kvz_transfer = 2; // undef - } - cfg->vui.transfer = kvz_transfer; - - switch (avctx->colorspace) { - case AVCOL_SPC_RGB: kvz_colormatrix = 0; break; // gbr - case AVCOL_SPC_BT709: kvz_colormatrix = 1; break; - case AVCOL_SPC_FCC: kvz_colormatrix = 5; break; - case AVCOL_SPC_BT470BG: kvz_colormatrix = 6; break; - case AVCOL_SPC_SMPTE170M: kvz_colormatrix = 7; break; - case AVCOL_SPC_SMPTE240M: kvz_colormatrix = 8; break; - case AVCOL_SPC_YCGCO: kvz_colormatrix = 9; break; - case AVCOL_SPC_BT2020_NCL: kvz_colormatrix = 10; break; // bt2020nc - case AVCOL_SPC_BT2020_CL: kvz_colormatrix = 11; break; // bt2020c - default: kvz_colormatrix = 2; // undef - } - cfg->vui.colormatrix = kvz_colormatrix; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) + cfg->vui.fullrange = avctx->color_range == AVCOL_RANGE_JPEG; + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) + cfg->vui.colorprim = avctx->color_primaries; + if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED) + cfg->vui.transfer = avctx->color_trc; + if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED) + cfg->vui.colormatrix = avctx->colorspace; if (ctx->kvz_params) { AVDictionary *dict = NULL;