From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4CCF049485 for ; Tue, 12 Mar 2024 18:45:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD6AF68D13D; Tue, 12 Mar 2024 20:45:42 +0200 (EET) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 839F668D121 for ; Tue, 12 Mar 2024 20:45:36 +0200 (EET) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6e6adc557b6so731400b3a.2 for ; Tue, 12 Mar 2024 11:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710269134; x=1710873934; darn=ffmpeg.org; 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=FNV88z7KKKB5msPJi0wiza4kwGKeZdTNybrFDUgk1R4=; b=JoYQwe8lYyMgzIS3VUhSKPJc6T8A6BnrlOzlscL2rQCMN+Wmd0aem0Plb+mhEtF5gS k0SaPwKDnu8bIdeuP6IzesrLYmjbjv00frmMjQ5iNLU6B5RSg1ms5tLNhjc73c+IddqZ EnXkgkgD4FSVnfqrRUVQr97A+CvFNrHTne0yyTe2W/WjEsImonyyZsd9GSqKrRRj6AAM 5gOhpy9D0DqNcTw4UnKMa1RQ6j5ERqWf7iwo5eRA5Hh95v0qd1rHZnpJ/dsGycDO9GBS PPFHw0SgXwz0r0f2X0DmGq0ZWcvZevDkjGFHyQgcZJ8e3xikHuWJ46VSnH0oPHCDMhEY m7EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710269134; x=1710873934; 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=FNV88z7KKKB5msPJi0wiza4kwGKeZdTNybrFDUgk1R4=; b=JFVTRhJ6Hl4i1D7CHribk01h2r2GE6ro1lNeDrX18aVdqJJ/et9/BNGzMCTnKt18Sn 32nWGJbYed332qu6VeUP/ka6VT8VUKAeAo3aFXYED4iHVukwTbfZUtqG23UPz7hRrBQ4 yEu9rmyav4xQ0zDvWGbSaAqoKGI0fvBEv7Cgbay6iDYGewl1CwWEtqKDBjWrQEMVVC3G TWeCHM3HsUYWr1NK0qi9xEQyWlL47TdAUkG3sOj6pdw+pI7bz+orI7ncfkwOm8hihn0H ABBA87c0xZ36QmRr8b80NGI9lwVqIdJSnM8pYGycYCqufy7MctYFYZPdCn/Cp/4zHTSD zI4A== X-Gm-Message-State: AOJu0YxzURIqB5JCKIkm7zL9Zrh2hARne0X6BXbMXz3/Q7dp4sQ8yMcw SXvWzdizeLV/+hqg6vyB9KQKJYBaR5N3RPJri3uhIgrql9ynKjyIaLPwI0xC X-Google-Smtp-Source: AGHT+IGBoFS++wZkegcmEd3h85UWvBmjVIxw5Oq1Q62/zBe2FhB3Rtr7PLYSA+YWF40mhm5L9U+fYQ== X-Received: by 2002:a05:6a00:3d4c:b0:6e5:e7c5:9120 with SMTP id lp12-20020a056a003d4c00b006e5e7c59120mr361201pfb.19.1710269134302; Tue, 12 Mar 2024 11:45:34 -0700 (PDT) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id y187-20020a62cec4000000b006e4d8687f44sm6734326pfg.102.2024.03.12.11.45.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 11:45:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Mar 2024 15:44:34 -0300 Message-ID: <20240312184435.7420-3-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240312184435.7420-1-jamrial@gmail.com> References: <20240312184435.7420-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/libdav1d: use named constants for ITU-T T.35 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/libdav1d.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 1aa2d1f343..597944d88d 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -37,6 +37,7 @@ #include "decode.h" #include "dovi_rpu.h" #include "internal.h" +#include "itut35.h" #define FF_DAV1D_VERSION_AT_LEAST(x,y) \ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) @@ -542,7 +543,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) provider_code = bytestream2_get_be16(&gb); switch (provider_code) { - case 0x31: { // atsc_provider_code + case ITU_T_T35_PROVIDER_CODE_ATSC: { uint32_t user_identifier = bytestream2_get_be32(&gb); switch (user_identifier) { case MKBETAG('G', 'A', '9', '4'): { // closed captions @@ -566,12 +567,12 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) } break; } - case 0x3C: { // smpte_provider_code + case ITU_T_T35_PROVIDER_CODE_SMTPE: { AVDynamicHDRPlus *hdrplus; int provider_oriented_code = bytestream2_get_be16(&gb); int application_identifier = bytestream2_get_byte(&gb); - if (itut_t35->country_code != 0xB5 || + if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US || provider_oriented_code != 1 || application_identifier != 4) break; @@ -587,9 +588,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) goto fail; break; } - case 0x3B: { // dolby_provider_code + case ITU_T_T35_PROVIDER_CODE_DOLBY: { int provider_oriented_code = bytestream2_get_be32(&gb); - if (itut_t35->country_code != 0xB5 || provider_oriented_code != 0x800) + if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US || + provider_oriented_code != 0x800) break; res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer); -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".