From patchwork Tue Jan 17 22:21:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp2200155pzb; Tue, 17 Jan 2023 14:21:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXvtkNdvHzXZxK0pL8P6FWwWS3wD9AzcUAjDoihy7EilFNRhbc6SvmPGsvQalp/CQxQ/h2+a X-Received: by 2002:a05:6402:4507:b0:499:9d31:8490 with SMTP id ez7-20020a056402450700b004999d318490mr5328974edb.24.1673994113921; Tue, 17 Jan 2023 14:21:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673994113; cv=none; d=google.com; s=arc-20160816; b=J3JiyTg2Tfhsg8JKTUQZdA6j+ZSlvo2ycgMZ49wgcv70UKv0CUFnHsT7NfJAI0IEHN z4Zn3eKqRkejo9aWSqyOqpNEYd21OnFyjRbq57YqSGUiwppKd+W1u1EZGQjYN+W3pd7n bj9G8k+FhzS+OaZeL0Uthy9G5DP9ApcWz5YgESqJsSJul54hUau6IgoeAnjv5isqlNnZ 6zATGqjqCxae5C+O5w9uT/Y80Zxyhu1F98Bu850EWumUN1bdcDi0SRDOk5Toshc3ujlz lLsxOIHotoDNRRWvY/Kzz+XhZpCz/ojAIP+nCXZTnEA1eMo07U5Haq86jf6XRf37xtxN rhJQ== 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:from:to:content-language:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=GAuKjgvyXPoWehjJvhQd4FtggtYsW8KOM30by6pCqZA=; b=AELqhDjWtEEDlv0FQD7v6rP2/Pjc6nO6+VbBey81XKDkZV2zAZOkxDnbndgRHV8hRJ Liyj84+WDJsOel81/tm3DmTC82buMm30ESjVCTrKjnRi4PqZ3ty7LYp9n5jYfyEEtp0H oa8UhDuF7yAd6iVJ8j4zBW/MN0PBv2CJOvaxwkizNIM0qaQh7qZUm0k6SUHFvGURydfp HwgJp4GzE3J/UJwkuVOuWLrTXvO5ks2QRZcpI48ifsnhla1A/Bw4iuzk/ic6RkZ93Baj SaccKMwAmY2LWq9kzFDwP468RLWpE9FC71UDUnc9EhAs9jg4jwqVrBKNhykGmLFFNrZb 1LIQ== 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=mAoQpc5g; 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 u4-20020a50eac4000000b0047920cdf1ccsi33030656edp.73.2023.01.17.14.21.53; Tue, 17 Jan 2023 14:21:53 -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=mAoQpc5g; 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 847B068BEAF; Wed, 18 Jan 2023 00:21:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4DAE268BBF3 for ; Wed, 18 Jan 2023 00:21:44 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso218288wms.3 for ; Tue, 17 Jan 2023 14:21:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=jFevj2/iwFfJJlg/sLp3+CDHu+6gdO9qRK04BvgWdOE=; b=mAoQpc5gV3gEnmPPrssM6WVLh0Glnc+4QiH1N6Lrd2/W/5/iD0J+q2zYOFSi7KKytL W7BAmwy4oP+eyMV0MOVNzU3quobVi7K32jzuiWllnXtMq+QFT+UCBaih5CZqkQ90xylh N8oVU80PagdsyARJ/4okhhwymZMAIrfclFW7Q5tH2mDEQIVseCmc+yvEMg1WLpuL+Dkf OIR4beBez9fbZPHEMUaDvANNyywydakvP1W+EhxQbzwp1EwhUtZ5tMxTuPo1q9YUgvT6 02Ub/BZ2aAhrLKcl8k/ytLOZ1EHIPkG7zpzp+INDbht5zkodnG/vqSi1InPWNbBW4kkJ FGyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=jFevj2/iwFfJJlg/sLp3+CDHu+6gdO9qRK04BvgWdOE=; b=nK0IIQy8wIqKRvVnN9QC9nJgau+4fc22STk0iYU+btQRrRWMi5Z0nKp0fbmlmiHMEK ZZPyho96npbuIeenZ458USwuUUkOMrGj0G9dl/Ak8xvH+abndbFd59AxpAJis0RrGqyQ EOeEtwnf4oO3N4yrs2/MIVmJjJvoh4v1RfjVuKMd1coRSuCyr62QiIV2fac3RKz1kE2V QPqv1Q1qnMUpVCY0dmJq8METJmEnymSec7VkL7Kzkib8aQJmQDRd/rYDbAxgOZ8RiInd +vg8Dq6F1AaUMzlwdPlyUNTi/4IzmSqM4ms0WBOns1l8bzetbPx/7L/vLF1MPO8s1y9D mbNQ== X-Gm-Message-State: AFqh2kohdRuJvH0jvfg0oUotcJv+sUUkqL8AhJHyqp0rMInCgCcAEnU7 jShQjUNsTDuPsjEgh70JnrSk6IddJ6EeeuWPtHU= X-Received: by 2002:a05:600c:1695:b0:3db:12b:5103 with SMTP id k21-20020a05600c169500b003db012b5103mr4676458wmn.5.1673994103701; Tue, 17 Jan 2023 14:21:43 -0800 (PST) Received: from [192.168.0.14] (cpc91224-cmbg18-2-0-cust209.5-4.cable.virginm.net. [81.106.228.210]) by smtp.gmail.com with ESMTPSA id bg14-20020a05600c3c8e00b003dab40f9eafsm110021wmb.35.2023.01.17.14.21.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jan 2023 14:21:43 -0800 (PST) Message-ID: <9f33d721-b3a5-dc8d-6048-4bc096d9abfe@jkqxz.net> Date: Tue, 17 Jan 2023 22:21:28 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US To: FFmpeg development discussions and patches From: Mark Thompson Subject: [FFmpeg-devel] [PATCH 1/2] 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: 74EYH3mZnMnk 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 d98d3d42de..46f4c5a6b8 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); @@ -1923,6 +1927,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) @@ -1937,6 +1943,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); @@ -1964,6 +1972,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);