From patchwork Tue Sep 12 17:40:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Mather X-Patchwork-Id: 43717 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2955196pzb; Tue, 12 Sep 2023 10:40:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE49CDP4SPUv9VWJ7CINdXn3uL7V9/yccQPGIKVB5LNYbSV7yWdLjkGMWOMARrAOF+Sm6XX X-Received: by 2002:a17:906:51d0:b0:9aa:209f:20c3 with SMTP id v16-20020a17090651d000b009aa209f20c3mr7175577ejk.68.1694540450596; Tue, 12 Sep 2023 10:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694540450; cv=none; d=google.com; s=arc-20160816; b=wjG6SmXppdg9LFXWXhjpovXMYqGEU+Gzx9PlAd8F/F1tnMhA37KmcowFec440/IQMq 5py3RGIbqqqDolcMJ3sf+VHpHIS/5He+jZXV6K7d/82lQI9Gr1sgfkpel+86Mzqole3a 1uAaJ6fT3g4mhv24uaUSXnApPajEWpifH6AzsAF1TYi52CQDJFfz+3T7jZkWyDoLRL6G 64tmfkzFXIb/xE5BVE3NJm26NDIGGqPijWDsdF1bGI3nb5mlZTnWsPgh8xuXNmQQgaDx M4STfd+HhmuMTGVpK4Q/GMV5nWjEj6qqj8xShAOyxpkuWcYDJHRM5TkKrAWpsVoRberN WSSw== 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:message-id:date:to :delivered-to; bh=nrkvwAhSH6umG+H6jHNHW2pjHidzNR6Utk8t7ArKnrU=; fh=AHItY7UTU8Hy6V70XkXuM/6WNlKn4HyrOMqcDQzM788=; b=USDGJ44ZROUul3rhd9vAsycsUrk7x65ejRJJA9JH/FAh3B6FzzRP5mRsL7RbSBzm6L 9yztAmLKl+e6HnnN6QdViMwKJ304Efhk/iO9G2mcLtDq/owoBYafqPGvnHy9/2Z5Qzcq g1nx+xauD28+MLkSwnHE2KjAGDhEUholsNSrn+pq25c2SbdRVxh34EVKYguhfM1ccJmb 9bEXYvOpgg2foW8dQ3rjnTkumc/E+LlIcEUQP3YyaLn6yCKqYkRocBalCUXJxQm0zkp9 tE2VZDPfTnz7fENmJeAEb1pI+5Eogx4zenzcrOyRCeo4AWO5vazN4AeeDYydjcEmClTW 4pyw== 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 qx12-20020a170906fccc00b00993686e193csi9345916ejb.53.2023.09.12.10.40.49; Tue, 12 Sep 2023 10:40:50 -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 0812468C9B6; Tue, 12 Sep 2023 20:40:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CC0068BB63 for ; Tue, 12 Sep 2023 20:40:40 +0300 (EEST) Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-59bbbeea69fso371537b3.0 for ; Tue, 12 Sep 2023 10:40:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694540438; x=1695145238; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w+Lh6UHh/GExKDrkQr9fZFXkxcB2fsi8Gf9uSExYSIY=; b=SvbJnqSYSgWYMoUfNZQ1xP0+1zV+FZcF359NHs3WDONMqVC8toQV2K6Juhm7NGGO+2 Z7WlD9sNuL11lL8FEafB/WLu+fzGRrf6CPBMH5emn1iPk7yhOCWBtU43EJ5SUf3PlWl3 xAMgKf94nBSWiy209myl/zlUy8pON7+OiviiN0pDUaNMXsXmHH4I7SwKrFtbRlFFny43 XYw5qcnJlOb68O0N98Dg/xVkPAIkpSqI0/NEnQwYoxW6Qbrqtk8OEXQb4jpzlu4+eJUK eA58ZyNVJ/LNvisqAsSQcchubYAkVup8rAYuZMKsvzhlX7LAa0klFO83ojuCX+NgF1t9 bcvQ== X-Gm-Message-State: AOJu0YyIARnMQI7ad24pTexLqVXG/JEGjZepnS61LsclbJMgBftqFPqt tYpEFsPJ0lvF5HqqtLPL6VAfXn9LyoJzKDcSNzKH0w== X-Received: by 2002:a81:5b0a:0:b0:59b:586c:c65e with SMTP id p10-20020a815b0a000000b0059b586cc65emr119060ywb.36.1694540438489; Tue, 12 Sep 2023 10:40:38 -0700 (PDT) Received: from provost.sidefx.com ([167.100.93.132]) by smtp.gmail.com with ESMTPSA id x188-20020a0deec5000000b00582b239674esm2634134ywe.129.2023.09.12.10.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 10:40:37 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 13:40:29 -0400 Message-Id: <20230912174029.41862-1-johnmather@sidefx.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libkvazaar: Respect 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: VGr/+WIkvQrr This patch makes the libkvazaar encoder respect color settings that are present on the codec context, including color range, primaries, transfer function and colorspace. --- libavcodec/libkvazaar.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 2ef34dd82e..cd87a9106d 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -56,6 +56,10 @@ 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) { @@ -101,6 +105,57 @@ 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 (ctx->kvz_params) { AVDictionary *dict = NULL; if (!av_dict_parse_string(&dict, ctx->kvz_params, "=", ",", 0)) {