From patchwork Wed May 22 09:53:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13243 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 927034440C8 for ; Wed, 22 May 2019 12:54:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C8E16805D3; Wed, 22 May 2019 12:54:46 +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 D49CB680282 for ; Wed, 22 May 2019 12:54:40 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id j187so4302973wma.1 for ; Wed, 22 May 2019 02:54: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=mPNQe2fwfyxiJz5paugXUx948c96AE8lHgi9xxBPrZ8=; b=r/osCUT6MnBDnaKZMiR/UubzPvl+4f4FZvHpT3buECtci/lU0hkNmmGInBYM/v8oxx OpmFS4oyTx5Itfc4qPQQK/O5bg6v6Q+062ggz2E2zSIH6zb5T8vWv+xkMHadOsiFlECN X8zyzVzDd5jiibVofCvkHX5zIpCSK1J+gDIaisUjRTd+xxxqKOVk/oY6URj3GK12QjH2 tTHidkr+vEogQgOpqN5lw3ihTIdwl30RA8i5F1/+dtPAE2rRylBfoEa4bvp9N4HvA3IT QZuyvZ4J2rYPw6hH8IbfZ4W8NWDcA/V7jKX7vEHbem77Pjgoktplmbq139Py/2DkpFj/ iuHQ== 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=mPNQe2fwfyxiJz5paugXUx948c96AE8lHgi9xxBPrZ8=; b=D+sWQwfWPsVvuwh9i9PTf/w+I8fXw+GhIYe//Eo5cUlGNrATj8CHzsq0xUJID8p24B BQoU8DO5gpnTLLDN/XZWnIpqV+ai+/fc1J72zXBg4VeW8CZSu1Kh0ZvcurTHx0wYdXdB X6/N/UHh7r5eaH9XGHExGzbFP03yHMONfAZN65aRFWjKsVlGIJq2WbzpPV/oV3C/w1ZA jsypfNzcy2xW5Q9J7Z3TQ0yv8S0c6LGrMIoo19UCNN/uwBgrldPsqh+NrDfPZxF+PKbB 9Rxo5H7SaauIA7P9TsVuMuKwFW5YPXzh3LERKaw39/FNVAjLPJimLXVIjHTKqsca8tMh NMMA== X-Gm-Message-State: APjAAAUTsDZbCb/cYp5Mnj8ISVWN5vnLEtrUfb7VjNyRfxwObccxWiet elUCal58uSjmvrFNMvtaYPmE+RP+ X-Google-Smtp-Source: APXvYqzI9KhZFz4YjF8nCjlhFaOFY87MjlOyeYXt/3wYXEUN8225em6StstpUIzn1E/u3QjBCZx2Qw== X-Received: by 2002:a1c:1f0d:: with SMTP id f13mr7280408wmf.74.1558518880061; Wed, 22 May 2019 02:54:40 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id e15sm3799428wme.0.2019.05.22.02.54.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 02:54:39 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 11:53:43 +0200 Message-Id: <20190522095343.47094-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <9f2ed3ed-d7f3-b077-31a4-da162deb98a6@gmail.com> References: <9f2ed3ed-d7f3-b077-31a4-da162deb98a6@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] cbs_mpeg2: Fix storage type for frame_centre_*_offset 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" The frame_centre_horizontal/vertical_offset values contained in picture display extensions are actually signed values (i.e. it is possible to indicate that the display device should add black bars/pillars). The files sony-ct3.bs and tcela-6.bits (which are both used in fate tests for mpeg2_metadata) contain picture display extensions; the former even contains a negative frame_centre_vertical_offset. Fortunately, the old code did not damage the picture display extensions when one did a cycle of reading and writing. For the same reason the fate tests needn't be updated either. Furthermore these fields now use the trace output for matrices. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 18 ++++++++++++++++++ libavcodec/cbs_mpeg2.h | 4 ++-- libavcodec/cbs_mpeg2_syntax_template.c | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 437eac88a3..ba34ace9b4 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -48,6 +48,8 @@ xui(width, name, current->name, 0, MAX_UINT_BITS(width), subs, __VA_ARGS__) #define uirs(width, name, subs, ...) \ xui(width, name, current->name, 1, MAX_UINT_BITS(width), subs, __VA_ARGS__) +#define sis(width, name, subs, ...) \ + xsi(width, name, current->name, MIN_INT_BITS(width), MAX_INT_BITS(width), subs, __VA_ARGS__) #define READ @@ -62,6 +64,14 @@ var = value; \ } while (0) +#define xsi(width, name, var, range_min, range_max, subs, ...) do { \ + int32_t value; \ + CHECK(ff_cbs_read_signed(ctx, rw, width, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), &value, \ + range_min, range_max)); \ + var = value; \ + } while (0) + #define marker_bit() do { \ av_unused uint32_t one; \ CHECK(ff_cbs_read_unsigned(ctx, rw, 1, "marker_bit", NULL, &one, 1, 1)); \ @@ -81,6 +91,7 @@ #undef READWRITE #undef RWContext #undef xui +#undef xsi #undef marker_bit #undef nextbits #undef infer @@ -96,6 +107,12 @@ var, range_min, range_max)); \ } while (0) +#define xsi(width, name, var, range_min, range_max, subs, ...) do { \ + CHECK(ff_cbs_write_signed(ctx, rw, width, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), var, \ + range_min, range_max)); \ + } while (0) + #define marker_bit() do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, 1, "marker_bit", NULL, 1, 1, 1)); \ } while (0) @@ -117,6 +134,7 @@ #undef READWRITE #undef RWContext #undef xui +#undef xsi #undef marker_bit #undef nextbits #undef infer diff --git a/libavcodec/cbs_mpeg2.h b/libavcodec/cbs_mpeg2.h index 7565695acb..11f93b9df8 100644 --- a/libavcodec/cbs_mpeg2.h +++ b/libavcodec/cbs_mpeg2.h @@ -164,8 +164,8 @@ typedef struct MPEG2RawQuantMatrixExtension { } MPEG2RawQuantMatrixExtension; typedef struct MPEG2RawPictureDisplayExtension { - uint16_t frame_centre_horizontal_offset[3]; - uint16_t frame_centre_vertical_offset[3]; + int16_t frame_centre_horizontal_offset[3]; + int16_t frame_centre_vertical_offset[3]; } MPEG2RawPictureDisplayExtension; typedef struct MPEG2RawExtensionData { diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index 87db0ad039..e34fa9495f 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -303,9 +303,9 @@ static int FUNC(picture_display_extension)(CodedBitstreamContext *ctx, RWContext HEADER("Picture Display Extension"); for (i = 0; i < mpeg2->number_of_frame_centre_offsets; i++) { - ui(16, frame_centre_horizontal_offset[i]); + sis(16, frame_centre_horizontal_offset[i], 1, i); marker_bit(); - ui(16, frame_centre_vertical_offset[i]); + sis(16, frame_centre_vertical_offset[i], 1, i); marker_bit(); }