From patchwork Tue Jan 24 22:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp715743pzj; Tue, 24 Jan 2023 14:47:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXuENfPFnymfKTIRi9IMDmwB9gUFAdo84c6xS1XeI7uEYyuC9BhBb9SBEyaJdsywUO38dJHH X-Received: by 2002:a17:907:d40c:b0:86b:aa56:7451 with SMTP id vi12-20020a170907d40c00b0086baa567451mr33407684ejc.53.1674600433775; Tue, 24 Jan 2023 14:47:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600433; cv=none; d=google.com; s=arc-20160816; b=eHLQRtsR+8YbBMY9SmjzkSlSHKrqf4WvGcXOsntySkw3S5bFbTIaaKhbJJLJtm180e S+VtUa7RAPmbGJ/HJkoP1UMMpKUY3bJPIGr9G//wnTLPGgOgA6o9/1akQ9qL9Wx0NuIW +yq2ZzHwHtzsdd1B5nk6oHcDWyIe9+u7kBcIaS6G7wOSVfDI7B2ThEupKorgkncnp/r/ nXzGJSxrIWxHq3aBvfvWmQHkxtazH8+N6yEdcYmqkZgTFSBXCy9Z/a6B4nvbtj4CkolR YgSO6slnPhe3XwAJoPn4EGr8ShQN49j/a5jBhMuvCtdtdTSEjM8HTxBAZHDxmrkOqPMG jvCQ== 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=DHkGu3hPDrcqXPpGplyx3jsL1kFngSUVHqY8qjV/bBI=; b=Qbcp6nHopKa2olNKZZpmEdahLV/4h0p7ivZ8PzzywIkopGlm5Ne3+x8Gdy6sqHCLjt Nd1yV+hazd9zbAkt5VdtIsvm970oGkeca+AeGPICoCUcIJUqsoXWPia+W1uOIDrByvjZ mj/csCxZ1qHI0M39QmrFWYRNVmE6L1Ic1a5kBBIgwho/hxJ0AZ75c4yLQIVogALTgtWa OuFAmyMOiSmtZfZlpaq06vHsqKJjTqfxhRTQ7R0g4N9BC8cdwHNf5EC0fbtXB7w7s5W+ U6gbpMmJZ92eHsrlKx2BjpROEg7WGFsdp3TDmfAKUZRtgbhszCmCceX824rFe0d4zOvA HK8w== 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=zWFQy74n; 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 ka16-20020a170907921000b00871fccac238si3096947ejb.785.2023.01.24.14.46.49; Tue, 24 Jan 2023 14:47:13 -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=zWFQy74n; 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 495AA68BE54; Wed, 25 Jan 2023 00:46:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1608568BE31 for ; Wed, 25 Jan 2023 00:46:40 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id bk16so15344334wrb.11 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:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=kk/8jPiX5sDsXc2fYCdwIuYPFkcUfsrMYNf2N+Y+b+o=; b=zWFQy74nMT+bOlLif/Ecouu1c6i65PCxnmiPeuPeVcF0Pfuu/1lHR3njpcNnLtZDL1 jvk2/f5iuS3A4WdHx29om88FEik+Q0pKq3l3gxZs993uKlisJnzkwZoHCD7DlhYeGSnx hczfDB1VzD7WzxCWRY9FgpAtr326Q4y4p1zm27l2rbzg/f8ZM5BEFH7oyZ6IKhoM26RZ kX9i103CTZXk/rwX6LUqNVP5ROsrsGGXAK/8t70PKRgqPTTRM9CF4uHRYgL3b9Sf9+Oo D2zQezMQ3h7hCgJWE2jJ94E6x5aKNQTjRbVtTSE3+bqtbJXWnm/GLZFN6QaAXpz8IHhR q43Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kk/8jPiX5sDsXc2fYCdwIuYPFkcUfsrMYNf2N+Y+b+o=; b=sdSHygffnL4CsOo9cRQZIKJSlirjf5M/uQAEgRCT/LlQRr0m1VyQDhdfZRv+qPimJZ nXI2r/Bn+gmmZIQA0idNPb5V5fKoYBUSYm5WtLR0dHgseGnJ2usV8gc1dCFsarNSZN3U Rl8UsYOB5LTw0dhWaHOh75Tw9KVTkubMLfFUPH62LSi1X8xZ5ZU2QpHg6gQ3lLHWz3Dv 0BReST8wUdzIYQlNkVFR/Z/WWYI8inQuOSo7yxNY0cFqdejBR72JAoaAVFzyzbHWEPYU Vkcjn9udmeOQSrUsSO8BTONchVFt8tVjBGVakB6tf8R7jQwMegrsRJGQ5EypQ9/ACLvP F7tw== X-Gm-Message-State: AO0yUKXg9v2NFNjmd/gbqpmUbk0DEArBmcYj4uL/cpXxoKIh4tIbGmZO dWe+wSVkP23NlFwfcTwdxBNzI/Vn3gcg5oPT X-Received: by 2002:a5d:444b:0:b0:2bf:b741:3e0f with SMTP id x11-20020a5d444b000000b002bfb7413e0fmr841871wrr.41.1674600399458; 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.38 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:20 +0000 Message-Id: <20230124224623.1374077-1-sw@jkqxz.net> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/4] cbs_av1: Add tracing headers for metadata types 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: V/wKVKEtt4JM Make it a little easier to interpret metadata in trace output. --- libavcodec/cbs_av1_syntax_template.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index e95925a493..817a0f8ae6 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1843,6 +1843,8 @@ static int FUNC(metadata_hdr_cll)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("HDR CLL Metadata"); + fb(16, max_cll); fb(16, max_fall); @@ -1854,6 +1856,8 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw, { int err, i; + HEADER("HDR MDCV Metadata"); + for (i = 0; i < 3; i++) { fbs(16, primary_chromaticity_x[i], 1, i); fbs(16, primary_chromaticity_y[i], 1, i); @@ -1920,6 +1924,8 @@ static int FUNC(metadata_scalability)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Scalability Metadata"); + fb(8, scalability_mode_idc); if (current->scalability_mode_idc == AV1_SCALABILITY_SS) @@ -1934,6 +1940,8 @@ static int FUNC(metadata_itut_t35)(CodedBitstreamContext *ctx, RWContext *rw, int err; size_t i; + HEADER("ITU-T T.35 Metadata"); + fb(8, itu_t_t35_country_code); if (current->itu_t_t35_country_code == 0xff) fb(8, itu_t_t35_country_code_extension_byte); @@ -1961,6 +1969,8 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Timecode Metadata"); + fb(5, counting_type); flag(full_timestamp_flag); flag(discontinuity_flag); 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; From patchwork Tue Jan 24 22:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40101 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp715783pzj; Tue, 24 Jan 2023 14:47:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXtEeONEEB3XN17cPwxy9a3P7NEVJxqzJnVldOgjiCV/OUuCJ7BRgmFrhf0NTRAeFjfu9k8K X-Received: by 2002:a17:906:48cb:b0:86d:d334:b90b with SMTP id d11-20020a17090648cb00b0086dd334b90bmr31990726ejt.67.1674600436943; Tue, 24 Jan 2023 14:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600436; cv=none; d=google.com; s=arc-20160816; b=uiEHZm2XslTs1GFAaAx3ZocId1mI59ldYFv7fTBpHNrPvBCnr8eIDg8TVdREfhju2P O02OD2hS1KC4HaGIzk0Cf7On7rFpWleaVEuT/Tr1U0yGoO2Lag5Y7z+9izPexf6bYlVJ oWdFfhklxoETJNpUqRIkgU7yMY3T2m/mHY8FLGnSAlTRABji1ztUjrUUAUiFeNlQBDyf LLT4UKtun6Vf91lxXLHmYnh4gqCdH5I6uJoOUPnl4ejxh4ePGyj2zA7i6JWo5tx77eaX 9vAS/8lsHJa65PiTZf140yIuSS3AMHZX79Yp91mnEb+wAlOv540RD56D892XWONcgML9 vztw== 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=sh/iNnORFd0VKyc8iFgAtwlFWaasyVC8DjrsG3Gv3kM=; b=ns99iHP6Y/TIhNfTvJ+8FYAhCrCcPbeX0IQwR3jo5P1Zbim7Vr559uZ+NMtCHDudtF K1BwZzKJ9EMMlGLu0NK75OcqW+hH1IkGoAQEM8suP00AtMmSvvtjROrTcs7kT6cXlWdD 1HyxDHsoiWLlGp79aL4OcF94qhjZF+DuLbEqjic/dIH0NnlmSHYIB/2Bl7HSFvap4Skc RJiP8RtQhr6zU8WgnlX/uEbs5AbZK1WoLOesAZml9HU0lkJkDNcbgSza4fJxbEPaTJCF MLRpvBclDbsgDmdqGJcvIfm7wOeZMz0toUMM9rp/R2jFVwQnO0SuOTs7YndWcU1P8/I5 jMDQ== 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=dgA5cq+J; 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 v26-20020a17090610da00b00870ecd1a337si3498933ejv.460.2023.01.24.14.47.08; Tue, 24 Jan 2023 14:47:16 -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=dgA5cq+J; 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 5BA2D68BE53; Wed, 25 Jan 2023 00:46:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3BEF68BE54 for ; Wed, 25 Jan 2023 00:46:40 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id b7so15374066wrt.3 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=QTJYRZBrIGmmGz3MO6QdTX/f9KdEHxAV0/aRa8cYRPI=; b=dgA5cq+J7+7H2EpuK0A8xCW1owLD/zWMMNsobuMDpPyo8btY3tdew3tpz7AFdIMeJY JyKV3N0D0rqHrirF7ZdE0M14ypavON0sGavRaR2AZ3Matr//hWnt2DnKuDJkUBXa1azv vhMXb3Ba/MTzvf20zhdeSDlMDMPRQYBSGRues/mkDc1PoG31srsh8Bp6sQHg2G9IDv28 JhNHk5TvuPOzUiDh6hz8+d6pBtX8COQGNGRP+cV6SoHaGpORUav15OvM5Psdmr0EtS4T uB2DQBcGD1w/om+LNjCfb1BLu9AFuKCiM3Xoz/lsL05fNruM34+kNZJIJYg4XnMku+DU is9g== 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=QTJYRZBrIGmmGz3MO6QdTX/f9KdEHxAV0/aRa8cYRPI=; b=RbjNWKQKcKmv3aen/+9V58omcmBpUUHNMHtkF/PL2TKjqQ019sfGNu9/cHrl9B5X3n CVa49WYtfdT3eMBu9didN7eHXy1decz/8VLLla/8Sh1DhrWax7tymz8GZHdSVTcjlr59 Iq/OSnPqE+tG6naKhYO45Ot/gl0fz5baY0CdhaTcLXCcWD4oBLlpee13vvTFtqcqssWG fEwZbyvAB6GcNxehKOekcjQd2w2qTPXt3HOR11UjOgI/tSawlY8pWf8G/rUqoSIKc9Xy YbmPrQkNPtpXM7MQUxwOJcKrUq9bysuhmOTl55su13bx/GKSqymsboZXs0A/2Ndnbkd/ Hmkw== X-Gm-Message-State: AFqh2krO5ljZunhpi1XA8jFafdHWgoriP8+c40l8nqdjJEr9Fw7goe2V R2yt2+m5xd5G9yrUTEbQMiLDAzQv3ifCvEK0 X-Received: by 2002:a5d:58d4:0:b0:2bc:841d:b831 with SMTP id o20-20020a5d58d4000000b002bc841db831mr26236118wrf.55.1674600400433; Tue, 24 Jan 2023 14:46:40 -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.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 14:46:40 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 22:46:22 +0000 Message-Id: <20230124224623.1374077-3-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 3/4] av1_parse: Remove unused getbits instance 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: FpYsd/lJE92l --- libavcodec/av1_parse.c | 6 +----- libavcodec/av1_parse.h | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c index 59ea0bc6e7..b1620eb043 100644 --- a/libavcodec/av1_parse.c +++ b/libavcodec/av1_parse.c @@ -56,7 +56,7 @@ int ff_av1_extract_obu(AV1OBU *obu, const uint8_t *buf, int length, void *logctx int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *logctx) { GetByteContext bc; - int ret, consumed; + int consumed; bytestream2_init(&bc, buf, length); pkt->nb_obus = 0; @@ -94,10 +94,6 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *lo } pkt->nb_obus++; - - ret = init_get_bits(&obu->gb, obu->data, obu->size_bits); - if (ret < 0) - return ret; } return 0; diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index f4a5d2830e..89783e9d44 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -49,9 +49,6 @@ typedef struct AV1OBU { int raw_size; const uint8_t *raw_data; - /** GetBitContext initialized to the start of the payload */ - GetBitContext gb; - int type; int temporal_id; From patchwork Tue Jan 24 22:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp715798pzj; Tue, 24 Jan 2023 14:47:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXsVZZ6HVwaDyWyy7PwISrtbmGBLsmQGNvmeeNqQDCSDHaagWRM88uWAXCuKxCFwnjiFae2Y X-Received: by 2002:a17:906:7e14:b0:86e:2c11:9bce with SMTP id e20-20020a1709067e1400b0086e2c119bcemr31769174ejr.38.1674600437729; Tue, 24 Jan 2023 14:47:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600437; cv=none; d=google.com; s=arc-20160816; b=lJk4jFUUSvNMj5A1fU4JgTr/fat27SZY4AVAoFafVFm0Zrm5pbN18/ULmROzv3yYZF Hgt2p2LdmX9YrUnP4wf2MXFUdTRXGpmHpTRHZSv96llVj4DPqa/pqAEimP22o5EszzCQ v4wyftBFX7ArRJNAd+LpF41K53oLAyNEV2NdHBtWTMWYRlKpMhZFd/o0eHVqqrO9o3x8 I5BhTPfnIOwOWBzoY/UcSYCHwT/ISqvGhhdvkIJHsKyPwzmpaKLgaNnYEWxux2K36pti SST02MbfNpe1syYNVJk/wHsdXCjc/wAkJz/MZwmRcPPh7zu67Emzq+8SvuX8ifqeIDEf LmGw== 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=+e7QMf6XVUW0y90dYiJY2jTlrlgQCJQBxE/kYrEPqLs=; b=xPO9OCakRSApn+mmTSJXANslm1JE00iHzn4+7Gss3BleQz2xG6bgzbCaljsZQgAHKZ f+FeNlAR+ZJC0vyNO3pgQG/f866opGfQD5Qx8gKz4GoSS1KpzWePerGY+lvtJfGXUcWE /A6FSJbAPynzISFAzjYxW0y90dQ+aOnpTSF4vENP8Y5UIyRhxiX6Wn0hQWoJzddAfTCM NUFQEjrzs2E6zb8r3ERgtQYySHGBSbzhx8x8BL+/y/83cE2KZqFpBpui8ZBX/GUSQUdI alpVlR97oe7M+kBunGX56wtI7fCqdk4wgWg7ghATjmFd9EOj9N8yTd0hpEjomCpsavml GTrw== 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=n6+Bzr+z; 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 10-20020a170906224a00b0087787ae09f5si4420640ejr.412.2023.01.24.14.47.17; Tue, 24 Jan 2023 14:47:17 -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=n6+Bzr+z; 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 50CE068BE70; Wed, 25 Jan 2023 00:46:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 713CE68BE5A for ; Wed, 25 Jan 2023 00:46:41 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id bk16so15344377wrb.11 for ; Tue, 24 Jan 2023 14:46:41 -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=qnnPoyjmHaiuy09B2hoZXJQf3GHsRcI7O7vIf138NmE=; b=n6+Bzr+zNAuBmqa3p7Z8O58FhrHRF/pRfxOgagqRtU9SlC6VZ3cZT5qopfLpDJOzxN 8qu13NWwAXDlI3tW92TG+Xd3TN1lIBR9nQzuvT4bObNqe2z6nCs3pnWd99YlgjLB5TKq EhPjh14mi7lqjF0RYKhd22A1KM2OX5Ac2I75sGQ1TUZ7/q0vubt2A8wUDBvr7kbbI1Lu 753jf8pkxc9ovVzLCxu8ZmakRN4HvHvq/3b+E2gQUf7iCoWEjT9L6aVKA3e3VWo2O7XO mBkbadqnieHyRh+lfzzbLPRd6QVjTerOpb8Rbv51M9cZh7jC4DAF3R13s6S14zqWjp5w JIPQ== 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=qnnPoyjmHaiuy09B2hoZXJQf3GHsRcI7O7vIf138NmE=; b=Lk8fOx91GAqJoEClKytsN2ujTEv1i3F+NysIc9VrWEyaCovHobMeYhcAVzzjiw1GKS OK54JZjDYFId5qVeRpKZru44g9s89n5JYZewZXUF2fPjXWxBZVIFsv06YmvG2QbdzazS 4yELfwjmZYT44WyHJue/t2jLaHcwc6tXxy6IzPycv/pvjOsnwwt+aL9LxI67OAyfvU0W JsTQrH1LFtrXznwEC2hOflMtJd9hfLkUzOWSuLnkGZt88pGUUgy/R3wtwjYyxpdkeBj2 N2dFq+SB8Tw+etScEPNb8QD7NISs+P+J2uNBeN+tgfBzn79AH+lXKAyLArsnddR4qveO tTCw== X-Gm-Message-State: AFqh2kopDbaOMGS9Xfaf6tyz7IeQOKBt3bdQZF614Vg9kAx4ASFQaNRE Aybbfu4CU6WJKfBSeT5F512UggxHTOhUOulz X-Received: by 2002:a5d:42c2:0:b0:2bc:371a:8a1 with SMTP id t2-20020a5d42c2000000b002bc371a08a1mr25916027wrr.22.1674600400882; Tue, 24 Jan 2023 14:46:40 -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.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 14:46:40 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 22:46:23 +0000 Message-Id: <20230124224623.1374077-4-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 4/4] av1_parse: Don't reject zero-size padding OBUs 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: ZZJABCYktnzd Padding OBUs are not required to be nonempty. --- libavcodec/av1_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c index b1620eb043..e2f105a8e2 100644 --- a/libavcodec/av1_parse.c +++ b/libavcodec/av1_parse.c @@ -88,7 +88,9 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *lo obu->size_bits = get_obu_bit_length(obu->data, obu->size, obu->type); - if (obu->size_bits < 0 || (!obu->size_bits && obu->type != AV1_OBU_TEMPORAL_DELIMITER)) { + if (obu->size_bits < 0 || + (obu->size_bits == 0 && (obu->type != AV1_OBU_TEMPORAL_DELIMITER && + obu->type != AV1_OBU_PADDING))) { av_log(logctx, AV_LOG_ERROR, "Invalid OBU of type %d, skipping.\n", obu->type); continue; }