From patchwork Tue Jan 24 22:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40100 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp715759pzj; Tue, 24 Jan 2023 14:47:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXu7HOmEAXr1EAOeHU8O/7ypXc8relxfSEYT/k7vbI53+Vl4Tfy1CSK9ATAW7L//kJb9rGnW X-Received: by 2002:a17:907:90cf:b0:871:cba6:4bb1 with SMTP id gk15-20020a17090790cf00b00871cba64bb1mr27525172ejb.70.1674600435386; Tue, 24 Jan 2023 14:47:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600435; cv=none; d=google.com; s=arc-20160816; b=Yk5Rc1J6Y4bkntnZHkB4oXDxcYXH9MoYVpKHcrRoIv2tu2a/wS4kK5Ic9pE6Dsll/0 8s7stljbiIji8Pb4qd9pJUEdjAM6hu3D9ANmUxyuoZl3o9HZR9kVDJzogcAOnXQYAg6g r/1D3fowRnYJuir0i85XfiA1NfWB6zT4QMYsSp8FnHdDu7DsNOqlSvnlCr+/uV87bQ/e JOxVEc3c94UW6TeksJLZJVf8C6CLxAhVOh7tkXVYM5MXOZRpB4f8BZzAJQL2cB/esSvD OpJyd+4s3/c2YlxAMtqdH+VYcKJKTURcEuRjc0Ymsg6iozMZ+Sg9C2HbfwyRkX/jjP6l oahQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=USuY2+pBmHyE7fCOxaiQnk1b8hAPcuh1PahL4XMhnNg=; b=W1OlWSniA6y3bQQ31CpML+Sw8jka75p2Pq7e+S93UDRevV3HnvZXLwB7Pkx7yNHieO CQWsekBL6kUSA8Wd+CKd8Pi+xhe6aBv+AASeiIKVzpf62QyCjwuOgsHq0AQDgTqIo6aD 0dfzofwRVKuI/WcccTsJgvhXTSG0apK7p88/3wjm4dIU8lE1qapXgDfFY57HRO823Thk K4kwvIIwX3oPZVXufovZAgICa/0GAAdRNZPnx48sGKcBeCBh6TdlWKUFaNIjAeln3lij b/pRgg+UIzrdKryr8Vjh8ckTIojiJBDD9qJDF7h7yuWq6IYKsc7K3UnkWrZyP6lsOjwT fiZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b=Ht2KjYjW; 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 az22-20020a170907905600b008775c0dd569si3538233ejc.418.2023.01.24.14.46.59; Tue, 24 Jan 2023 14:47:15 -0800 (PST) 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=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b=Ht2KjYjW; 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 56BE268BE61; Wed, 25 Jan 2023 00:46:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81DF968BE31 for ; Wed, 25 Jan 2023 00:46:40 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id r9so15349082wrw.4 for ; Tue, 24 Jan 2023 14:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20210112.gappssmtp.com; s=20210112; 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=M2C3N1ZyIIPNUZ1qRyOZQMzTdbb+7NKbEpW1z1GfhlA=; b=Ht2KjYjWXNALuy3QbR+AYDKW0nqDxweNoK66MxVLezsNWe7xuxzMRuWtx8eL9MuBTl wejMDd8jmmSlIhq0Hm7CKPAIfPpilHEbL2XHxF83fqddFGwwHl8kPWovxpC8qRklKMmX J6JGIjEEtRmo6Z0yPGfyyDfkC6F3BZttFnF3faUmSGBNO+LIZn87WGXEQfqL25HJlYaa 7bG8hk7N5w6aONwBMJg1HN4Zqv186VxSFuh17AxwrHiUkzqyoFwkAXWMToIDDqG8Rx9t zKN7yMb1RyrLu+hRfT8UWu/YMYwkQJP5Su0UB+2TEgLRn8saB0P3P7AkQ4BUC6b9QDb7 jXvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=M2C3N1ZyIIPNUZ1qRyOZQMzTdbb+7NKbEpW1z1GfhlA=; b=XqIbdyx2WhjfnUM8bSFZMiYL1eq00/zZf6SHOoexxhxQ2z6dzvpgCKDYi5oIH4AK2D veGF2YwX59Nt1G7lwsyRKEJ06/+pclud2A/fR8DWw9ei+lHSd/phu+4t1IFupRONqdeU dK2GoypFA5uY/O8IC3B+ZEtGC12Lphu8epnR/AHA3AuRnO/Ab9JUHLe0yKsB0AQRu9Mx s8bQo/NjutlTvp82D1TY5KC1WfoqFUEBZ6lEyE7qizQ5SZCrbr1K7UjnMaxwWdub3LXm FOZSV/mQdrQFvLFRDzZuG6HRdbaek96oNsC+gKbZosyBO0WlHmPQx/if9Dt5hWE07Rra Tz1Q== X-Gm-Message-State: AFqh2kq5J8SntkKqwnGy+438k48C711CKZXon5JX4CAlJGxk0WRJd6Pc 3lwH+vVs+jCjtkxxTJUG7yJOyba6oAsLMgTb X-Received: by 2002:a5d:6d4b:0:b0:2bd:e1fd:2536 with SMTP id k11-20020a5d6d4b000000b002bde1fd2536mr23573475wri.9.1674600399929; Tue, 24 Jan 2023 14:46:39 -0800 (PST) Received: from localhost.localdomain (cpc91224-cmbg18-2-0-cust209.5-4.cable.virginm.net. [81.106.228.210]) by smtp.gmail.com with ESMTPSA id j26-20020a5d453a000000b002bdf3809f59sm2848267wra.38.2023.01.24.14.46.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 14:46:39 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 22:46:21 +0000 Message-Id: <20230124224623.1374077-2-sw@jkqxz.net> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124224623.1374077-1-sw@jkqxz.net> References: <20230124224623.1374077-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/4] cbs_av1: Don't reject unknown metadata 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: rgyOuJPcmFBz Accept it and pass it through unchanged. The standard requires that decoders ignore unknown metadata, and indeed this is tested by some of the Argon coverage streams. --- libavcodec/cbs_av1.c | 7 +++++++ libavcodec/cbs_av1.h | 7 +++++++ libavcodec/cbs_av1_syntax_template.c | 26 ++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 45e1288a51..8788fee099 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1306,9 +1306,16 @@ static void cbs_av1_free_metadata(void *unit, uint8_t *content) md = &obu->obu.metadata; switch (md->metadata_type) { + case AV1_METADATA_TYPE_HDR_CLL: + case AV1_METADATA_TYPE_HDR_MDCV: + case AV1_METADATA_TYPE_SCALABILITY: + case AV1_METADATA_TYPE_TIMECODE: + break; case AV1_METADATA_TYPE_ITUT_T35: av_buffer_unref(&md->metadata.itut_t35.payload_ref); break; + default: + av_buffer_unref(&md->metadata.unknown.payload_ref); } av_free(content); } diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 1fc80dcfa0..36848d4410 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -370,6 +370,12 @@ typedef struct AV1RawMetadataTimecode { uint32_t time_offset_value; } AV1RawMetadataTimecode; +typedef struct AV1RawMetadataUnknown { + uint8_t *payload; + AVBufferRef *payload_ref; + size_t payload_size; +} AV1RawMetadataUnknown; + typedef struct AV1RawMetadata { uint64_t metadata_type; union { @@ -378,6 +384,7 @@ typedef struct AV1RawMetadata { AV1RawMetadataScalability scalability; AV1RawMetadataITUTT35 itut_t35; AV1RawMetadataTimecode timecode; + AV1RawMetadataUnknown unknown; } metadata; } AV1RawMetadata; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 817a0f8ae6..dc6724cb59 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -2004,6 +2004,29 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, return 0; } +static int FUNC(metadata_unknown)(CodedBitstreamContext *ctx, RWContext *rw, + AV1RawMetadataUnknown *current) +{ + int err; + size_t i; + + HEADER("Unknown Metadata"); + +#ifdef READ + current->payload_size = cbs_av1_get_payload_bytes_left(rw); + + current->payload_ref = av_buffer_alloc(current->payload_size); + if (!current->payload_ref) + return AVERROR(ENOMEM); + current->payload = current->payload_ref->data; +#endif + + for (i = 0; i < current->payload_size; i++) + fbs(8, payload[i], 1, i); + + return 0; +} + static int FUNC(metadata_obu)(CodedBitstreamContext *ctx, RWContext *rw, AV1RawMetadata *current) { @@ -2028,8 +2051,7 @@ static int FUNC(metadata_obu)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(metadata_timecode)(ctx, rw, ¤t->metadata.timecode)); break; default: - // Unknown metadata type. - return AVERROR_PATCHWELCOME; + CHECK(FUNC(metadata_unknown)(ctx, rw, ¤t->metadata.unknown)); } return 0;