From patchwork Tue May 16 12:13:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Shmakov X-Patchwork-Id: 3680 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp611493vsk; Tue, 16 May 2017 12:36:22 -0700 (PDT) X-Received: by 10.28.103.214 with SMTP id b205mr9080291wmc.125.1494963382667; Tue, 16 May 2017 12:36:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494963382; cv=none; d=google.com; s=arc-20160816; b=X2Tt+BBD44aWcZFR3+TMbJBvjGkvmArBmHLfpQAoa/bImPCcIeQ95itg74mgNPwLij GjjDZumPtYj5lT0olzeS8rhQrYMNbY7n/0BF4gHudwKuU1xMsmEqUvB4UVHnI01RuwP/ NBf9VaA54kdFS1jXu6+BjJY/yheek4Vu4Jw9DhDZI2gUPSyUJMj6oxPw8Rr/GRcQvYTM CR0s2/WgapyPTJMg3HnBqSHGkYStMUk7UgFYjIH+yhq3/w58x3SfBA9JXHavIUseg/Jl kdhPEp3RirffpVzKL2wVawZkHuG5oZEmL3Kaqcyhjeo3U0TMOxvdE14d4gs8W2DGp0p0 MwLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:thread-index:mime-version :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=HOt0lPYOqwPC6MYrtEhQQSrfvIGDUadPcQGwdU55RJw=; b=qq2OtZF6sG4FkMpoL2rfbx2pYVu0dU00PiYdmYusoQbzUJVBrApMx80RZLNVxwI8t6 ogCuYcUcg+YEr3nU3cLmguKQGSZNxRlsqDMyP8O2B1nbub4DRBWZvhzbJmT7VnRpf4ht G0BkFMHD8stbtJke0z69NtpxUxjbwjMSMsCnKLtNc5N9KVYCbPSzE+SHdt8XlDGPIMXD Qq1IkjHcnwDOrFFi3gxtvTCC23K9MfROscWkVgRNtRyo7hsPxjd2tPCgGJhNQw6KmRdg BXFbYT+n4hwW4W7uaA1KO9EPvZrmZiWB5lPT79hl65YsdNrdd14T2pDRXIWYBHxkzhTO BCCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zingaya.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 1si2736614wre.175.2017.05.16.12.36.21; Tue, 16 May 2017 12:36:22 -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; dkim=neutral (body hash did not verify) header.i=@zingaya.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 A95DB68975F; Tue, 16 May 2017 22:36:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f176.google.com (mail-qt0-f176.google.com [209.85.216.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 038C96883C0 for ; Tue, 16 May 2017 15:21:20 +0300 (EEST) Received: by mail-qt0-f176.google.com with SMTP id v27so105104407qtg.2 for ; Tue, 16 May 2017 05:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zingaya.com; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding:thread-index:content-language; bh=z9igqc0LJKrXkAthT5BUMtT9xmdvbFq+xe7kAK0QTso=; b=YItUKv1MtKBQvB1CI+F+MqO7FXdfuonPWNQzqZHGOFknWY85gHH4oZDaUoWxwwfzS6 DgJJATKOvfINt9CzDYnjtzX2SHahTiV3rFXOgXxExpFhDtDEt2Gsy1K5WhWkyag5P7dI jPLT8WF94yzXhpa5VavZC9tvOAFB3D127gx8A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding:thread-index:content-language; bh=z9igqc0LJKrXkAthT5BUMtT9xmdvbFq+xe7kAK0QTso=; b=tfqMIW96Ba4yHTQKYDioH7p6hNdhNiYSlMPtUglAC6pAcfUPRErIUYnHpaqCrmQqoV LsfH1C2j10O7J7Xcm2tfy81pQvxp/mG2necZu7Q7lEdGKy8XBtp+yVnKxWutatUZyE68 CnUhswRxWJG21PFrxhACEVrwF5Tq3WL5Lj5FraRAHVdtkAsAznS5ton6HOihZr3rBB1q I7YfZ1WQ3cVNKsDvokhrHesC8cB4aIuUjNTscbWcru9ayLp5GKT9XPrJ47Hy3u58+8n9 kCJnFYVdehlwSJnSNFUHLjQ579jbvQdBPSk1pxatHqjM5MsjESlrk+rJXQvtnWgCsENS 452A== X-Gm-Message-State: AODbwcAv3kf9201+NeLgYvaBUVcnj/pwEmYISPR66IzcTmNWCy8tkm4L moYag25Xw3GchrbfoIs= X-Received: by 10.46.33.212 with SMTP id h81mr3303200lji.62.1494936813624; Tue, 16 May 2017 05:13:33 -0700 (PDT) Received: from shmakov764 ([195.91.179.50]) by smtp.gmail.com with ESMTPSA id f26sm316379lji.23.2017.05.16.05.13.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 May 2017 05:13:32 -0700 (PDT) From: "Ivan Shmakov" To: Date: Tue, 16 May 2017 15:13:36 +0300 Message-ID: <000901d2ce3d$d8db8e00$8a92aa00$@zingaya.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdLOPawrrgSOWzXuSBefUMNavdaYQA== Content-Language: ru X-Mailman-Approved-At: Tue, 16 May 2017 22:36:17 +0300 Subject: [FFmpeg-devel] [PATCH] fix GetBitContext index when SPS bitstream_restriction_flag=1 but can't be parsed, because index is out of bit-stream size. Need return index value continue H.264 parsing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/h264_ps.c | 4 ++++ 1 file changed, 4 insertions(+) @@ -221,8 +222,10 @@ static inline int decode_vui_parameters(GetBitContext *gb, AVCodecContext *avctx sps->pic_struct_present_flag = get_bits1(gb); if (!get_bits_left(gb)) return 0; + sps->bitstream_restriction_flag = get_bits1(gb); if (sps->bitstream_restriction_flag) { + idx = gb->index; get_bits1(gb); /* motion_vectors_over_pic_boundaries_flag */ get_ue_golomb(gb); /* max_bytes_per_pic_denom */ get_ue_golomb(gb); /* max_bits_per_mb_denom */ @@ -234,6 +237,7 @@ static inline int decode_vui_parameters(GetBitContext *gb, AVCodecContext *avctx if (get_bits_left(gb) < 0) { sps->num_reorder_frames = 0; sps->bitstream_restriction_flag = 0; + gb->index = idx; } if (sps->num_reorder_frames > 16U diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 7858361..09e2290 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -136,6 +136,7 @@ static inline int decode_vui_parameters(GetBitContext *gb, AVCodecContext *avctx { int aspect_ratio_info_present_flag; unsigned int aspect_ratio_idc; + int idx; aspect_ratio_info_present_flag = get_bits1(gb);