From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 0B4BA4D989
for <ffmpegdev@gitmailbox.com>; Mon, 21 Apr 2025 15:26:12 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D77DC68A091;
Mon, 21 Apr 2025 18:25:06 +0300 (EEST)
Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com
[209.85.221.52])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80990687DBF
for <ffmpeg-devel@ffmpeg.org>; Mon, 21 Apr 2025 18:24:54 +0300 (EEST)
Received: by mail-wr1-f52.google.com with SMTP id
ffacd0b85a97d-39149bccb69so1068034f8f.2
for <ffmpeg-devel@ffmpeg.org>; Mon, 21 Apr 2025 08:24:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1745249094; x=1745853894;
darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=9pcte98kj6tNHsDNJ+l5ipjZjewwvuNSyr32XKx1d9g=;
b=QdUiTSSHiS8bNd5SS9MZ6eUSXiW8sgrxGr7tchpiy1UTL/MHobytPfYIO2feYfFBDU
SZm0ozF/rt8JuNUexSkAKGTMJj1puY2UlEqGTBnyPgtyKoK7CaiLWC9vcHg/QB3gl0oP
XRMw4r5MvsMkj3kb/ivSCV9RjDGg/S2FdXpu3wVpFC+u7f4croUAiTlzfj58mHsvCits
cYrfR5BGK7V0vxqR1xR0vwNGsulggJBQg31/A6S6Yrf9OaAzncb6cu4tAFjXRSElo4eK
iSMYCv19v3HmZIkS2YEKdLgbDbJLrTTJLN3ZznGQNdjSvVZDJbXh2WRGRrxng/qA3ouU
qbzw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745249094; x=1745853894;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=9pcte98kj6tNHsDNJ+l5ipjZjewwvuNSyr32XKx1d9g=;
b=GuJJXb4jewNugKJL9Jo7z6fjxLa+TFTAKKS72KjLnINvU3n8d2MLrti2dFUyQzB5Xv
Jw8ZqEMnEGcXTXBDYAgFcmeUR2T5pFKxc6fauMMDwLiWz82iDeRdkimcAnlvM4VREEjS
/N8DxdoNckltQcft0XNNHjP+YAbULy2JfeYGgmg4aOha/y2IS1c3DeUCEWc74hYcYkxd
wrXSOnDSBYMglah6rWLJkTaDM9yozKXqQsvAzyy/MeO/I66Dau2725Y5qSKgpNjWsToX
R32gH9lZ5V7ImQmrPDs5f8fx+D3ipanGO9jMbnRvYRfve6nhOwbz0mMzCcbRKx78q902
yfDA==
X-Gm-Message-State: AOJu0YyI6rjUuQPXGAi9VUkwu+GU4SF5QjEZBaVCe86MxcGg2d4nWK0I
77mY6/C79o+xh068vDzOjVfgVFC2V0CJ9qHvUh8Ng6eTQw1ASRblRh+6FuNimz/GTVN3pUL+i2u
2
X-Gm-Gg: ASbGnctv7+OiV7o3L61k4XpyLz0V0X+OQPA5AQ32/WiLm9CmnNOfWvNqcuOjTARvTrQ
yUc79Ji4aSe1n1qAjw4SR/4CdHmLp4jkOAT5DN+8Z4oDZBSbz96kEiL//Y1tOkx9dPyuiPfBzSF
z5aEmWa1ebr9Kt1bwncAk8bony1p5Su5p6I2Rio26Yltp6IzclzBNkwjZqPCxR6NbXJvx7bw0Jh
VsmgxobfGppL32XXnMYLzmH0MON4l1yCmUH63Dc/4KU8H/8Fxfm/ttrCJkhKQf4Qhd5vqV4slRp
DCdHZktXLJbt2wYtoO5c/Vy9ZCOLCDFrEn6ue4TjghAHsXVFqQPDng2Yff9HX91i9CZliZeJdys
LlgQScBWEK7NPVZtoWuPKIo8=
X-Google-Smtp-Source: AGHT+IEJhxy99ETkEszYkNvX5gCHnOVFqt+KFOfdjl0dOOz/QhQwqlSrE+0I1nusWQPaftWAYzzumA==
X-Received: by 2002:a5d:6d8d:0:b0:39a:c80b:8288 with SMTP id
ffacd0b85a97d-39efba5bf52mr9139022f8f.33.1745249093578;
Mon, 21 Apr 2025 08:24:53 -0700 (PDT)
Received: from localhost.localdomain
(cpc92320-cmbg19-2-0-cust719.5-4.cable.virginm.net. [82.13.66.208])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-4406d5bbc07sm140657145e9.17.2025.04.21.08.24.53
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 21 Apr 2025 08:24:53 -0700 (PDT)
From: Mark Thompson <sw@jkqxz.net>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 21 Apr 2025 16:24:37 +0100
Message-ID: <20250421152445.2110045-7-sw@jkqxz.net>
X-Mailer: git-send-email 2.47.2
In-Reply-To: <20250421152445.2110045-1-sw@jkqxz.net>
References: <20250421152445.2110045-1-sw@jkqxz.net>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2 6/6] lavc: APV metadata bitstream filter
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250421152445.2110045-7-sw@jkqxz.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavcodec/bitstream_filters.c | 1 +
libavcodec/bsf/Makefile | 1 +
libavcodec/bsf/apv_metadata.c | 134 +++++++++++++++++++++++++++++++++
3 files changed, 136 insertions(+)
create mode 100644 libavcodec/bsf/apv_metadata.c
diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c
index f923411bee..da9d0d2513 100644
--- a/libavcodec/bitstream_filters.c
+++ b/libavcodec/bitstream_filters.c
@@ -25,6 +25,7 @@
#include "bsf_internal.h"
extern const FFBitStreamFilter ff_aac_adtstoasc_bsf;
+extern const FFBitStreamFilter ff_apv_metadata_bsf;
extern const FFBitStreamFilter ff_av1_frame_merge_bsf;
extern const FFBitStreamFilter ff_av1_frame_split_bsf;
extern const FFBitStreamFilter ff_av1_metadata_bsf;
diff --git a/libavcodec/bsf/Makefile b/libavcodec/bsf/Makefile
index 40b7fc6e9b..39ea091b50 100644
--- a/libavcodec/bsf/Makefile
+++ b/libavcodec/bsf/Makefile
@@ -2,6 +2,7 @@ clean::
$(RM) $(CLEANSUFFIXES:%=libavcodec/bsf/%)
OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += bsf/aac_adtstoasc.o
+OBJS-$(CONFIG_APV_METADATA_BSF) += bsf/apv_metadata.o
OBJS-$(CONFIG_AV1_FRAME_MERGE_BSF) += bsf/av1_frame_merge.o
OBJS-$(CONFIG_AV1_FRAME_SPLIT_BSF) += bsf/av1_frame_split.o
OBJS-$(CONFIG_AV1_METADATA_BSF) += bsf/av1_metadata.o
diff --git a/libavcodec/bsf/apv_metadata.c b/libavcodec/bsf/apv_metadata.c
new file mode 100644
index 0000000000..a1cdcf86c8
--- /dev/null
+++ b/libavcodec/bsf/apv_metadata.c
@@ -0,0 +1,134 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
+
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_apv.h"
+
+typedef struct APVMetadataContext {
+ CBSBSFContext common;
+
+ int color_primaries;
+ int transfer_characteristics;
+ int matrix_coefficients;
+ int full_range_flag;
+} APVMetadataContext;
+
+
+static int apv_metadata_update_frame_header(AVBSFContext *bsf,
+ APVRawFrameHeader *hdr)
+{
+ APVMetadataContext *ctx = bsf->priv_data;
+
+ if (ctx->color_primaries >= 0 ||
+ ctx->transfer_characteristics >= 0 ||
+ ctx->matrix_coefficients >= 0 ||
+ ctx->full_range_flag >= 0) {
+ hdr->color_description_present_flag = 1;
+
+ if (ctx->color_primaries >= 0)
+ hdr->color_primaries = ctx->color_primaries;
+ if (ctx->transfer_characteristics >= 0)
+ hdr->transfer_characteristics = ctx->transfer_characteristics;
+ if (ctx->matrix_coefficients >= 0)
+ hdr->matrix_coefficients = ctx->matrix_coefficients;
+ if (ctx->full_range_flag >= 0)
+ hdr->full_range_flag = ctx->full_range_flag;
+ }
+
+ return 0;
+}
+
+static int apv_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
+ CodedBitstreamFragment *frag)
+{
+ int err, i;
+
+ for (i = 0; i < frag->nb_units; i++) {
+ if (frag->units[i].type == APV_PBU_PRIMARY_FRAME) {
+ APVRawFrame *pbu = frag->units[i].content;
+ err = apv_metadata_update_frame_header(bsf, &pbu->frame_header);
+ if (err < 0)
+ return err;
+ }
+ }
+
+ return 0;
+}
+
+static const CBSBSFType apv_metadata_type = {
+ .codec_id = AV_CODEC_ID_APV,
+ .fragment_name = "access unit",
+ .unit_name = "PBU",
+ .update_fragment = &apv_metadata_update_fragment,
+};
+
+static int apv_metadata_init(AVBSFContext *bsf)
+{
+ return ff_cbs_bsf_generic_init(bsf, &apv_metadata_type);
+}
+
+#define OFFSET(x) offsetof(APVMetadataContext, x)
+#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM)
+static const AVOption apv_metadata_options[] = {
+ { "color_primaries", "Set color primaries (section 5.3.5)",
+ OFFSET(color_primaries), AV_OPT_TYPE_INT,
+ { .i64 = -1 }, -1, 255, FLAGS },
+ { "transfer_characteristics", "Set transfer characteristics (section 5.3.5)",
+ OFFSET(transfer_characteristics), AV_OPT_TYPE_INT,
+ { .i64 = -1 }, -1, 255, FLAGS },
+ { "matrix_coefficients", "Set matrix coefficients (section 5.3.5)",
+ OFFSET(matrix_coefficients), AV_OPT_TYPE_INT,
+ { .i64 = -1 }, -1, 255, FLAGS },
+
+ { "full_range_flag", "Set full range flag flag (section 5.3.5)",
+ OFFSET(full_range_flag), AV_OPT_TYPE_INT,
+ { .i64 = -1 }, -1, 1, FLAGS, .unit = "cr" },
+ { "tv", "TV (limited) range", 0, AV_OPT_TYPE_CONST,
+ { .i64 = 0 }, .flags = FLAGS, .unit = "cr" },
+ { "pc", "PC (full) range", 0, AV_OPT_TYPE_CONST,
+ { .i64 = 1 }, .flags = FLAGS, .unit = "cr" },
+
+ { NULL }
+};
+
+static const AVClass apv_metadata_class = {
+ .class_name = "apv_metadata_bsf",
+ .item_name = av_default_item_name,
+ .option = apv_metadata_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const enum AVCodecID apv_metadata_codec_ids[] = {
+ AV_CODEC_ID_APV, AV_CODEC_ID_NONE,
+};
+
+const FFBitStreamFilter ff_apv_metadata_bsf = {
+ .p.name = "apv_metadata",
+ .p.codec_ids = apv_metadata_codec_ids,
+ .p.priv_class = &apv_metadata_class,
+ .priv_data_size = sizeof(APVMetadataContext),
+ .init = &apv_metadata_init,
+ .close = &ff_cbs_bsf_generic_close,
+ .filter = &ff_cbs_bsf_generic_filter,
+};
--
2.47.2
_______________________________________________
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".