From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 168EA4DBE8 for ; Wed, 23 Apr 2025 20:47:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F445689EA6; Wed, 23 Apr 2025 23:46:30 +0300 (EEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9047468A15F for ; Wed, 23 Apr 2025 23:45:45 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43cfebc343dso1872205e9.2 for ; Wed, 23 Apr 2025 13:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1745441145; x=1746045945; 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=BFgll+1aNF1ZULI7zzQPAP+phDv11gLAR0XpZ1YetJ0JF+T7OfYrj5LCEncFHmJrC2 LXoIoVDQZDzRkvhVDxBb1iHxeq1jyoJMBz8II4wjZlrBQWs8+d3bcpPPre63jv9qu0u6 OGVrOiCEIRitF0EtilxiS8lba9IYQfqg9jOryWBFPPXcPmWQ5x+Nt2pI68cTGAt0IcfK ckWcIf3wnmB7YrKDKwOC882kQBpeCDDVRiwnwpSZIXIkWuVTyzpJT0/B80m/ykdWvkAj BnVFNUbWcw89E6HoVmAaXl8HIFfBQdaA3QIyWGQkzBNnSvTKy7dn0mdoAiFjeaFDzMiF YmZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745441145; x=1746045945; 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=S7LfLzydiFkt6PlZEdK4bUE9PywbIFCCl+/OeW3FThKx9/5tFBk/4j9VqozBfhUvoh /SSjbaiVdi3L5kdU8vwOzAriphk3WLzY4gKbCf78+3iUMht6I94tcl7f4MpSDRBBofkS EKlR2JZxm2j0qm+W7YLpEaj4h3+PuJgkmsDoiiJ7qyBzBbcGjKu69BIUPQE75dSvrJH9 1Zsf/bF7LUclWeu87Rh0OP4wUEZSIC/mgYbMCKKKO0Mm3uxTCiCC7FyY3KQ6a8DnZygA lofAfva/D0WeEaFccV9S6cotGWjOxqKmZuNFCdvs+0YfBS9d1529MQy0UWi7fDBJlF7+ QhIQ== X-Gm-Message-State: AOJu0YxUT67DlOgSaWt1mdWTmWPuHbwoKU50HbZZ8JOxyxoUiC6O6eIt h1zBV818EFCu5ON7PCSO5as6WQ8B6USnp0Z/27D2mUD/MT1BHlS/xzW8cplpigbK33DD3PhFfJ4 D X-Gm-Gg: ASbGnctsa5H8hGOMuUBlu3Ou/pwWXMh2BOHwFy3lHdBDqMexL13Yhq7agN3mnxRXbkk H16UF7BdQQg82k7X0nfYdIs9Yj7s8NbVisdXLWQBK6GPLXpG8R74qaA1JbhT2PQ8jv/AoTeE5im KiaLIpvivq5RxOap86JBlLvaJNQajTBjOk/esJmXPk34S4EEeR3Zenzii8xqaY0On1h9uVCZcUp Taeb5N0ZdtzWr63jV5J5qVKPVPU05jdrFm6XBnopjia3drsqy2V/inEgmCh8fgyNEG2Iwy0YpZV F2JG3Rk3R+jZOyvCwTtUElQDF2ix4IgJYNT9oIjsWVDSUhSPhDmOSAcEYWnKaSZSkODtESuSPgU XTKEZac+EIXJ5jOhEmjO8+Ac= X-Google-Smtp-Source: AGHT+IE3RSt4pOKSw9nI68NNgnjHNjRMoDf5ck8kSmIej7qbqwxF9BHpfXYwS7FKcoAFVdWeyjTrmQ== X-Received: by 2002:a05:600c:444f:b0:43c:fbba:41ba with SMTP id 5b1f17b1804b1-4409bd8e0d0mr232905e9.28.1745441144880; Wed, 23 Apr 2025 13:45:44 -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-4408c8b0ea0sm33736775e9.2.2025.04.23.13.45.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 13:45:44 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Apr 2025 21:45:24 +0100 Message-ID: <20250423204531.2432180-7-sw@jkqxz.net> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250423204531.2432180-1-sw@jkqxz.net> References: <20250423204531.2432180-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 6/7] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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".