From patchwork Wed Dec 9 20:25:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 24461 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 A902244BD89 for ; Wed, 9 Dec 2020 22:26:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DEE168A6D6; Wed, 9 Dec 2020 22:26:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from o1.b.az.sendgrid.net (o1.b.az.sendgrid.net [208.117.55.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F14D68A4BE for ; Wed, 9 Dec 2020 22:25:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:to:cc:content-type: content-transfer-encoding; s=001; bh=0VCEFvYupHpWJlPzgKaAEu4N07VFBQ0G42U6cK1LBps=; b=p4QxO3zXZCOSCey8x4bWpiJlt+iiOkyd9xJJnCkKYWw2FLzjyS70AdqUlibiGFIwgG8r 5dRrPyGfLmXzWCNqPERnBA/Ypl64+TBj0pHKP1EZ7Gsc3bYa110YdN1+wFr/61c9VIiryq e+n9Ckhg/DS1fybXaSXdQArBs7lYzEKEM= Received: by filterdrecv-p3mdw1-6f5f88f6c4-zkpxs with SMTP id filterdrecv-p3mdw1-6f5f88f6c4-zkpxs-21-5FD132AD-79 2020-12-09 20:25:17.841485845 +0000 UTC m=+516171.762693105 Received: from bionic.localdomain (unknown) by ismtpd0005p1lon1.sendgrid.net (SG) with ESMTP id hjjVx-muTeSCzsfDX_pylA Wed, 09 Dec 2020 20:25:17.649 +0000 (UTC) From: Jonas Karlman Date: Wed, 09 Dec 2020 20:25:17 +0000 (UTC) Message-Id: <20201209202513.27449-5-jonas@kwiboo.se> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201209202513.27449-1-jonas@kwiboo.se> References: <20201209202513.27449-1-jonas@kwiboo.se> X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h9JCbJlthn2kq6Uv2ak/Io8WeXJXs2yuv0my41SxhSGxlYxkJ/FQYwDLLuQ65UGYtAsS3DyslzZifmrj12L8Oy8Fd5ft0nxqHftKo9uCt3/5QF0qzvTkF0xKQzqPEPILOwY9JE0Dm0Dk8YROCrZp/50PYSyUt6yI7DcBS2hku5wC To: ffmpeg-devel@ffmpeg.org X-Entity-ID: wSPGWgGSXUap++qShBI+ag== Subject: [FFmpeg-devel] [PATCH 4/5] h264dec: add ref_pic_marking and pic_order_cnt bit_size to slice context 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: Nicolas Dufresne , Jernej Skrabec , Boris Brezillon , Ezequiel Garcia , Jonas Karlman MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Boris Brezillon Signed-off-by: Boris Brezillon Signed-off-by: Jonas Karlman --- libavcodec/h264_slice.c | 6 +++++- libavcodec/h264dec.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8a3ce1a688..5ad1c347ed 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1742,7 +1742,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, unsigned int slice_type, tmp, i; int field_pic_flag, bottom_field_flag; int first_slice = sl == h->slice_ctx && !h->current_slice; - int picture_structure; + int picture_structure, pos; if (first_slice) av_assert0(!h->setup_finished); @@ -1826,6 +1826,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, if (nal->type == H264_NAL_IDR_SLICE) sl->idr_pic_id = get_ue_golomb_long(&sl->gb); + pos = sl->gb.index; if (sps->poc_type == 0) { sl->poc_lsb = get_bits(&sl->gb, sps->log2_max_poc_lsb); @@ -1839,6 +1840,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, if (pps->pic_order_present == 1 && picture_structure == PICT_FRAME) sl->delta_poc[1] = get_se_golomb(&sl->gb); } + sl->pic_order_cnt_bit_size = sl->gb.index - pos; sl->redundant_pic_count = 0; if (pps->redundant_pic_cnt_present) @@ -1876,12 +1878,14 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, return ret; } + pos = sl->gb.index; sl->explicit_ref_marking = 0; if (nal->ref_idc) { ret = ff_h264_decode_ref_pic_marking(sl, &sl->gb, nal, h->avctx); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; } + sl->ref_pic_marking_bit_size = sl->gb.index - pos; if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 2ca9965b41..ad5a20ff8e 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -328,6 +328,7 @@ typedef struct H264SliceContext { MMCO mmco[MAX_MMCO_COUNT]; int nb_mmco; int explicit_ref_marking; + int ref_pic_marking_bit_size; int frame_num; int poc_lsb; @@ -336,6 +337,7 @@ typedef struct H264SliceContext { int curr_pic_num; int max_pic_num; int idr_pic_id; + int pic_order_cnt_bit_size; } H264SliceContext; /**