From patchwork Wed May 22 01:04:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13227 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 5E60E448570 for ; Wed, 22 May 2019 04:13:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40B9B68A86C; Wed, 22 May 2019 04:13:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F8FF68A67C for ; Wed, 22 May 2019 04:13:36 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 7so409943wmo.2 for ; Tue, 21 May 2019 18:13:36 -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=TQVIlljI7oZGFdbsDoAIYmu22kx15KCFpSJjZ8sAlxk=; b=pU2AUSEiYTLBqaHAeQS/E8/cXRmYctBEULeQoHr3x5ShR0Zme2S9E8wXh05UAZQZmn 4/TQCL0SDibNu1wcbJXtpSh8HkKM+SZKrB7FrXi8t+b13HD//PEL5BJ6XPoWvNwnDRzL I17imWDI/hchnXJ3dcbB7PiqoQOvLHJmYeDDvmnJaAFi/o9fnsWUccT/lB85IZKI+d6v xc+eeSY2F+HW9FWK9JhFGrIx6M/nGXnPj3P0nCCN4NK08xj+PujUdZVLoKGqXlJnaQ0W i4AqX0j6BhR8pmu5Ah8AYVXXKYaIflrEt08qwwuxuu4smdbNMcm3oEwLmfQDrXqkXUFZ 1l7g== 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=TQVIlljI7oZGFdbsDoAIYmu22kx15KCFpSJjZ8sAlxk=; b=kE1nTdWEpjTow0lgxiU8B3OvSS/rFhBX5gXAVyK792sNBeqwyO+kFX6XY6v3WY5mKQ b/sXzuym+s8KO2TBMoaiKxEbPCCeJrlOnDdkgZfwXWfrWXvUI7bK3oMMwtFMsjS6+Bdc 1WaxmAueAz1HgE8tU/1R9dq0UlcFpP+mFHyuv/J/diFGSbFWAc9MMQFAhh/Y3JRZ5tPZ mzMQ5IpnmrkwQZfnOLRiHMP3pwLSCwKxquNsBBRQBBnoM60E9i9lv3x4aNfip3KP4uqa auLiUjZknb/fXTJOrWJrRU/K5s5rySG5trCegQQsiJxT+rrf0Mg/IOMfyefPgDE4o59p G/4A== X-Gm-Message-State: APjAAAUt94lgiL2qlRp6VnfdwlVW+C7wSQajq+1zzxu9BtaHI1bKYGCr NazuyH2uL7II0I2i0k/mR5gsDPfL X-Google-Smtp-Source: APXvYqwrIw79CU1la1AzAYPupUHn25P2hz9F5vuKCYZh5ts6ApP8X+sq7/CGJcQhEON5bzJC1Tjv9w== X-Received: by 2002:a1c:1d4:: with SMTP id 203mr5705966wmb.76.1558487615766; Tue, 21 May 2019 18:13:35 -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.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 18:13:35 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 03:04:35 +0200 Message-Id: <20190522010441.44257-6-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 05/11] cbs_mpeg2: Correct error codes 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" Up until now, things that are merely unsupported by cbs_mpeg2 have been declared to be invalid input. This has been changed. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 4 +--- libavcodec/cbs_mpeg2_syntax_template.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index de0ad8a043..4f89435c9d 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -266,9 +266,7 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx, group_of_pictures_header, NULL); #undef START default: - av_log(ctx->log_ctx, AV_LOG_ERROR, "Unknown start code %02"PRIx32".\n", - unit->type); - return AVERROR_INVALIDDATA; + return AVERROR(ENOSYS); } } diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index e34fa9495f..aa2544bc8a 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -339,9 +339,9 @@ static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw, return FUNC(picture_coding_extension) (ctx, rw, ¤t->data.picture_coding); default: - av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid extension ID %d.\n", + av_log(ctx->log_ctx, AV_LOG_ERROR, "Extension ID %d not supported.\n", current->extension_start_code_identifier); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } }