From patchwork Wed May 22 01:04:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13234 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 C0B7A4489D0 for ; Wed, 22 May 2019 04:19:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0D1368A86C; Wed, 22 May 2019 04:19:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DF1268063A for ; Wed, 22 May 2019 04:19:40 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id d18so328283wrs.5 for ; Tue, 21 May 2019 18:19:40 -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=32boQDTIJmu55u/wuClYZhmjPRlGZ1hQNNwD0mHsPNc=; b=p7ibxgWsprvblS6KUA3h3ze+OU8a5jp6ziHwMdes3I+OcRmGN2j7foEiWA0ztT4zzq PF7jPBORPHTAlgb2nQOGRN0R3I81tT9gcBy1M1Vb0AVDCDiaaWIHS8v3k6jqbfYMZyp0 bZRPHXsxGbG3rtd6lnXa0+tOUajVBzvqPjF4KnDtFxbD+vAukimE2AsRV/pu+OWLUY9M dGtb5WQbJNdi3Al3n1hXfYcJFmQTjZXrFvfXZkfrWkYaQ8eJJ2ZEFBmQgmaub895s3kk T2Eqg21Xr68XZxLlZ9lkrbV5ZUDa3nmsiY4xhRrXuKzYmIU9OVpznlsqYPCqSrD4veyf 4gmQ== 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=32boQDTIJmu55u/wuClYZhmjPRlGZ1hQNNwD0mHsPNc=; b=qRC20EkEbMjH1RNzfrFTFf/KmdV3A735h5nMOnS7gngOl6cKRPaycP4RTGtwKa9aNw y1Usirp+UVpbJLGUgbszFPsVQPqGzZAm//AVsxZkrR54hs3ZHBTKNZHSSY84foB3jTdT hTTH4GtKsmUZ1FdCYxCET3fm+DGfo1cDQBQxWg16DJ4W7gTAESKdZcxU3AW2MKU4uY+Z wXQIKb6KnDV+vAQFFJKZdrWpMJKs6rJrG/AHFcI6eXBxMakXCOprq/yhZNoRk+GUY4Ul LF8jIR+tnMZOJ++Gve5ta4cf0NWR/h9dS4XHWWPHPTT/VLMx3J5eQGadQ8nyU45MslU+ VGsw== X-Gm-Message-State: APjAAAV8yQQxMOY/C24Z5ADCfOUhLSNkJS8x9+PIQzsBoLUEHxYrUVIt YIrMsHJI24OJUf3arLIsuNGP9CPR X-Google-Smtp-Source: APXvYqyiKvQoW/SzL1k61YEIHQ1z41NeybdZJtVE7VjP6T+P5287mV633rpX49vDfjMa/UyK4BegIw== X-Received: by 2002:adf:cd0d:: with SMTP id w13mr51057018wrm.38.1558487610014; Tue, 21 May 2019 18:13:30 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id z1sm8614486wrl.91.2019.05.21.18.13.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 18:13:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 03:04:33 +0200 Message-Id: <20190522010441.44257-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522010441.44257-1-andreas.rheinhardt@gmail.com> References: <20190522010441.44257-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/11] 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 1d319e0947..437eac88a3 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -71,6 +71,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 @@ -79,6 +83,7 @@ #undef xui #undef marker_bit #undef nextbits +#undef infer #define WRITE @@ -97,6 +102,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 @@ -105,6 +119,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 b9d53682fe..87db0ad039 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 ba3a74afda..5aed41a008 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;