From patchwork Sun Apr 21 14:04:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12857 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 6EC6544792A for ; Sun, 21 Apr 2019 17:12:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4EB1768A72B; Sun, 21 Apr 2019 17:12:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E54E689BEA for ; Sun, 21 Apr 2019 17:12:09 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id a184so11573561wma.2 for ; Sun, 21 Apr 2019 07:12:09 -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=JhjGrEnpJVyMV/7/HqDim7O9Ei2jUy01EKC+rJmtLHA=; b=OnvmdWkt1x88Jsxqn/MFG6Vd3q3fNfj9OXd7MAQZo6DmrYZK/K398U908oeG8vvIcH FKLbjnIOBTfeWJA+wFHpu9hDMPxLftBm3kMVOoGIOwbA/E9kVL94aVHX61j0lzBsGA6h UwStpwSw2TP+1VXB4Rx/qxiai3npY1yTQ7ByaK2jyZ7OEJlzlUpwhvH9LatG1c9IXTE4 WFJ97m4k+cD7EQc/sHFe43uIDF3/juI12jM3ntLkNGkemDyqHXxwX6rqIYSptF0XeMDY 5ZbXBly5WP4YUYXtSwTSNNJRgh20Ilxrwh8K6qK9OL7+2cUqCb38axhjMiBrzEvdxG6+ QT7g== 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=JhjGrEnpJVyMV/7/HqDim7O9Ei2jUy01EKC+rJmtLHA=; b=h8ADVpihPO0wzXizaLW41JYxFEw+EQwx2wP30kk3OJyEeZma53p6jbG+MFLCJr/4A4 u9wibH1z+Pnz2zRJk+yvkEl3ofJ+fJnWov5tj0QNbwx0LNZxa5nxg77YKINUG8rQZ390 I5ysxGO3Qx6eQ4j1AuBbUto5mHUKQQb/HngQSK5iSyZo6SDs4qE9+2NIGt/I79KUCIkC ROGRIfXMPDKwRTml/22ct5icXclx31B7+I/0MINxywrQNkmhih/P+ekYQfPUaEbHSCLj yWAr02RRBs9/gKJBZZoai5U9epbIHm9MZJov97cikZPf9qGN88Prs4Auz/YrStnqCkpw F8WA== X-Gm-Message-State: APjAAAUX/tiflyuHYkMcbd1i9XoNFBnMnEIya04xRCquqmhWFZ/UYx1p 1+3r8k1oMIyWXdJXJJFwJu1jR6zL X-Google-Smtp-Source: APXvYqwL5daEdBbnaOaK7PvB6+5en7KtEElEaEwy4Ja11KZf3fVGBNjnpn+0RrrfRMiMsiRONdoqiw== X-Received: by 2002:a1c:6309:: with SMTP id x9mr9635910wmb.101.1555855512263; Sun, 21 Apr 2019 07:05:12 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Apr 2019 07:05:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Apr 2019 16:04:01 +0200 Message-Id: <20190421140404.17418-2-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 | 24 +++++++++++------------- libavcodec/cbs_mpeg2.h | 2 +- libavcodec/cbs_mpeg2_syntax_template.c | 10 +++++----- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 8b8b266563..41f16bbabf 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -215,13 +215,11 @@ 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 +242,11 @@ 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 +329,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: