From patchwork Tue Dec 8 19:43:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 24438 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2D47A44AC94 for ; Tue, 8 Dec 2020 21:44:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED1BA689E7D; Tue, 8 Dec 2020 21:44:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B40568920B for ; Tue, 8 Dec 2020 21:44:23 +0200 (EET) Received: by mail-qt1-f195.google.com with SMTP id 7so12831655qtp.1 for ; Tue, 08 Dec 2020 11:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dZJcomfIO2iId7icROyewG3snqOxX+Dz13jAKQ6MLwA=; b=ffcVc7tWRATbApwieu1GAiAyUoJ1OPhEZUQ/baZRk6XWLD5pk5dNw7q3PFq1+uaqGK G82pgZKPtE/pFQFPHD19cwE6haI5AhAwE1GFBWTuO7D+eoYlQYVEWBaPiOeqFO1PwqIP EIRbJ7JzSakEVCf677eKRhDyVCYtZuwU1HcgNgIpE5Efl7HXaemAYi/yPlueUV+3EsB3 4qBNL9UMeTtqilEkTG7NDGekhzrW42tkUwoy9uSi9L/EVaKuiGY0u2xyQC4fIZRuX5Z7 Iu7ac8fOX6dI4dIff+G/vRDN9cSpNOq1Zz5r23yy7pPFtfJOLEKBaeWhMbObnPyhRNSV Csew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dZJcomfIO2iId7icROyewG3snqOxX+Dz13jAKQ6MLwA=; b=TfLXu1kNiYHAQ/P0ydw7iDHdiRWfDjAxENYvi7y/18+Cy2uGcdvlzvPg/vfa6/W2cs e7Hq+9boXFLGgBIG42n9RvPATU4ul+8eoPFAhl3R+wFzhvsdZq3Uo742CuOoJJE5xkaC wwjov5PdILO6UGzr2NMK1ntukRg1sQs9zY7bfUX2IWc2hOKX141CIM0z8xRSMoirfSBC scZ+5HOCaF8F275ecDgnNKGjK4kN0qOMA/9h6HJmWRpFZyS5sB2k/zXdq8sLPMjRpLX7 Jo767VOpsFVhzzFIMrnGlxKHY0nLud+InbKnaJhYYjxwT3MC2X5v6Rqfhroirdfg7Izt 58MA== X-Gm-Message-State: AOAM532//gZeF6lwODMseeqmvp8Acn+KWAPNEq1SaVWURBkBvSMvIyUb I3H3Nbi+ocIWTRKPhXeJGVB8aIwEnWA= X-Google-Smtp-Source: ABdhPJynHagPkdpxzMPnn/AJDADhIbVwHxJy7oRznwvWx/QBUk5o4hqjAI+wDRsNohy2TIc1VU5EYw== X-Received: by 2002:a05:622a:34d:: with SMTP id r13mr32624642qtw.93.1607456661060; Tue, 08 Dec 2020 11:44:21 -0800 (PST) Received: from localhost.localdomain ([181.23.87.99]) by smtp.gmail.com with ESMTPSA id t133sm14956670qke.82.2020.12.08.11.44.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 11:44:19 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Dec 2020 16:43:27 -0300 Message-Id: <20201208194330.2962-1-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/h264_sei: refactor parsing User Data Registered ITU-T T35 SEI messages X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- libavcodec/h264_sei.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 669560ae5f..42ba94114c 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -183,12 +183,11 @@ static int decode_registered_user_data_closed_caption(H264SEIA53Caption *h, static int decode_registered_user_data(H264SEIContext *h, GetBitContext *gb, void *logctx, int size) { - uint32_t country_code; - uint32_t user_identifier; + int country_code, provider_code; - if (size < 7) + if (size < 3) return AVERROR_INVALIDDATA; - size -= 7; + size -= 3; country_code = get_bits(gb, 8); // itu_t_t35_country_code if (country_code == 0xFF) { @@ -196,20 +195,34 @@ static int decode_registered_user_data(H264SEIContext *h, GetBitContext *gb, size--; } + if (country_code != 0xB5) // usa_country_code + return 0; + /* itu_t_t35_payload_byte follows */ - skip_bits(gb, 8); // terminal provider code - skip_bits(gb, 8); // terminal provider oriented code - user_identifier = get_bits_long(gb, 32); + provider_code = get_bits(gb, 16); + + switch (provider_code) { + case 0x31: { // atsc_provider_code + uint32_t user_identifier; - switch (user_identifier) { + if (size < 4) + return AVERROR(EINVAL); + size -= 4; + + user_identifier = get_bits_long(gb, 32); + switch (user_identifier) { case MKBETAG('D', 'T', 'G', '1'): // afd_data return decode_registered_user_data_afd(&h->afd, gb, size); case MKBETAG('G', 'A', '9', '4'): // closed captions return decode_registered_user_data_closed_caption(&h->a53_caption, gb, logctx, size); default: - skip_bits(gb, size * 8); break; + } + break; + } + default: + break; } return 0; From patchwork Tue Dec 8 19:43:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 24439 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3F3BC44AC94 for ; Tue, 8 Dec 2020 21:44:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19D8F68A16A; Tue, 8 Dec 2020 21:44:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6457F68920B for ; Tue, 8 Dec 2020 21:44:24 +0200 (EET) Received: by mail-qk1-f195.google.com with SMTP id 19so9538950qkm.8 for ; Tue, 08 Dec 2020 11:44:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Lke5sgro6ponxy2IbMQb4Wt19MjVjmmeYGDAmIJsVAU=; b=gnreY2+ZU3MwFnyi12XRqUxVVSp4tEvhK93D3FcX3CJ8mmeIvt98ugjjL7p9tWo94Y AvjUJKjiJKNwelS6uDMCDa+4ynM4oNWzaSR8XUBlc1kvypv5/8DiSB86upHu1FOLTObb lGn/5BoKXQQan8PIHjwROAJaRy3RJ5bJ4bOwLyVT917E5Mf/qnjDwMwiZOPUIxVkPCkC WHVAMsLfAndzwr1yKje3wPGjdJJRryx8B3eFNJqJDnQwlC01YXl+oa0Ynr80hfeO26u+ pUtAXBQeZ2mbd5MWBks7CqxPydfKSWTgt+7J3m0HBUQhUoAw4Vkq5Kbc5Avklvaj4YNB dwJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lke5sgro6ponxy2IbMQb4Wt19MjVjmmeYGDAmIJsVAU=; b=jDYTRPVpOYdwQti3TkNGeGBga/D9IvIrZTuf9luUNxPWoj8K8unW7L33Q4Rb9DtWkc ZODSHUIBkyz0r0RtT2F/3sEZLGIuv77rqlUJi6Kl0CIDLypJcGHLXFPr0Yg/BKbvt4Xg NnyrjgQeuEbeJ5KgSnGPqeRdm6zG4dicaGPkrxQRV812S+4SWqoLuSYm4pku54y9Qj7A bD0A88DdFtunpCXmMUbPLc9kwxLRniJB28t7EkN8cTtkBh1vUTpmUU8/W6s1QXgXZvEj HQiNIhJI/GTkZQX8e9feS9Ehc3mPpyl13zUTtIoevw7777xk/AJzWetB6jnz02lDWoAF R7cQ== X-Gm-Message-State: AOAM532+2yDjeHs/LvhBDRelKiSX57LIHXVeVzUC5ofbxfwoiiobxpe9 Z+JKyJpwEfiBSYhA1CgmmUtuwpHz/R0= X-Google-Smtp-Source: ABdhPJyVuUhIMquFXk6QyYKIp/XSgLzfCR4wtEgA1VoEQ4kVXOt+ipDJKm+czNqlRaJnUbJpL9rtpw== X-Received: by 2002:a05:620a:2205:: with SMTP id m5mr8740519qkh.494.1607456662718; Tue, 08 Dec 2020 11:44:22 -0800 (PST) Received: from localhost.localdomain ([181.23.87.99]) by smtp.gmail.com with ESMTPSA id t133sm14956670qke.82.2020.12.08.11.44.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 11:44:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Dec 2020 16:43:28 -0300 Message-Id: <20201208194330.2962-2-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201208194330.2962-1-jamrial@gmail.com> References: <20201208194330.2962-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/h264_sei: print a log message when a unsupported ITU-T T35 SEI messages is parsed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- libavcodec/h264_sei.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 42ba94114c..96ae50a24a 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -195,8 +195,12 @@ static int decode_registered_user_data(H264SEIContext *h, GetBitContext *gb, size--; } - if (country_code != 0xB5) // usa_country_code + if (country_code != 0xB5) { // usa_country_code + av_log(logctx, AV_LOG_VERBOSE, + "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d)\n", + country_code); return 0; + } /* itu_t_t35_payload_byte follows */ provider_code = get_bits(gb, 16); @@ -217,11 +221,17 @@ static int decode_registered_user_data(H264SEIContext *h, GetBitContext *gb, return decode_registered_user_data_closed_caption(&h->a53_caption, gb, logctx, size); default: + av_log(logctx, AV_LOG_VERBOSE, + "Unsupported User Data Registered ITU-T T35 SEI message (atsc user_identifier = 0x%04x)\n", + user_identifier); break; } break; } default: + av_log(logctx, AV_LOG_VERBOSE, + "Unsupported User Data Registered ITU-T T35 SEI message (provider_code = %d)\n", + provider_code); break; } From patchwork Tue Dec 8 19:43:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 24440 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 584F344AC94 for ; Tue, 8 Dec 2020 21:44:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BC4768A161; Tue, 8 Dec 2020 21:44:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DE3968A141 for ; Tue, 8 Dec 2020 21:44:27 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id w79so6076105qkb.5 for ; Tue, 08 Dec 2020 11:44:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ih5EwWhAz7Mt2BwE1WQ66x5ltewwJs81+4OU6gmwiwo=; b=jTmLimxx3LDqhWBcJzxILAMGDDLC96fkAhMDf5N0Z7jc2rCbUOCvI1i+0BwhurJxDp /c7Qy0RC7+xbEoZnnfc3Trn4npmdGlTW+TT4Fda19FHj2XOJiDDB2BQGEqZ17CJahYmO lWJHIz5nnEN9mKz3U5O1y5otJJApy8zRcX0FdEOySZrUhja+4AC+aO+D7OtTBtZzupWE bIj0jDEmNNqgIEFR1psIqRXciCzDs/NA/skdCR3pectqK1g3le7H8VowdfTQhkCr6jP6 STvPGZSBdDjPaBRg6rwFzlStEXCt6bLyGKGB/rcugAx3Grb0PWKMMfg0QF8VOHWVLiek cMVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ih5EwWhAz7Mt2BwE1WQ66x5ltewwJs81+4OU6gmwiwo=; b=SV1CYYIgy9/oRFkGcgHmPjSdEsttG5NVpfaSLV0DQhsUNoXEuxBHJpDf4wakjK9S0m sKM7xbaZOt96J9Qe/jd2Nc4CDxpd/JVtn4rnhg5qc83huTbYgAapkQZbWiGmwkz8nr1L 7NqlIt8Wa5nTOmf43lF2YsQia7xzMgiEJqe1iwPJowAiZCK5bkzkv+LYqZK4huJ2hVlm O64HEycZO0D/k5v+59mbvBiId3CrkXk9a3Lyu1XOcCxk24OLI/+oFiC7xBqkyc+jvBv8 czNNitzIBlHIVUKTsbFnRRHQgDUW2HFUCaJWI1lH1OQp5qHmnwbHF2FR3Im1cgbxURcv B0Dw== X-Gm-Message-State: AOAM531oBamR1HQGzE2gHAQNE9uEOzpTe8ry2XuS9UBfemf2xSGEe7H1 jjOwmsNHUWBz6b1ZZEvXMqpeJGtP6Dw= X-Google-Smtp-Source: ABdhPJyPLR9+hYsJ0Eftjb/8GyMtghlLquFrof+kRMgyLHh/i2PGGE8LiOFfhUV9ktD6dgTKJ11jRg== X-Received: by 2002:a05:620a:6a1:: with SMTP id i1mr32947148qkh.136.1607456664655; Tue, 08 Dec 2020 11:44:24 -0800 (PST) Received: from localhost.localdomain ([181.23.87.99]) by smtp.gmail.com with ESMTPSA id t133sm14956670qke.82.2020.12.08.11.44.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 11:44:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Dec 2020 16:43:29 -0300 Message-Id: <20201208194330.2962-3-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201208194330.2962-1-jamrial@gmail.com> References: <20201208194330.2962-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/hevc_sei: refactor parsing User Data Registered ITU-T T35 SEI messages X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- libavcodec/hevc_sei.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 3b0fa43439..d30568c20d 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -238,11 +238,7 @@ static int decode_registered_user_data_dynamic_hdr_plus(HEVCSEIDynamicHDRPlus *s static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb, int size) { - const uint8_t usa_country_code = 0xB5; - const uint16_t smpte_provider_code = 0x003C; - - uint8_t country_code = 0; - uint16_t provider_code = 0; + int country_code, provider_code; if (size < 3) return AVERROR(EINVAL); @@ -254,10 +250,13 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitConte size--; } + if (country_code != 0xB5) // usa_country_code + goto end; + provider_code = get_bits(gb, 16); - if (country_code == usa_country_code && - provider_code == smpte_provider_code) { + switch (provider_code) { + case 0x3C: { // smpte_provider_code // A/341 Amendment - 2094-40 const uint16_t smpte2094_40_provider_oriented_code = 0x0001; const uint8_t smpte2094_40_application_identifier = 0x04; @@ -274,7 +273,9 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitConte application_identifier == smpte2094_40_application_identifier) { return decode_registered_user_data_dynamic_hdr_plus(&s->dynamic_hdr_plus, gb, size); } - } else { + break; + } + case 0x31: { // atsc_provider_code uint32_t user_identifier; if (size < 4) @@ -288,7 +289,13 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitConte default: break; } + break; } + default: + break; + } + +end: skip_bits_long(gb, size * 8); return 0; } From patchwork Tue Dec 8 19:43:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 24441 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 84B0C44AC94 for ; Tue, 8 Dec 2020 21:44:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 662F268A2A2; Tue, 8 Dec 2020 21:44:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9754B68A214 for ; Tue, 8 Dec 2020 21:44:28 +0200 (EET) Received: by mail-qk1-f196.google.com with SMTP id c7so8844294qke.1 for ; Tue, 08 Dec 2020 11:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HvxF+QnzydCWK+7sb7dIQBkC/O40WY2VCbDzwJDNwkQ=; b=kOGnvFnFITA/kABPZAMgLPXbWIRNsy3pkaASjv5GarfxuZZdYpM2edKdSa7ePEDrbv lpilRoHvuki6+KU4qLUHRa7ODZM3jfD2pkBJ8J4o/4IBlGD/oXQMveC0wbSf+ZYfR1AQ Gd+LP/GYFyo0e3qVL6QlpKBPucnGfJ6le+4HCntXv1Nb/Y79qFqGqbb8bGx7/hF3CHuE OA1ArJJC96x5d8t/i/60vHr55sKf/zYWERsQc/IjAazDYpbNgxkgHARgv+uEjaLhfQav 3UsrLvBba/TdjZSwCuUtVYyxEBwGwDrTWOI2x/1Dkr/ipwxo13hsCgbGGNhmIspTjZ7H GbYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HvxF+QnzydCWK+7sb7dIQBkC/O40WY2VCbDzwJDNwkQ=; b=s95qxe6ou7THgB+3+va37TTkMtoml7X2H+eB1OIVo71XHen/TOEHW+k7Euhmr8rEgy Z9RPH2zUUGfLLfrAJoQrE8v5/HRsEVD00rZMZQO9NVO5O/Nrv8J0MgjJdLnQRGqON2Q1 Owz10OoAEkf2GdBD4OPI5FOlDh+a9QB3sdBxPsEgRqllPGuoEVjilJDjNOiUDjANmH4q aABZ7NmPfAxa4pOqi887WhqSf+RrqlVAYdHl0IrkJrZyJP6RsJjvyPrbnik997IT3QcH sTsKkVoNbedg0+4bi+ADY8S/AbwI86mWzSFtHILHW4H3js8+YQ7JnGoTPwCtowwZxTSb yqDA== X-Gm-Message-State: AOAM531GpSMw4TmyjZqJRZc37mUZmn+GSSVi1GLRlb5GqC+8yZyochPS W3ZskytmVs7CzefkdSpcE0XwdaKWkDk= X-Google-Smtp-Source: ABdhPJyNNyLrov8eMCorKOL+2nhpRVvsTAk4rkSeX7GYNguz0azWIFLEdTvtA2lOnLWO9iuyNnOaHg== X-Received: by 2002:a37:9441:: with SMTP id w62mr4588722qkd.349.1607456667084; Tue, 08 Dec 2020 11:44:27 -0800 (PST) Received: from localhost.localdomain ([181.23.87.99]) by smtp.gmail.com with ESMTPSA id t133sm14956670qke.82.2020.12.08.11.44.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 11:44:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Dec 2020 16:43:30 -0300 Message-Id: <20201208194330.2962-4-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201208194330.2962-1-jamrial@gmail.com> References: <20201208194330.2962-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/hevc_sei: print a log message when a unsupported ITU-T T35 SEI messages is parsed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- libavcodec/hevc_sei.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index d30568c20d..0607b1f7b4 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -236,7 +236,7 @@ static int decode_registered_user_data_dynamic_hdr_plus(HEVCSEIDynamicHDRPlus *s } static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb, - int size) + void *logctx, int size) { int country_code, provider_code; @@ -250,8 +250,12 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitConte size--; } - if (country_code != 0xB5) // usa_country_code + if (country_code != 0xB5) { // usa_country_code + av_log(logctx, AV_LOG_VERBOSE, + "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d)\n", + country_code); goto end; + } provider_code = get_bits(gb, 16); @@ -287,11 +291,17 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitConte case MKBETAG('G', 'A', '9', '4'): return decode_registered_user_data_closed_caption(&s->a53_caption, gb, size); default: + av_log(logctx, AV_LOG_VERBOSE, + "Unsupported User Data Registered ITU-T T35 SEI message (atsc user_identifier = 0x%04x)\n", + user_identifier); break; } break; } default: + av_log(logctx, AV_LOG_VERBOSE, + "Unsupported User Data Registered ITU-T T35 SEI message (provider_code = %d)\n", + provider_code); break; } @@ -402,7 +412,7 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, case HEVC_SEI_TYPE_ACTIVE_PARAMETER_SETS: return decode_nal_sei_active_parameter_sets(s, gb, logctx); case HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35: - return decode_nal_sei_user_data_registered_itu_t_t35(s, gb, size); + return decode_nal_sei_user_data_registered_itu_t_t35(s, gb, logctx, size); case HEVC_SEI_TYPE_USER_DATA_UNREGISTERED: return decode_nal_sei_user_data_unregistered(&s->unregistered, gb, size); case HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS: