From patchwork Wed Jun 19 23:45:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13627 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 438E8448AA5 for ; Thu, 20 Jun 2019 02:55:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B26568AB4E; Thu, 20 Jun 2019 02:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD1F268AB1E for ; Thu, 20 Jun 2019 02:55:43 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id r16so1010946wrl.11 for ; Wed, 19 Jun 2019 16:55:43 -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=+y9/0Juc3tCGUmdIl3jHPQDh7NDyBj+ItJzrnrtP/0g=; b=ji+eF8IPq70lhusDhVkYtVrDv7FpSe78lbSEouQuXyps4quMiKHfQ1HjFlf8WJAoht NlDua+N2oIYGPgZXEpoP6DCn0zs3mLXPBLQz5oDsFkU7Rg7gw7AYt5n4UoyBo3woVIcU nbIWAWeewWu+Hx/rt4rJZNrP+GtAUFmjZjbXsZ4FN+mLX0iYjlupGpN2pA9nBPJj1Mr3 PA8QQO3u/qFoqenIfzQFdf6LFTL2Ptcl2gaH+X2PYS3dR/bykYPkq9s8g21ZEXJ+nDaV 7KGZcg3/Os0WfTigiDEiih32dzTfXs29L/46MxEeYR70OxSXnsthmwOQc1/MVfc7BBFf 75Pw== 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=+y9/0Juc3tCGUmdIl3jHPQDh7NDyBj+ItJzrnrtP/0g=; b=PSkj13mlFZbbgIwF56ITQJIfSck63ikS3ylgWU6XuTPf0xwhs/v9rKvKTA2FVGxkfl sFvXZA89Vm7nXuwnqEgxjqaIy5WV3JFqkRumevXn2wNjQocF3hDlj0ch8fifMrAvKnht wqpSfAMwQGb5qe5zargyMbI0IyVYlkuh6Kmezyr5tSv0OEFDJrpDlqYmaRyFCRpM8KVl GlXs48JFRQRZfc1sVaiZ37ulikP0eSA1XaXWtTF06dC5OrA4HjYBNXoqyrh2JofVwYYs s1ex2226YkcKVZUHkopWmZG89tIDum+9kgnptL4fSnEb8/udSh02eh7icFF4f1yphJnY Fs9Q== X-Gm-Message-State: APjAAAWQUoSAN0wxAqbnt0ly8rYWtE87yQlm0ow0R/KGkWS6OuOqhCYs gvLu+ywqW9DfPI095tQRYRlL6E2F X-Google-Smtp-Source: APXvYqy/0IxKDZjYASroXFZOjzda5O5stjQngNz/o2u6hE/HQouQ6M2Sj76mTfAFlhWE2OYFopMA+Q== X-Received: by 2002:adf:fd11:: with SMTP id e17mr19164430wrr.337.1560988543203; Wed, 19 Jun 2019 16:55:43 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id t63sm2758989wmt.6.2019.06.19.16.55.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 16:55:42 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 01:45:10 +0200 Message-Id: <20190619234521.15619-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619234521.15619-1-andreas.rheinhardt@gmail.com> References: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> <20190619234521.15619-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/31] 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 possible. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 15 +++++++++++++++ libavcodec/cbs_mpeg2_syntax_template.c | 4 ++++ libavcodec/mpeg2_metadata_bsf.c | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index cb202f835b..ac2a7b0b1a 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -82,6 +82,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 @@ -91,6 +95,7 @@ #undef xsi #undef marker_bit #undef nextbits +#undef infer #define WRITE @@ -116,6 +121,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 WRITE @@ -125,6 +139,7 @@ #undef xsi #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 e0cf716874..d9ef480f39 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -144,6 +144,10 @@ static int FUNC(sequence_display_extension)(CodedBitstreamContext *ctx, RWContex uir(8, transfer_characteristics); uir(8, matrix_coefficients); #endif + } 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 6779ffd4c4..3f371a028d 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -213,6 +213,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;