From patchwork Wed Apr 19 00:08:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp41950pzb; Tue, 18 Apr 2023 17:09:01 -0700 (PDT) X-Google-Smtp-Source: AKy350Y/azRIjJ3+1n+3dLwRBLY/D5GwT+o6fCiy+2ScO2W8FtdnpwOO3QCGbrsrLMxjtO6yOjRA X-Received: by 2002:aa7:d64b:0:b0:506:85d1:35c1 with SMTP id v11-20020aa7d64b000000b0050685d135c1mr3843851edr.29.1681862941426; Tue, 18 Apr 2023 17:09:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681862941; cv=none; d=google.com; s=arc-20160816; b=HcYrIkbqOUnOD1T48hDN0Fy2t5bY5CKOZ6Z5rN2HKxk3a1eBMXiSgMYPamtChDrxtv JEPHJjASoB/PjDP94waTGAdtf9sJYQ7EuKBsSCkshlz4dnuAjJI9OGMxzgXgRQA9XYsh yXXnH+iftM36em1rq2sqCnUCesyy0wvNLS7Cizi09STq6C4bdX4sSZ2lzubiNv0zP0fI d5q71a1xK24xiOPM2RGFC+fDSEPzmYK11jGIvha6ZxbqAR6iC79wCUc/42B19XoiRizU PDRyTz7ydf0IAof9BXGoT8FP6tK/7zF0jfOqilUaf4wophxjGUKQceQ+HLxhqwak0509 bF9A== 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=VA5PTy7LCQ0L3RSZqR9MZe4HGTWebhPNQFjzq9xXtNg=; b=s+4P99Zg4Tz8KqqFzqblujQTPhQtWWvLHHnMVpD93CuYRnQETeBw7ldoeJ0r5zrWjd 6AixsjSISOv5OgvJ+3kLv6/FBRnmosHlWX3GYCxOmJRCiNtsYONaGmrS1OrdJW/8/OmK oENh4MfJCvq4N+TcM5iJkBn6PqKbWIPOmr0RHMEf2jB2YzdQIVrGShqE2j4Mldchp/wL +292XwsYb+uSnceaqnWNhQ6zDOSd3WDAkagTTxi3HqmCGxLK2niDTUemsvNVNr392EUy mQkEMyHOdT76/UnbiAs+Uch9ob6PUY3K+OHkf4puR/D2nXpXis8M+TRForcIyzqhgmFs M+rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=nksgEOTQ; 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 b8-20020a056402138800b0050492443e8fsi12546126edv.646.2023.04.18.17.08.58; Tue, 18 Apr 2023 17:09:01 -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=20221208 header.b=nksgEOTQ; 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 A0E4168BEC1; Wed, 19 Apr 2023 03:08:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB91C68BE6B for ; Wed, 19 Apr 2023 03:08:48 +0300 (EEST) Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-546e2fddc04so667582eaf.2 for ; Tue, 18 Apr 2023 17:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681862926; x=1684454926; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=eI2JGCliLNy9tBC4uHa9sDonYcvmDXzkj8ooszqE8oY=; b=nksgEOTQF+32pZzlw0vDdktVyVqRVqQjDJxUSh1of/v9Aljxfx+KG5ZNR9VB26i72k uPlPsgwC3iYFeDoa9p3Nz9+iPie9kZoHqbwOevYWt4z9E8PXOJDPfi5di7iGzoac2YZZ qaz6phNC563cGMGhAn+7hRIkcgfbIqgzzwVhAOTAUXf60MKz9Sl2UVLkKR1q0I+n1rNf 5tHATRTXVTsaQrrjd6CmvISOty1C/V0F6XWxcnggHwfikNSSQrir37h7+WJtI4UsXmXk gxdF0CrIoBO18E+nilcADjlUigm1hkeVyN0AFL0qkkl4ex9BYycgqmDhZzOEigUGmY3L 49Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681862926; x=1684454926; 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=eI2JGCliLNy9tBC4uHa9sDonYcvmDXzkj8ooszqE8oY=; b=eMQOz5U+qfcJPu+/Gvzp3uNXhE8qAZdG5c4RQHonPE4GmGopFjabbFC/fya2D0yiBq WqE4AvhVAOT4MXaS1Z3A940MIJcEKWhj9mVUWBzAJjPnvvD4e+nRAxX/wu/U3Q3hJvYY KXDMOitech3WITBHKxZ7DA2mptTPI7tYzcntuMTJNkUxKgPfRKnmED52Zqlv3SDvoE/q A+joHWItGGE59XmmPIHkcjacNuWbCk7emOYQ9XrSzrXvGDwco2pI7RBZ2N3tbpXBkCSa 0ondsFOs6q0eaO7z2ejjLH1lmkv5Bspr79i6s43BKh5mazvfJXC/Ogb+Y/x7ZZ/kO11F tKTQ== X-Gm-Message-State: AAQBX9dUeFoOzJ+lQ8vrJarFOUlbBrkwMLsWyMpqW84mEvF8pwacaPzk yRLxjPCCEcmUk13db2KVfYz19f8gnn8= X-Received: by 2002:a05:6808:17a2:b0:384:67e1:c9f7 with SMTP id bg34-20020a05680817a200b0038467e1c9f7mr2447230oib.45.1681862926588; Tue, 18 Apr 2023 17:08:46 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 2-20020a544182000000b0038e07fe2c97sm2829136oiy.42.2023.04.18.17.08.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 17:08:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Apr 2023 21:08:28 -0300 Message-Id: <20230419000828.3638-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: support parsing multiple ITU-T T.35 entries in a picture 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: Kv5b2Gu1GVNS This requires the newest libdav1d release. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index ddf2311a41..788ae5ef98 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -511,10 +511,16 @@ FF_ENABLE_DEPRECATION_WARNINGS light->MaxFALL = p->content_light->max_frame_average_light_level; } if (p->itut_t35) { +#if FF_DAV1D_VERSION_AT_LEAST(6,9) + for (size_t i = 0; i < p->n_itut_t35; i++) { + const Dav1dITUTT35 *itut_t35 = &p->itut_t35[i]; +#else + const Dav1dITUTT35 *itut_t35 = p->itut_t35; +#endif GetByteContext gb; int provider_code; - bytestream2_init(&gb, p->itut_t35->payload, p->itut_t35->payload_size); + bytestream2_init(&gb, itut_t35->payload, itut_t35->payload_size); provider_code = bytestream2_get_be16(&gb); switch (provider_code) { @@ -546,7 +552,7 @@ FF_ENABLE_DEPRECATION_WARNINGS int provider_oriented_code = bytestream2_get_be16(&gb); int application_identifier = bytestream2_get_byte(&gb); - if (p->itut_t35->country_code != 0xB5 || + if (itut_t35->country_code != 0xB5 || provider_oriented_code != 1 || application_identifier != 4) break; @@ -565,6 +571,9 @@ FF_ENABLE_DEPRECATION_WARNINGS default: // ignore unsupported provider codes break; } +#if FF_DAV1D_VERSION_AT_LEAST(6,9) + } +#endif } if (p->frame_hdr->film_grain.present && (!dav1d->apply_grain || (c->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN))) {