From patchwork Mon Sep 18 17:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp2076543pzb; Mon, 18 Sep 2023 10:18:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IET7kC4MaYTHlVVz2o4XSH7GfUNW9xMSDgV+wyahz6tmz3oJ/ZNtf9676+mY0QG3fdhOjIX X-Received: by 2002:a05:6402:393:b0:525:469a:fc38 with SMTP id o19-20020a056402039300b00525469afc38mr7814281edv.31.1695057533336; Mon, 18 Sep 2023 10:18:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695057533; cv=none; d=google.com; s=arc-20160816; b=sQ3vtziO746E/y0QZxoEdj1IkycJvf2CQDtImH+VsS1cbrx6Zb/yC8xRHY2Zji6bLZ akRoi8G2ybOm8oWy+tFH9gkAGjoMtk9+zaNrAKZEQqh4QtyX4neE76AKZnEBK144Qec2 7uxJJGQH9YUvxhWnqn+qnpoV2C+2oVtHTe2tBQv3c3T+augjm0N3GpQrqGxH5nhCWbjI GaXflD4deywppG1JBxax31hJrhtL3LT9ZU54qtgEDHgAlWuttpNlB5idRVf9Dj6uxdi5 6/49tzWHkfkw2JVgMvuWkZ+3Bmcpaf5WoIBsgItNfpCIiJhj4UTJxPx3XZTPV66n2MAY Iy+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Cyv3xWIWdCyUjsZRR2PejS0Z7IBppQkcrg/AA0xfvis=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VvtCAeTciBI14sREpgnQcebv1n6BAWOKKmSVAUi+nKwqf8faEdXzk33IgKAJ/pL4fh Hy4yqV5izAkG2EuqKIPn4lqywT4yWX5mHqLBO73EQjHYwpgkvQeGaQr3Ar706C2OHzL2 gSCN6Boev4BNb18vkdFEPBiE/bsJkbEQ0ByBYEoisYY088rUfv3kUsd4BqjBSBdY3LO8 1I9obh8P+ZIWBVOzWxTRKEA6mdCumswanCPGK46DgSlJneXN8+HHxSDn5eOiwKRXzSMK t5zMN+nY+wZYClJUcjGypeRy8nCR4fVenRLViY6WTeppC/NbyMhV+0uzAysERzdbUd5I vdZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=W2hQQ2xM; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u10-20020a05640207ca00b0052fbf96a276si8906452edy.482.2023.09.18.10.18.52; Mon, 18 Sep 2023 10:18:53 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=W2hQQ2xM; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFFC868C872; Mon, 18 Sep 2023 20:18:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 717C36805B4 for ; Mon, 18 Sep 2023 20:18:44 +0300 (EEST) Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-57128297bd7so3119249eaf.0 for ; Mon, 18 Sep 2023 10:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695057522; x=1695662322; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Miiw5LoZwvIiaVJWHC8UHRkZ7AhXOj7hLkpnTmsoWcE=; b=W2hQQ2xMP4J+PFv+74vAh/hZN0Xiep7OghmtxCQdHPttdCvI1YsUZT0NRFeOtHXIUV 73JqOFOQ6T2oG4vmVb5ZqtAmgvcDLr+GQj6/E321sEzPtZWR7WYdEy63wzVmLHUwtPxy dIsBEdMvBZB5LyZ6+ZbJgtQlsll4zhgecGTPjas9hWnQTcVDcr314mkLonbuY26JGh/P heEQjmQBPriq3laVZegE8VpVEZV3Vf8XH8E5VvGeKb52sG8offruRj2wV9qj4R4TK/gu b3gplyJlHGu/pb5z5iLyPueRs4egCYKtTUDBxI3u9DG0NBgWbb5DUZdJpgd1joZlyH0U hByg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695057522; x=1695662322; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Miiw5LoZwvIiaVJWHC8UHRkZ7AhXOj7hLkpnTmsoWcE=; b=Mvo8Kz6fxBaTZShhAix3cVa6gSQjPcpPfonseJzhtPSyg8XHYtYWditxA3K7HcZI4i MQxtJH0PluQkKwZP/iowj0JCSHkJd8RxjRT47lf9mxprersowq/4aLaA0BV1QkIRX++9 lm4WyWb+6ZxYSJa9lqeqE3JZBWzfuzK+tHhgU5S4mHH/JtfB6nBnOz3lNoyTDabtOgri vQTc+HBieQQHFB5gOVHIb053rJKrjg2H5UDwwZimdrDjSGqHYB9UrAXZXCNGl2E28FWp IwK9iOwo3pEwJfujzLiNl2pjyvEbUhrJUlNN/t20XlPJ+wwhay9cr7ixaMtf1vL7q+B6 Cqiw== X-Gm-Message-State: AOJu0YyhrvcuRxCdcvHdoSYgsK9RULUh0PpKpNLHYIcJOLc7AkMinxqH kl0dfBy3oIUN866tnUw5ObHusYWs8TU= X-Received: by 2002:a4a:9198:0:b0:573:4da2:4427 with SMTP id d24-20020a4a9198000000b005734da24427mr8464084ooh.7.1695057522249; Mon, 18 Sep 2023 10:18:42 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v17-20020a4a9751000000b00573f5173a57sm4810590ooi.23.2023.09.18.10.18.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 10:18:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Sep 2023 14:18:26 -0300 Message-ID: <20230918171826.1479-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/extract_extradata: filter what Metadata OBUs are included in AV1 extradata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HilPTb3/IbLE Only those that are relevant for the entire coded stream should be included. Signed-off-by: James Almer --- libavcodec/extract_extradata_bsf.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index d5c81a2768..3bf225ee28 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -58,6 +58,23 @@ static int val_in_array(const int *arr, int len, int val) return 0; } +static int add_metadata(const AV1OBU *obu) +{ + static const int metadata_obu_types[] = { + AV1_METADATA_TYPE_HDR_CLL, AV1_METADATA_TYPE_HDR_MDCV, + }; + GetBitContext gb; + int metadata_type; + + if (init_get_bits(&gb, obu->data, obu->size_bits) < 0) + return 0; + + metadata_type = leb128(&gb); + + return val_in_array(metadata_obu_types, FF_ARRAY_ELEMS(metadata_obu_types), + metadata_type); +} + static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, uint8_t **data, int *size) { @@ -77,6 +94,11 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, for (i = 0; i < s->av1_pkt.nb_obus; i++) { AV1OBU *obu = &s->av1_pkt.obus[i]; if (val_in_array(extradata_obu_types, nb_extradata_obu_types, obu->type)) { + if (obu->type == AV1_OBU_METADATA && !add_metadata(obu)) { + if (s->remove) + filtered_size += obu->raw_size; + continue; + } extradata_size += obu->raw_size; if (obu->type == AV1_OBU_SEQUENCE_HEADER) has_seq = 1; @@ -115,6 +137,11 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, AV1OBU *obu = &s->av1_pkt.obus[i]; if (val_in_array(extradata_obu_types, nb_extradata_obu_types, obu->type)) { + if (obu->type == AV1_OBU_METADATA && !add_metadata(obu)) { + if (s->remove) + bytestream2_put_bufferu(&pb_filtered_data, obu->raw_data, obu->raw_size); + continue; + } bytestream2_put_bufferu(&pb_extradata, obu->raw_data, obu->raw_size); } else if (s->remove) { bytestream2_put_bufferu(&pb_filtered_data, obu->raw_data, obu->raw_size);