From patchwork Sun Apr 29 19:19:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8691 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2812732jad; Sun, 29 Apr 2018 12:21:04 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpxfYVebyA22SO/QzUlC3+IlMYjZi79tZ1CUKe1MaGyDBQO5xEdpM/QIbrhN1CjcwrldC3a X-Received: by 2002:adf:ea8a:: with SMTP id s10-v6mr6615274wrm.223.1525029664594; Sun, 29 Apr 2018 12:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525029664; cv=none; d=google.com; s=arc-20160816; b=qK17KJjrpKXHH2fkpNOj8J1kP7pD97BqCxGmZREQnHJ+NGkV21HKMcMWRF+OgvjPgD cr82hVXckKbY9aYRPB8B2A9o/Qg1WgFG7Bgg0FfUgygyMVmhSUlmT6nLC9AhZCqs+y1n wfg9vRLbFS2db0U9at1OIIEK+3PZErOjf/1/0+c/hw/1UM/k6XUP+I0avvKEaoQj4T+/ toxqTZnwPdMutokrdBPQoZBFFMgqry4fZWEWb2tmg0YbNxwal70UgM/Ckja/9t0Ywq/t z4oFKooddUso5g4Rcja8IWXNUc1VRtQOKSF3SwnG7IDe/M8lhdhEtHTmybxq/3uU8zen 73hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=7L9JffeDryrIRZD6ZqD94ILihk+n1mMqQXxPk1n5Xbc=; b=aBYatDP4RGhaghTuXIypj3gqcQMU+weSXA0IQbWgq5KBXV5TL5UtnkSxYpMHdcj1J4 z6ZhaGMInf3KeRYK2A5hHRrdyfGnO6cjWvDVs8+5BZhUcbUrMwV3yQC91l/T1b56hSE+ 7XwyWfSE3+6GB9npnWIbf+uT3CXRwdeXpabjK6gn0D0JhYWPnLwIO4aFwBT/Z2hQTkTw a35drCWJR0PFz3PTjgL3ddCQMq86L9TpAbdT/XEK1+gc+SVhgUchc4ahlmjEcG7xmq7O A3KX2gJmVXaL/Nsf/gXqRC+ZOm+siAKNETC09ZDLsq9ZKKZo/XnRoJm+UuXI35wcpIrL J5Cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l9-v6si4544317wrf.176.2018.04.29.12.21.04; Sun, 29 Apr 2018 12:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E1F268A69A; Sun, 29 Apr 2018 22:20:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 748C068A687 for ; Sun, 29 Apr 2018 22:20:06 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fCrsD-0004rs-PW for ffmpeg-devel@ffmpeg.org; Sun, 29 Apr 2018 21:20:37 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id gKLU1x01J0S5wYM01KLV3r; Sun, 29 Apr 2018 21:20:29 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 29 Apr 2018 21:19:15 +0200 Message-Id: <20180429191918.2915-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180429191918.2915-1-michael@niedermayer.cc> References: <20180429191918.2915-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/mpeg4videodec: Split decode_studio_vol_header() out of decode_studiovisualobject() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 27602e8542..9ee2f37c69 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2983,18 +2983,26 @@ static int decode_studio_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) static int decode_studiovisualobject(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; - int visual_object_type, width, height; + int visual_object_type; skip_bits(gb, 4); /* visual_object_verid */ visual_object_type = get_bits(gb, 4); + if (visual_object_type != VOT_VIDEO_ID) { + avpriv_request_sample(s->avctx, "VO type %u", visual_object_type); + return AVERROR_PATCHWELCOME; + } next_start_code_studio(gb); extension_and_user_data(s, gb, 1); - if (visual_object_type == VOT_VIDEO_ID) { - /* StudioVideoObjectLayer */ - skip_bits_long(gb, 32); /* video_object_start_code */ - skip_bits_long(gb, 32); /* video_object_layer_start_code */ + return 0; +} + +static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) +{ + MpegEncContext *s = &ctx->m; + int width, height; + skip_bits1(gb); /* random_accessible_vol */ skip_bits(gb, 8); /* video_object_type_indication */ skip_bits(gb, 4); /* video_object_layer_verid */ @@ -3063,7 +3071,6 @@ static int decode_studiovisualobject(Mpeg4DecContext *ctx, GetBitContext *gb) next_start_code_studio(gb); extension_and_user_data(s, gb, 2); - } return 0; } @@ -3173,8 +3180,14 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) continue; } vol++; - if ((ret = decode_vol_header(ctx, gb)) < 0) - return ret; + if (s->studio_profile) { + if ((ret = decode_studio_vol_header(ctx, gb)) < 0) + return ret; + break; + } else { + if ((ret = decode_vol_header(ctx, gb)) < 0) + return ret; + } } else if (startcode == USER_DATA_STARTCODE) { decode_user_data(ctx, gb); } else if (startcode == GOP_STARTCODE) { @@ -3191,7 +3204,6 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (s->studio_profile) { if ((ret = decode_studiovisualobject(ctx, gb)) < 0) return ret; - break; } else mpeg4_decode_visual_object(s, gb); } else if (startcode == VOP_STARTCODE) {