From patchwork Sun Apr 21 14:04:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12856 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 606024499CF for ; Sun, 21 Apr 2019 17:05:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F42B68A16A; Sun, 21 Apr 2019 17:05:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA903689BEA for ; Sun, 21 Apr 2019 17:05:18 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id a184so11561679wma.2 for ; Sun, 21 Apr 2019 07:05:18 -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=vEyXJ0TOUqthAEafChkY4uWeID4LG61T/8PFC/+XYck=; b=EHvPa6LwBw8zZlVzxp/lpqBCmJROyaioLRzVpLQOe5F4mLjYSqCRagtCis/tsh07tb FgbiXV5QwrYgvBB9DQnSx5efng72rRhIt+v+lQ1aRPyS+4xlRzKuUIoIP3Rp/rRg9XgB Y4um6hAHVJlOXBt8goZkFkMAHTzEIFr91DbUu3dsamLipAif/nbqbwR99h2E6WPiJhNq PbZcNtvtHLSql4Be5KLfI9YblekE0ARp3RByCHgIjkA3R3HjfW+N4sTn+9azp8Faicc2 bhNssbRh5iJYYADpuEidHnCN1NtVEN9uvMSLOPjHH7yUksPGB2e8Ppu8QkRlw7K97Ato w1kA== 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=vEyXJ0TOUqthAEafChkY4uWeID4LG61T/8PFC/+XYck=; b=nsMbqKELFJPRSR//P5QuJ0Z6ITSLw/w2vxENgoRh9ry98PH3BlWN7RAhRguJBCQB7I GaRUThtzULd0FVPMq3cjZm6HeAai6+zn++XnT3JmfSTou2I7yEtKEAYwxciXWRxG0/0U wC70kgY8dOMIO/eC+I0aG/LciSBb97NjIioeaCdRUi9r/HgpzGJzKfilfm3MjzRyrfto LCeaWUGW4IeISWmxQb9KkPgeIswe20xx1PSR96AEjM05++FjM9tbw/HRCOMN/17VuVXd lnw3xOLujLHaI69jtJEqe2LTrsLb6/PTquG2xnqHRfkLsQWLwwpOmdu1rYSNR8b8ZsJN vSxg== X-Gm-Message-State: APjAAAV9KXaxs+Zf+vQWiyS3zWtjr86ujskSNc3pc/h/KX4Ai0E1Q9TA odCTSmFyuqw/NcbGMh3EHXgKPLVq X-Google-Smtp-Source: APXvYqyvKjuvU1sEKBupZXPCUYiwSw2D9AsBE/ZFLyQUMyfNAJS9GqI5Sw3rFjpsRNkW8dlu5ALYlA== X-Received: by 2002:a1c:9c03:: with SMTP id f3mr9469656wme.67.1555855518154; Sun, 21 Apr 2019 07:05:18 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id q24sm8175066wmj.26.2019.04.21.07.05.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Apr 2019 07:05:17 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Apr 2019 16:04:03 +0200 Message-Id: <20190421140404.17418-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190421140404.17418-1-andreas.rheinhardt@gmail.com> References: <20190421140404.17418-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 | 8 ++++++++ libavcodec/cbs_mpeg2_syntax_template.c | 4 ++++ libavcodec/mpeg2_metadata_bsf.c | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 066ea83970..954adc7d57 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 xuir #undef marker_bit #undef nextbits +#undef infer #define WRITE @@ -96,6 +101,8 @@ #define nextbits(width, compare, var) (var) +#define infer(name, value) + #include "cbs_mpeg2_syntax_template.c" #undef READ @@ -104,6 +111,7 @@ #undef xuir #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 745a123649..7b3f225396 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..bb69001cef 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;