From patchwork Mon Mar 11 10:32:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12288 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 A3E4E44481F for ; Mon, 11 Mar 2019 12:40:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DEF16883B1; Mon, 11 Mar 2019 12:40:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E68B6806DB for ; Mon, 11 Mar 2019 12:40:41 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id o7so4452750wrp.12 for ; Mon, 11 Mar 2019 03:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U+8TwGeS0HZ27DQkS1eV9MzSdaRuV/QZlQEP3lv0+/o=; b=s8Jj7LP4bue6FRQ2VevCOC26DqqMrA31dI+GaUb90b0qDr+06m7rNZhK5QUncdO0HL cOgAiRvnjPASpSZmhWJx6EePLUzX7Z2p2bQqQvt+7jyJMF7Q2BuUOC7eIgpl9eNABmgi hU0AQQhyHaEQByZYOce+cn+O5WhIbY3fHaPyPLap3zSTJO+3SJD9W8pu1EzXNhWheFsu HIIRtsubqibYTTr0+N8AVt9gTzyxXOaMzFMWEEqavzUErF6rXGzY+kBfGgmjjMFYQuvE cgq29V8ZFXh/ZuEu6kKzPvJHvyGph+TsTpHyo33jo66yGl4exxS485F4mAW13kzyasuW CC2Q== 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=U+8TwGeS0HZ27DQkS1eV9MzSdaRuV/QZlQEP3lv0+/o=; b=FSPDYt5h+Wxv1/n4xzLLwQrBJD/rKRN/qF0LArMr1SdQOMJRqjcywNBdPfvrZceYkl jqQ6VHeRt0FfsYXcAdH+uGQaMxd9Waj4BzG3RDYeDOYeWbgu2RxGbkEurr8VjbuJ31mP 10CkVz0e3xFSgPCGOvYi3S8YCQhIUMcz4GaNWFAfAPnQE65gMERAYd2GQb2RZlAAfJdu djk3C/Bb9XhOuXGpyByS7j/tmJDMm7Ww8iaxy1bYJWAHz3wM1+XZ46wHMAZgIyBhtSlI UKw70Tzvigr3jkK3QlgkqksqHOgjHhX8R7zTZt7GevdcybJU94qZ0l/lzU2TH0koDUeF plhQ== X-Gm-Message-State: APjAAAXVYw/5j25pSWJfy0lHRvfATjx+a2nqER7+2LPly5U6kpSFWSeA Fp2SP5gwZh7RdOrMRLq/Qzm0toiP X-Google-Smtp-Source: APXvYqzFQmL8BGix5qHnp74F2toR4J3HfXy92W9mOxPUHyziwzQ2lncwu6B2xLW9ARHv+bauwieH6A== X-Received: by 2002:adf:f548:: with SMTP id j8mr9069576wrp.321.1552300407910; Mon, 11 Mar 2019 03:33:27 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id 12sm39211451wme.25.2019.03.11.03.33.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 03:33:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2019 11:32:05 +0100 Message-Id: <20190311103205.1872-1-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190204185619.GY3501@michaelspb> References: <20190204185619.GY3501@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Fix nonsense warning 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" Since db772308941a2a338c7809f90d347219a6a93074 parsing of mpeg4-extradata lead to a "Failed to parse extradata" warning, because ff_mpeg4_decode_picture_header returns AVERROR_INVALIDDATA in case that no VOP was found. This patch adds a parameter to signify whether a header (where the absence of a VOP does not raise an error) or not is parsed. The first mode is of course used for parsing headers. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 4 ++-- libavcodec/mpeg4video.h | 2 +- libavcodec/mpeg4video_parser.c | 6 +++--- libavcodec/mpeg4videodec.c | 10 +++++++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 2cf01e3d98..8385ddfe2e 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -500,9 +500,9 @@ retry: GetBitContext gb; if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) - ff_mpeg4_decode_picture_header(avctx->priv_data, &gb); + ff_mpeg4_decode_picture_header(avctx->priv_data, &gb, 1); } - ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb); + ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb, 0); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { ret = ff_intel_h263_decode_picture_header(s); } else if (CONFIG_FLV_DECODER && s->h263_flv) { diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index dd0a59038d..1a5da31928 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -163,7 +163,7 @@ void ff_mpeg4_pred_ac(MpegEncContext *s, int16_t *block, int n, void ff_set_mpeg4_time(MpegEncContext *s); int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); -int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb); +int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, int header); void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); void ff_mpeg4_clean_buffers(MpegEncContext *s); void ff_mpeg4_stuffing(PutBitContext *pbc); diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index 9ebb09a63e..9ca0f14976 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -89,13 +89,13 @@ static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx, if (avctx->extradata_size && pc->first_picture) { init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8); - ret = ff_mpeg4_decode_picture_header(dec_ctx, gb); - if (ret < -1) + ret = ff_mpeg4_decode_picture_header(dec_ctx, gb, 1); + if (ret < 0) av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata\n"); } init_get_bits(gb, buf, 8 * buf_size); - ret = ff_mpeg4_decode_picture_header(dec_ctx, gb); + ret = ff_mpeg4_decode_picture_header(dec_ctx, gb, 0); if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { ret = ff_set_dimensions(avctx, s->width, s->height); diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index ecd028a87c..99b1e10620 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3203,11 +3203,13 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) /** * Decode MPEG-4 headers. - * @return <0 if no VOP found (or a damaged one) + * + * @param header If set the absence of a VOP is not treated as error; otherwise, it is treated as such. + * @return <0 if an error occured * FRAME_SKIPPED if a not coded VOP is found - * 0 if a VOP is found + * 0 else */ -int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) +int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, int header) { MpegEncContext *s = &ctx->m; unsigned startcode, v; @@ -3236,6 +3238,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) (ctx->divx_version >= 0 || ctx->xvid_build >= 0) || s->codec_tag == AV_RL32("QMP4")) { av_log(s->avctx, AV_LOG_VERBOSE, "frame skip %d\n", gb->size_in_bits); return FRAME_SKIPPED; // divx bug + } else if (header && get_bits_count(gb) == gb->size_in_bits) { + return 0; // ordinary return value for parsing of extradata } else return AVERROR_INVALIDDATA; // end of stream }