From patchwork Thu May 23 19:50:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 49184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1287290vqf; Thu, 23 May 2024 12:50:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSry1XjPHHOPnNZry5HncTNIhDgnzdD315UuZQLYVCAvekBAAq/6CU3kR+N9IpUiwOOxw6niDucHz05J1mhkiUsdy5lz3yDlKYeA== X-Google-Smtp-Source: AGHT+IH9R+Y5veMTZAKQVTNzBmUySp58HSeJuYuNaI3ngT8dfu+kIOMDGnEPAXEPEomSlarkWROv X-Received: by 2002:a17:906:34c4:b0:a5d:1079:ae43 with SMTP id a640c23a62f3a-a62646cff2bmr20602766b.46.1716493846015; Thu, 23 May 2024 12:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716493846; cv=none; d=google.com; s=arc-20160816; b=eVU3ma0V4RpLLhDKEOSNOytMZsI4WSW+/eMaKnthpbXkK6uueohRvCSRC6OyVPtRtL xe8YxXhFXljmZ6jvHMc2bxa/vLFEhrhNbXd+EORd3V8IjLeuaSc5kMaD8b+uI716oxrq dOBDBFRRIKnVAU72s9FeU9aHwtGrsOYVeLgGUdDv0zaX2WoOsUQEv9VlQ6u04QkxayCB v1+5HP93qlPn6iuUSTJwQ8ssrU4r+6U844PgFRqnHl01kCkPG1M4kPaIR+AGhQmTirj/ ZpwZ7wNFp5VVE5At12tLxQf8YZ0mFtH8gVnogssta/mz8Q93Jv2twhOhxWpD7C9a6+0Y LP4g== 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:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=3aNhOzAtKNp0oL1N1ZP5wXLvg25N8vSOCrkL2EglVb0=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=V/2CCLsmZ0xJjLZBBemPepnoZlhIPJu58k17GYH4G72GTgsT81rEoczwMJNFKanB0/ jzCxjliv1PlpU4M2BGYti9w0eGQfkeNcdOLw3kq6xsqHIRbP+aPBFSaDmojvyCyqkpU+ NGoMYiLwZKBce0kwgOSWCLAbVXBsI25zv2WC85IHHEB6AR2/ibjeWcv2+pSl1zG2jnws wR9OFJ37zfRxQvVdXj1MT4fXlTVxzi/B5MhhA6GSAj6DPBufOQcA2MkppRTy3n3M1SMI dmhevQtQdlBMmU4ly1cdLfSBrhCjc5ciYwAiXWFl3+5X4aRaDp2KRokafCpooRK6SaIl 9Czw==; dara=google.com 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 a640c23a62f3a-a626c7febcesi1588266b.150.2024.05.23.12.50.45; Thu, 23 May 2024 12:50:45 -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 6CD8868D355; Thu, 23 May 2024 22:50:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-232.smtp-out.us-west-2.amazonses.com (a27-232.smtp-out.us-west-2.amazonses.com [54.240.27.232]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 828B268D499 for ; Thu, 23 May 2024 22:50:27 +0300 (EEST) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 23 May 2024 19:50:24 +0000 Mime-Version: 1.0 In-Reply-To: <20240523195019.64019-1-cosmin@cosmin.at> References: <20240523195019.64019-1-cosmin@cosmin.at> <20240523195019.64019-2-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHarUpyU8iX1OOeTgC/HI1UPzU75gAAADLV Thread-Topic: [PATCH v3 1/5] avcodec/dovi_rpu - field and macro for metadata compression X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1716493824 Message-ID: <0101018fa70133a0-c75eef16-284e-4546-b4a9-7f547e9b1d47-000000@us-west-2.amazonses.com> Feedback-ID: ::1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2024.05.23-54.240.27.232 Subject: [FFmpeg-devel] [PATCH v3 1/5] avcodec/dovi_rpu - field and macro for metadata compression 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: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: e4CZNQ9mi2VU From: Cosmin Stejerean Add a field to enable or disable metadata compression since not all clients support this. Introduce DOVI_ENCODING_OPTS macro to faciliate exposing this as an option to encoders. --- libavcodec/dovi_rpu.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 8ce0c88e9d..5406425c0d 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -28,6 +28,11 @@ #include "libavutil/frame.h" #include "avcodec.h" +#define DOVI_ENCODING_OPTS(dovi) \ + { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" }, \ + { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags = VE, .unit = "dovi" }, \ + { "dv_enable_compression", "Enable Dolby Vision metadata compression", OFFSET(dovi.enable_compression), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE }, + #define DOVI_MAX_DM_ID 15 typedef struct DOVIContext { void *logctx; @@ -71,6 +76,11 @@ typedef struct DOVIContext { AVDOVIDmData *ext_blocks; int num_ext_blocks; + /** + * Enable metadata compression in the output. Currently this is experimental. + */ + int enable_compression; + /** * Private fields internal to dovi_rpu.c */ From patchwork Thu May 23 19:50:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 49185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1287347vqf; Thu, 23 May 2024 12:50:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEm0c5Y2Pn05dM2jiDl+tY0wQK9zGoDQzS8ghbQd5EuaynIokg5i8lg3+6AGpnXmsLIQgT/OFMfIYSM8xZ2s0iqXCAXanEwuF8jw== X-Google-Smtp-Source: AGHT+IFvfUVCbJH9c32uTw4OvGnXn8eJIS37MTPXeNMccoN7nEYvxh9W/E82wTFa+ha31g+Dd2w1 X-Received: by 2002:a2e:88cf:0:b0:2dd:409:3b25 with SMTP id 38308e7fff4ca-2e95b0bcdb6mr1030561fa.4.1716493854662; Thu, 23 May 2024 12:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716493854; cv=none; d=google.com; s=arc-20160816; b=VeMZPTgdkA5Io447xEvGkWtwRVSu6POyH0vJQNN2LVbAtajcUv8E8ynxfqv534A15m t77DiAw3XbrZN/4bfuZ22WFyV8AeRDvkVI6aDx9Dq0PX9Gu3TC4KLwwMT/ntbohs6qB9 xPNCFg4i1yhIOb2WRjCruxrWE7PIpvtkgV/9y4SIyz7RCURYGqs7lz9DHZC1IFsLjhZU ckFCWhKfMDSe0XLdrnqsAPDPyWDY72qbbC8clbhfm7Kdpo42KfHH+kpap1qdJYtwzxmx eDyEm3uLKd7P9O0J1LwFozgo3H1iyPygbNJ/c31L7XRfaX5PWilkjSu+lSXSnmnINS6k 2BPQ== 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:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=k1cxIIL8Ii2bv04ulKgZ5etm9DfUWGRScrv51dAA37s=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=oxXDOfxHGfGzS3FS+V2CX5felPSkrd7bnl+jtgLAqzNOfDhIipJECfNNXL2eSR8r1Y E5C8vdeXhpW/RgNEvzanDXjeJUFVWi4H8NJpVcHX3pMAC+OHs7FqYc4c8jK9lCED14wM TZ80o+NJNjE9NSXsuRmDdEWrdhp/487bBb25Tb3R0L0bxJjqqc6LiRh3+TRfau5GsDCU F0JZkrgExMzl02huoNsOcyuQDGcsR/hn/nS0+Pl6hTvZs3hyAfhaF2Ea6A7WVs/QENTc OqoneFtyVJihTqj6jh2OxUbt1UGIZxyU6Yr8U8QusIZx9goY3LVokUPCwyb56gQTJt3t VOug==; dara=google.com 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 4fb4d7f45d1cf-578524966d2si40190a12.453.2024.05.23.12.50.54; Thu, 23 May 2024 12:50:54 -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 5E25168D4ED; Thu, 23 May 2024 22:50:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-233.smtp-out.us-west-2.amazonses.com (a27-233.smtp-out.us-west-2.amazonses.com [54.240.27.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92AD668D4CF for ; Thu, 23 May 2024 22:50:27 +0300 (EEST) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 23 May 2024 19:50:24 +0000 Mime-Version: 1.0 In-Reply-To: <20240523195019.64019-1-cosmin@cosmin.at> References: <20240523195019.64019-1-cosmin@cosmin.at> <20240523195019.64019-3-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHarUpyU8iX1OOeTgC/HI1UPzU75gAAAE2X Thread-Topic: [PATCH v3 2/5] avcodec/dovi_rpuenc - guard metadata compression X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1716493823 Message-ID: <0101018fa701338b-9788938f-7752-4af2-b15b-f90d1d3f4e0c-000000@us-west-2.amazonses.com> Feedback-ID: ::1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2024.05.23-54.240.27.233 Subject: [FFmpeg-devel] [PATCH v3 2/5] avcodec/dovi_rpuenc - guard metadata compression 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: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cA7oQAkLO2Hu From: Cosmin Stejerean Guard use_prev_vdr_rpu by the new enable_compression field since not all clients support this. Separately output when vdr_dm_metadata_changed == 0 fails the DV verifier so turn that off unconditionally for now. --- libavcodec/dovi_rpuenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 3c3e0f84c0..26ed25733a 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -512,8 +512,12 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } } - vdr_dm_metadata_changed = !s->color || memcmp(s->color, color, sizeof(*color)); - use_prev_vdr_rpu = !memcmp(&s->vdr[vdr_rpu_id]->mapping, mapping, sizeof(*mapping)); + // the output when vdr_dm_metadata_changed is 0 fails the DV verifier + // force it to 1 until we can get some samples or documentation on correct syntax + vdr_dm_metadata_changed = 1; // !s->color || memcmp(s->color, color, sizeof(*color)); + + // not all clients support metadata compression + use_prev_vdr_rpu = s->enable_compression && !memcmp(&s->vdr[vdr_rpu_id]->mapping, mapping, sizeof(*mapping)); buffer_size = 12 /* vdr seq info */ + 5 /* CRC32 + terminator */; buffer_size += num_ext_blocks_v1 * 13; From patchwork Thu May 23 19:50:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 49186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1287417vqf; Thu, 23 May 2024 12:51:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1RX0yyDwigrIgtAsR8He+30iYVT9eyxM5tqvW7qZFWCaof4OPDkZh55lHeHl4PGc/cdenP8PeNukxpR0pddCraT5b3q45o0DsdQ== X-Google-Smtp-Source: AGHT+IGK4/5SjSg6Rlp7r5rMC4rkQBkyBNVM/6zzyfwaTzEdeXK77BjLkSV7/jeBz8YZ/UzANn2P X-Received: by 2002:a50:d49e:0:b0:574:ebf6:e37b with SMTP id 4fb4d7f45d1cf-57843e93df0mr2503709a12.12.1716493862830; Thu, 23 May 2024 12:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716493862; cv=none; d=google.com; s=arc-20160816; b=Jeps+873RuGVpHDB/AxCwyaQzc9BzGflRxF3rBwzRDD73MavHsz9HeqsJo+/o62x8M LiBie5/LQZ+UohiI5xxVfgEL1eU2lZodIQfZvMxMUqSI+OE2axzwGKXBOxAw/o7ElsRB BGdzS7RWyNarEyZMzGHivGclS+d0u3jYcaKq9BzOv2Xl2IwfRCbQCXATOS1UHmvN4ebX AJg/YQhfTtq1mxlahPTpHid14wzUHojVvdQAeSVsQkyNw7JR0jrcK5V1EQkKQdh2A7mm uVLFrGHq+tv5HvM0y2wx9NqU2HoOOWTku9ppWbB0MT2l5ERPvWFrsE/otYvER2HsuY5Z /jRA== 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:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=IaFv1v1nMwt8GBKhQ/FU25QBM2+Ht2ypWJCOFpRvZwQ=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=oU1J/jUDxG3S7dpOWdJvOsz8VmZoQIjs4ZroVowqdfy3wcNNVwR2up6/PaPWH1l9fm 0NmqzKFbYcFWDGehqg2mW2wV70D7kbOpc7058i40fnDr7MW3M739dU0MsN3j8lTTNeHj pZTJmbhXuRyqX65mmBeVqZ7BVmZuNUeWye+/vEBzUX9J1dreX2ZMuQXaJ9s6gmurQKTq ylrlTA62oXmJWf93wJ7icFHcrcD9TkwvyvkThk0o+v3X9Id8AcXqoHvva3xeXkuJuTql DMPhc5mkm5VJw8+NmQo0hUNdvc8PSTB86Ub2Wt137hmMI4vroPKYLcBIh59dIfptdo/j krTw==; dara=google.com 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 4fb4d7f45d1cf-578523842desi46803a12.169.2024.05.23.12.51.02; Thu, 23 May 2024 12:51:02 -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 6C21F68D4DF; Thu, 23 May 2024 22:50:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-214.smtp-out.us-west-2.amazonses.com (a27-214.smtp-out.us-west-2.amazonses.com [54.240.27.214]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65C8768D0A4 for ; Thu, 23 May 2024 22:50:29 +0300 (EEST) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 23 May 2024 19:50:26 +0000 Mime-Version: 1.0 In-Reply-To: <20240523195019.64019-1-cosmin@cosmin.at> References: <20240523195019.64019-1-cosmin@cosmin.at> <20240523195019.64019-4-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHarUpyU8iX1OOeTgC/HI1UPzU75gAAAJqI Thread-Topic: [PATCH v3 3/5] avcodec/libaomenc - switch to DOVI_ENCODING_OPTS X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1716493825 Message-ID: <0101018fa7013acc-db6169a9-97d1-433a-956c-448c110aa807-000000@us-west-2.amazonses.com> Feedback-ID: ::1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2024.05.23-54.240.27.214 Subject: [FFmpeg-devel] [PATCH v3 3/5] avcodec/libaomenc - switch to DOVI_ENCODING_OPTS 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: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZMD0H4SoGfGM From: Cosmin Stejerean --- libavcodec/libaomenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index dec74ebecd..22429717e8 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1487,8 +1487,7 @@ static const AVOption options[] = { { "ssim", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_SSIM}, 0, 0, VE, .unit = "tune"}, FF_AV1_PROFILE_OPTS { "still-picture", "Encode in single frame mode (typically used for still AVIF images).", OFFSET(still_picture), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, VE }, - { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" }, - { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags = VE, .unit = "dovi" }, + DOVI_ENCODING_OPTS(dovi) { "enable-rect-partitions", "Enable rectangular partitions", OFFSET(enable_rect_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-1to4-partitions", "Enable 1:4/4:1 partitions", OFFSET(enable_1to4_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-ab-partitions", "Enable ab shape partitions", OFFSET(enable_ab_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, From patchwork Thu May 23 19:50:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 49188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1287558vqf; Thu, 23 May 2024 12:51:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjl5/J7yd0pr6sWZsmuVDuxsUxniX2dSwbYvRIH4CeT/CbigDzrVY8z1wbf5asCMLoGjANiPjyYHvTKpOg1iZzreVXeYMJQCACBA== X-Google-Smtp-Source: AGHT+IHnBdN42LpJuXmUlEz/uHrbRlGVsJTl2LrCrW/NzvXQxgAWbXuXwpIC6VmS1QQ1JTVBAxJP X-Received: by 2002:a50:96c3:0:b0:578:2474:8e2b with SMTP id 4fb4d7f45d1cf-57843d8fd26mr2377368a12.10.1716493880979; Thu, 23 May 2024 12:51:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716493880; cv=none; d=google.com; s=arc-20160816; b=g+jWGCFt9WZYrYCES5lIZSyTNGEQb8l4bASeLOmpu9UZq6lhXbehvX2KZtR3jvdp1S asbwki6k+VmIb+Gx/JEnS6ORZvjudgC8mgRzp8q/hT59OMFUhmmJ2LAYHxoXrhTSNdt6 uw0bFr28IAn9Sua6nxYDfGQegFIu7591XsOcICeOj4Ve4lWk8bP7L1NfwSKGp8YVwuIG C3KFW0Fc3NpWQDJWeHx4UdZg+ilvSDHrRWzOvgVrzSAxaWih8T1YoC0FM5X5U4LdFJCU Nez3O1c17khGkDfFW2RSJ2BzLjcG5t3XGyK3UMui6yC3ZcrJ4BjZj19zxQHfjg2QfXzR GikA== 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:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=5C6mWWK4BjD0ub34v7tU8LX+Dbw2Tvdy6Meo3187M5E=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=OM5IXuhAvDa4zmlU34fTblTdBoZQeuhmDkm9nPHzwnxVB7B7vNHjG5CceOID2OQz+w ZEbL9kbGpV/lUi0DeLBLBJdJDEqsesGRnfvSKjf8uF57FpKY2ohZ6HoxIXvkFcoIRtvS 38Vsfa+ErQK62SmIkZGmgapzXax1j+DvlXWLcF1XxK9FMFebXMbryeo43G+HEs3c6dER YXi61w9dLgET3oEi3EObO8wJsvpXCPphCdTbVchdLLmcdNRl4j3h3CcGV9qXfXWPYRYg ZLZ4WOgSxub/MhMSRITYTPu2DamIcOh9DAF3dJ5LgLQ1DC/7b8SwtC0hJz7HiAgbxI60 doWQ==; dara=google.com 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 4fb4d7f45d1cf-5785245fcb0si41287a12.221.2024.05.23.12.51.20; Thu, 23 May 2024 12:51:20 -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 6568168D512; Thu, 23 May 2024 22:50:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-233.smtp-out.us-west-2.amazonses.com (a27-233.smtp-out.us-west-2.amazonses.com [54.240.27.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B587068D4DF for ; Thu, 23 May 2024 22:50:32 +0300 (EEST) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 23 May 2024 19:50:30 +0000 Mime-Version: 1.0 In-Reply-To: <20240523195019.64019-1-cosmin@cosmin.at> References: <20240523195019.64019-1-cosmin@cosmin.at> <20240523195019.64019-5-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHarUpyU8iX1OOeTgC/HI1UPzU75gAAALvK Thread-Topic: [PATCH v3 4/5] avcodec/libsvtav1 - switch to DOVI_ENCODING_OPTS X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1716493829 Message-ID: <0101018fa701496b-d903866c-5137-478a-bcc7-ef209a0b4744-000000@us-west-2.amazonses.com> Feedback-ID: ::1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2024.05.23-54.240.27.233 Subject: [FFmpeg-devel] [PATCH v3 4/5] avcodec/libsvtav1 - switch to DOVI_ENCODING_OPTS 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: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xx7NZkXGtrVc From: Cosmin Stejerean --- libavcodec/libsvtav1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 2fef8c8971..4a8cab4eb9 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -731,8 +731,7 @@ static const AVOption options[] = { AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 63, VE }, { "svtav1-params", "Set the SVT-AV1 configuration using a :-separated list of key=value parameters", OFFSET(svtav1_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, - { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" }, - { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags = VE, .unit = "dovi" }, + DOVI_ENCODING_OPTS(dovi) {NULL}, }; From patchwork Thu May 23 19:50:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 49187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1287490vqf; Thu, 23 May 2024 12:51:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUrOYwLw6xDJg4wzbaI59KsPwYNbKrqdIH5ceQA1FM1uUwPmT1k7/m6ggOtAaUCvg5okvRijvx18IHcLyajhKGJ1SLEHbLAIPmAA== X-Google-Smtp-Source: AGHT+IHWi6gYJAkY1kvp/SELHvoR6igBDb6/+5Uh2eJdovo36IJNMFsRgMQRjjMWGn6Cakrl0yCR X-Received: by 2002:a17:906:b743:b0:a62:69ff:4fa2 with SMTP id a640c23a62f3a-a6269ff52ebmr7767866b.44.1716493871929; Thu, 23 May 2024 12:51:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716493871; cv=none; d=google.com; s=arc-20160816; b=xacVqM5+nX2H3BZ5FRoCBmutmZM5acUtHp6ocYkhFh419yEuXuys8iMR8bePRFLS1I pmdXV6kMKB3EyujitpDFl9deDS5c0AYmGpg026mO5nxm9iYBHcuJYOYaS9vyoP3cHE5F Z3hsH9L9RqSd4GThyA8tfctWXJ63Lm8c+LGbIeZXEUCOaKljJnxjOkh0Lm0HZwBXPEa8 MLR7GTqlw5V+WM/sGZtjisl90c6fqTXFGAtYAp5eTToaeVlUn7eMvDXxGhG/f8L4V665 9nD4fpb2Ob9B5uHa1oJDcL+h7kGMYQ8p07dk5JU6A1bFHhGtOTyVVF+cGXH/g2q5ZNlY +evA== 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:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=dIGTrnRcDSYEdVuro2FtUF3CKaN2N/1ZdO90xKKIJZU=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=E5z2rJBjRa0dBOPaOtSN0UEFW4pb2ddQq3C70kbQ8gZwfYwePeU60PLeDcVTUKhAcR EFlYx+U2pbnYovwimEAgs8KJ1340v1MTTpw0bOEYKby/iCBEf2pYvD+hnnpmZycb7I0n OJrlZFAcXss82gNeXzkwZgUxTz/ZmBRU2xUzIgqVgRccDMulA3TbogDnhs+HM/GCMjdx crL6CKwtRRdgiOS1qaaipe+0ypOuo2xeB1vtmuh19lXgdLcM/dzNScwcxbODJHxwLqY7 1897kGBLxRrYBAy70BALGNlczTu4/m+muN6uMQ7atSWv84BQ8wlj4qN2hy4nZKdIyYky PZWA==; dara=google.com 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 a640c23a62f3a-a626cc6665bsi921766b.584.2024.05.23.12.51.11; Thu, 23 May 2024 12:51:11 -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 B4B1168D504; Thu, 23 May 2024 22:50:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-214.smtp-out.us-west-2.amazonses.com (a27-214.smtp-out.us-west-2.amazonses.com [54.240.27.214]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B996E68D355 for ; Thu, 23 May 2024 22:50:30 +0300 (EEST) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 23 May 2024 19:50:28 +0000 Mime-Version: 1.0 In-Reply-To: <20240523195019.64019-1-cosmin@cosmin.at> References: <20240523195019.64019-1-cosmin@cosmin.at> <20240523195019.64019-6-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHarUpyU8iX1OOeTgC/HI1UPzU75gAAANrL Thread-Topic: [PATCH v3 5/5] avcodec/libx265 - switch to DOVI_ENCODING_OPTS X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1716493827 Message-ID: <0101018fa70140c5-9134005f-3996-4f8e-bad1-f534ee97cb16-000000@us-west-2.amazonses.com> Feedback-ID: ::1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2024.05.23-54.240.27.214 Subject: [FFmpeg-devel] [PATCH v3 5/5] avcodec/libx265 - switch to DOVI_ENCODING_OPTS 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: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XDHjabBm89/V From: Cosmin Stejerean --- libavcodec/libx265.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index ac1dbc4f97..70e447fc0e 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -951,8 +951,7 @@ static const AVOption options[] = { { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, #if X265_BUILD >= 167 - { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" }, - { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags = VE, .unit = "dovi" }, + DOVI_ENCODING_OPTS(dovi) #endif { NULL } };