From patchwork Tue Apr 23 20:32:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12879 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 A251344818D for ; Tue, 23 Apr 2019 23:47:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8889F68A103; Tue, 23 Apr 2019 23:47:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07B78680353 for ; Tue, 23 Apr 2019 23:47:30 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id w15so1771115wmc.3 for ; Tue, 23 Apr 2019 13:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yfXgjp9WEXpvCvIBpx2F64z0HTuLPba1z/y3Ydmj/KQ=; b=C6ylDsOUqmucEZ17S89N0sa3sd5IQq8DZ16oPeK4oVHhFu5+S6PxnPMIQnTtx7+cTc U1JrkPHKe6vGEDbmQJVqVsIazxkcl8suhMpTQbI2MOymZhr3kkOPPYWC+KRiQ9tIn7xl ptZ6JGJiWuhdJcP2ak6PmxQJMMRKxcr7WheYUfUoyyXDHUmZdwhAVAtBypVl7W8x/0Kp LzaHOLqJh2lwz8ALe15S4/GVx/Va/P4szN01hSU/XgArK2bHjs2DV2A74na6e5si3vvS mis/7YorY0mHA/byOeO+aJCuRRXFahzNBllpDcm4UZ7xsu5FsqMHoKeaoN6yiW2Wc1To EFJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yfXgjp9WEXpvCvIBpx2F64z0HTuLPba1z/y3Ydmj/KQ=; b=iHXhCcH64zmJXmWEtWujxRYFrydQYA9uJr1FGo2+Zry1qbfKR+f8fWngE1UVKsAYNq SYgjAZie4ErlA1h1yelSYEYDXog5v5OPzo8gHG/JThhRy2aET4kt1uojHFdtdisRbYx6 m3VXxacjEwP1688Lkwl58UavCH3bJll+anA4KLxAt6UQHkqIuGerRZp/DAjfYc/eGzMd 0rZF15THlNLyj2upuzvl4jQKEZbv+x+oOqLd9UG/bRF8DD3F2tkO0QFMLXzFfs2s/ssW n7bhUKLENfawZIHPzfyjfs9719w/85r36GB6S51rmHLg/LmhE3H+704pq9XJUMgJgdHy 7Daw== X-Gm-Message-State: APjAAAWHesSmcJn9l3AP/b+pRXCABhGlkKkCQir+3f5u1wW36DiePvSy NmzI/yCD3+XApRX85yWcI5zzKwmc X-Google-Smtp-Source: APXvYqyDEFZHYCvdCH+Xl279V/s8TQYrOdao3qfqmAWVaxj20TeUGMFDz8XTBsmMbJtt6zBGbrFu3w== X-Received: by 2002:a1c:d1c5:: with SMTP id i188mr3771479wmg.8.1556052088600; Tue, 23 Apr 2019 13:41:28 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id b8sm11193133wrf.21.2019.04.23.13.41.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 13:41:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Apr 2019 22:32:29 +0200 Message-Id: <20190423203230.4742-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190423203230.4742-1-andreas.rheinhardt@gmail.com> References: <20190421140404.17418-1-andreas.rheinhardt@gmail.com> <20190423203230.4742-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] mpeg2_metadata, cbs_mpeg2: Fix handling of colour_description 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If a sequence display extension is read with colour_description equal to zero, but a user wants to add one or more of the colour_description elements, then the colour_description elements the user did not explicitly request to be set are set to zero and not to the value equal to unknown/unspecified (namely 2). A value of zero is not only inappropriate, but explicitly forbidden. This is fixed by inferring the right default values during the reading process if the elements are absent; moreover, changing any of the colour_description elements to zero is now no longer permitted. Furthermore, if a sequence display extension has to be added, the earlier code set some fields to their default value twice. This has been changed, too. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 15 +++++++++++++++ libavcodec/cbs_mpeg2_syntax_template.c | 4 ++++ libavcodec/mpeg2_metadata_bsf.c | 18 ++++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 4025812531..96c2d2c22e 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -70,6 +70,10 @@ (get_bits_left(rw) >= width && \ (var = show_bits(rw, width)) == (compare)) +#define infer(name, value) do { \ + current->name = value; \ + } while (0) + #include "cbs_mpeg2_syntax_template.c" #undef READ @@ -78,6 +82,7 @@ #undef xui #undef marker_bit #undef nextbits +#undef infer #define WRITE @@ -96,6 +101,15 @@ #define nextbits(width, compare, var) (var) +#define infer(name, value) do { \ + if (current->name != (value)) { \ + av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \ + "%s does not match inferred value: " \ + "%"PRId64", but should be %"PRId64".\n", \ + #name, (int64_t)current->name, (int64_t)(value)); \ + } \ + } while (0) + #include "cbs_mpeg2_syntax_template.c" #undef READ @@ -104,6 +118,7 @@ #undef xui #undef marker_bit #undef nextbits +#undef infer static void cbs_mpeg2_free_user_data(void *unit, uint8_t *content) diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index 73bfeae29e..f2718635c2 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -128,6 +128,10 @@ static int FUNC(sequence_display_extension)(CodedBitstreamContext *ctx, RWContex uir(8, colour_primaries, 1, 255); uir(8, transfer_characteristics, 1, 255); uir(8, matrix_coefficients, 1, 255); + } else { + infer(colour_primaries, 2); + infer(transfer_characteristics, 2); + infer(matrix_coefficients, 2); } ui(14, display_horizontal_size); diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index ba3a74afda..292c9a17ce 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -147,18 +147,12 @@ static int mpeg2_metadata_update_fragment(AVBSFContext *bsf, if (ctx->colour_primaries >= 0) sde->colour_primaries = ctx->colour_primaries; - else if (add_sde) - sde->colour_primaries = 2; if (ctx->transfer_characteristics >= 0) sde->transfer_characteristics = ctx->transfer_characteristics; - else if (add_sde) - sde->transfer_characteristics = 2; if (ctx->matrix_coefficients >= 0) sde->matrix_coefficients = ctx->matrix_coefficients; - else if (add_sde) - sde->matrix_coefficients = 2; } } @@ -229,6 +223,18 @@ static int mpeg2_metadata_init(AVBSFContext *bsf) CodedBitstreamFragment *frag = &ctx->fragment; int err; + #define VALIDITY_CHECK(name) do { \ + if (!ctx->name) { \ + av_log(bsf, AV_LOG_ERROR, "The value 0 for %s is " \ + "forbidden.\n", #name); \ + return AVERROR(EINVAL); \ + } \ + } while (0) + VALIDITY_CHECK(colour_primaries); + VALIDITY_CHECK(transfer_characteristics); + VALIDITY_CHECK(matrix_coefficients); + #undef VALIDITY_CHECK + err = ff_cbs_init(&ctx->cbc, AV_CODEC_ID_MPEG2VIDEO, bsf); if (err < 0) return err;