From patchwork Tue Apr 23 20:32:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12876 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 0EB82447723 for ; Tue, 23 Apr 2019 23:33:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0AA4680446; Tue, 23 Apr 2019 23:33:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 220D9680258 for ; Tue, 23 Apr 2019 23:33:18 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id g3so21887649wrx.9 for ; Tue, 23 Apr 2019 13:33: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=vikw+CpVgNRwqNPg2FMgkgD8UUg+tO3CquJWQCULXBo=; b=qeDzjiK5rY8Vo+Ca0GrarT9SBU47/6/HK9QBeAd6uYDR8snFP/KaGXj9OqKaueJmcN fLE8RtQyINJGdjblcI/9zhma4yas7OSWdgwAByOMYCc6fgYgabhLSB5FsHOq8KRh2kat 8xHZQyAPlixXSEdTF6zHxYS8agQ5MLLUcr5afQeeL5XLW27ayZG7RP8eRxGViEPtoLY9 z9yLW6eqONeBf+b7rO8BkmZ4BgoGf+P6x5XBLtE8DydP+UPOg1ohOU0AtX9dPPCFakdB hcAygAkyBqqgmYTkW5nUaLaEOPUurrWqrtN7IiAsNklTUP6cH2934o4f8IO9Knd+XJN/ dKWQ== 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=vikw+CpVgNRwqNPg2FMgkgD8UUg+tO3CquJWQCULXBo=; b=g71uHV2/1Bc9f1T+LXTwzxciZ4PveAIzRYvXJxk7ggzVbUALxpsTJycLmeHAYQ8X0N B/s6jh60ImKKvMJJ2djptW/Ujes9oNlZSo3rmPvQHTv8yBcMd0SYSJUoVb21FSfLVJ4s 9in1VikOKBMCmQi/WAJN4hBzUcSmjU7g02k/GXvu2xImDVy5GMjxQP40ri4FVoQKUNfA 0lYEBSG3zCm35zyPqtsbeGWCg4YflKPxJujZrgeRIUhTVGna3ky9a9D7VWkn+TnAIvyy EXsvep94az0Vab1wOjHJAV5idk8YW2sqChzkudIBrh+el434qkEWqZdnX4bataA+ktoP srvw== X-Gm-Message-State: APjAAAXvbecRS/TGGNzXYYAXGKa33heVA9t8AKxeHBBoffkxEtQa1twm v+cnUJNGQZw0IDahRyGmKGNU7TT3 X-Google-Smtp-Source: APXvYqyDKC6/9ncSX13i6fbJRh5ci+T/YfgQMI485iqW7/JncOE0MVBiZgeNglBWiP3Ek7LVdJC7HQ== X-Received: by 2002:a05:6000:110a:: with SMTP id z10mr2968969wrw.86.1556051597410; Tue, 23 Apr 2019 13:33:17 -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.33.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 13:33:16 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Apr 2019 22:32:27 +0200 Message-Id: <20190423203230.4742-1-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 1/4] cbs_mpeg2: Correct and use enum values 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 30 +++++++++++++++----------- libavcodec/cbs_mpeg2.h | 2 +- libavcodec/cbs_mpeg2_syntax_template.c | 10 ++++----- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 8b8b266563..cdde68ea38 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -215,13 +215,16 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx, return err; \ } \ break; - START(0x00, MPEG2RawPictureHeader, picture_header, NULL); - START(0xb2, MPEG2RawUserData, user_data, - &cbs_mpeg2_free_user_data); - START(0xb3, MPEG2RawSequenceHeader, sequence_header, NULL); - START(0xb5, MPEG2RawExtensionData, extension_data, NULL); - START(0xb8, MPEG2RawGroupOfPicturesHeader, - group_of_pictures_header, NULL); + START(MPEG2_START_PICTURE, MPEG2RawPictureHeader, + picture_header, NULL); + START(MPEG2_START_USER_DATA, MPEG2RawUserData, + user_data, &cbs_mpeg2_free_user_data); + START(MPEG2_START_SEQUENCE_HEADER, MPEG2RawSequenceHeader, + sequence_header, NULL); + START(MPEG2_START_EXTENSION, MPEG2RawExtensionData, + extension_data, NULL); + START(MPEG2_START_GROUP, MPEG2RawGroupOfPicturesHeader, + group_of_pictures_header, NULL); #undef START default: av_log(ctx->log_ctx, AV_LOG_ERROR, "Unknown start code %02"PRIx32".\n", @@ -244,11 +247,12 @@ static int cbs_mpeg2_write_header(CodedBitstreamContext *ctx, case start_code: \ err = cbs_mpeg2_write_ ## func(ctx, pbc, unit->content); \ break; - START(0x00, MPEG2RawPictureHeader, picture_header); - START(0xb2, MPEG2RawUserData, user_data); - START(0xb3, MPEG2RawSequenceHeader, sequence_header); - START(0xb5, MPEG2RawExtensionData, extension_data); - START(0xb8, MPEG2RawGroupOfPicturesHeader, group_of_pictures_header); + START(MPEG2_START_PICTURE, MPEG2RawPictureHeader, picture_header); + START(MPEG2_START_USER_DATA, MPEG2RawUserData, user_data); + START(MPEG2_START_SEQUENCE_HEADER, MPEG2RawSequenceHeader, sequence_header); + START(MPEG2_START_EXTENSION, MPEG2RawExtensionData, extension_data); + START(MPEG2_START_GROUP, MPEG2RawGroupOfPicturesHeader, + group_of_pictures_header); #undef START default: av_log(ctx->log_ctx, AV_LOG_ERROR, "Write unimplemented for start " @@ -331,7 +335,7 @@ static int cbs_mpeg2_write_unit(CodedBitstreamContext *ctx, init_put_bits(&pbc, priv->write_buffer, priv->write_buffer_size); - if (unit->type >= 0x01 && unit->type <= 0xaf) + if (MPEG2_START_IS_SLICE(unit->type)) err = cbs_mpeg2_write_slice(ctx, unit, &pbc); else err = cbs_mpeg2_write_header(ctx, unit, &pbc); diff --git a/libavcodec/cbs_mpeg2.h b/libavcodec/cbs_mpeg2.h index 92caa99dc1..7565695acb 100644 --- a/libavcodec/cbs_mpeg2.h +++ b/libavcodec/cbs_mpeg2.h @@ -51,7 +51,7 @@ enum { MPEG2_EXTENSION_PICTURE_CODING = 0x8, MPEG2_EXTENSION_PICTURE_SPATIAL_SCALABLE = 0x9, MPEG2_EXTENSION_PICTURE_TEMPORAL_SCALABLE = 0xa, - MPEG2_EXTENSION_CAMAERA_PARAMETERS = 0xb, + MPEG2_EXTENSION_CAMERA_PARAMETERS = 0xb, MPEG2_EXTENSION_ITU_T = 0xc, }; diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index 88cf453b17..10aaea7734 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -303,19 +303,19 @@ static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw, ui(4, extension_start_code_identifier); switch (current->extension_start_code_identifier) { - case 1: + case MPEG2_EXTENSION_SEQUENCE: return FUNC(sequence_extension) (ctx, rw, ¤t->data.sequence); - case 2: + case MPEG2_EXTENSION_SEQUENCE_DISPLAY: return FUNC(sequence_display_extension) (ctx, rw, ¤t->data.sequence_display); - case 3: + case MPEG2_EXTENSION_QUANT_MATRIX: return FUNC(quant_matrix_extension) (ctx, rw, ¤t->data.quant_matrix); - case 7: + case MPEG2_EXTENSION_PICTURE_DISPLAY: return FUNC(picture_display_extension) (ctx, rw, ¤t->data.picture_display); - case 8: + case MPEG2_EXTENSION_PICTURE_CODING: return FUNC(picture_coding_extension) (ctx, rw, ¤t->data.picture_coding); default: