From patchwork Sun Apr 30 20:34:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3522 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1150545vsd; Sun, 30 Apr 2017 13:35:30 -0700 (PDT) X-Received: by 10.223.166.66 with SMTP id k60mr13545706wrc.139.1493584530698; Sun, 30 Apr 2017 13:35:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y43si13452533wrb.286.2017.04.30.13.35.30; Sun, 30 Apr 2017 13:35:30 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4907368995F; Sun, 30 Apr 2017 23:34:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E13168987D for ; Sun, 30 Apr 2017 23:34:44 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id c45so14699134qtb.0 for ; Sun, 30 Apr 2017 13:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=iZDHwuU+aLK2YJe+MBea37LJeH5d12qm8OVSI8ggwdI=; b=AqtaeeKRgIEX4LMf60oC1lkMMfm0HCFyE5aU6pCQuRo/KLRhYsFgZBluN4GPvhWQqG u6dMORx8NQ+fCAAVFQfRms/KCO2IQuDyP/O4ecB4IBG18fUYtMFFzbEqCzF3qndmwkLg rbcl8dxBuea1sR8APNsVQrjGSBRgeP/3rpWhLRyMJvDcnzUOm7F93WBvX/FOoW51aUsM 1jgvpNudMSHYo6Pba85GjVNBXhd63LH/ElXLA1S2+nOz0Fu9h24bG6sN2R3EuDpR9Md5 oGEHsNB/dfCKyv27HCemyTUoe9kaOSgHNmOmr1bQJnkRbTek++w7jKsxz2o+hqpB0cf3 QXBA== 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:in-reply-to :references; bh=iZDHwuU+aLK2YJe+MBea37LJeH5d12qm8OVSI8ggwdI=; b=UTZfNhEBlbdATk8LytX4vSRrv9M4MZkIxjo1dZ04p0SjampMax+yX7w/1K7ThWSlTh EL25XptLwjbMseqq6jB9FviiMJ326W7ULw0WFr+CJ8UXJdk//X56sZcPVSGcUDzClMav qX5qpa6ZM6qo3IoW7VmiCAkpyipda1El14QFrPIN99qEYePj2IRpntSU3rGvtOp2hb+I 45d+h1uxyfoxORauzCBym9l60kwEeB1zTx+bbAm1t09e3/xrmFJd2+CV80UElnlAOe7C 14Ky0gDE3hq4ID6pp1dypz0LymORktGkDBytlcst+BqlygM4Q0lPkntoUehOeo2kAxat eHOA== X-Gm-Message-State: AN3rC/5sL1cyG1J7Bkf5D7xs6IIxUFagjZTmodRgF6boD2e9bi7UZG+K KwAke/D4dq8lM69T X-Received: by 10.237.47.100 with SMTP id l91mr18783084qtd.258.1493584486297; Sun, 30 Apr 2017 13:34:46 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id 24sm9147592qtx.8.2017.04.30.13.34.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 30 Apr 2017 13:34:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2017 17:34:07 -0300 Message-Id: <20170430203410.7128-5-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170430203410.7128-1-jamrial@gmail.com> References: <20170430203410.7128-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/7] hevcdec: remove HEVCContext usage from ff_hevc_compute_poc() 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" Move it to hevc_ps as well. This is in preparation for a following patch. Signed-off-by: James Almer --- libavcodec/hevc_parser.c | 2 +- libavcodec/hevc_ps.c | 23 +++++++++++++++++++++++ libavcodec/hevc_ps.h | 5 +++++ libavcodec/hevc_refs.c | 23 ----------------------- libavcodec/hevcdec.c | 2 +- libavcodec/hevcdec.h | 5 ----- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index ac7a1ed78b..501cbc3498 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -350,7 +350,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, if (!IS_IDR(h)) { sh->pic_order_cnt_lsb = get_bits(gb, ps->sps->log2_max_poc_lsb); - s->output_picture_number = h->poc = ff_hevc_compute_poc(h, sh->pic_order_cnt_lsb); + s->output_picture_number = h->poc = ff_hevc_compute_poc(h->ps.sps, h->pocTid0, sh->pic_order_cnt_lsb, h->nal_unit_type); } else s->output_picture_number = h->poc = 0; diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 6d67dd9c69..b5a970e4f7 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1665,3 +1665,26 @@ err: av_buffer_unref(&pps_buf); return ret; } + +int ff_hevc_compute_poc(const HEVCSPS *sps, int pocTid0, int poc_lsb, int nal_unit_type) +{ + int max_poc_lsb = 1 << sps->log2_max_poc_lsb; + int prev_poc_lsb = pocTid0 % max_poc_lsb; + int prev_poc_msb = pocTid0 - prev_poc_lsb; + int poc_msb; + + if (poc_lsb < prev_poc_lsb && prev_poc_lsb - poc_lsb >= max_poc_lsb / 2) + poc_msb = prev_poc_msb + max_poc_lsb; + else if (poc_lsb > prev_poc_lsb && poc_lsb - prev_poc_lsb > max_poc_lsb / 2) + poc_msb = prev_poc_msb - max_poc_lsb; + else + poc_msb = prev_poc_msb; + + // For BLA picture types, POCmsb is set to 0. + if (nal_unit_type == HEVC_NAL_BLA_W_LP || + nal_unit_type == HEVC_NAL_BLA_W_RADL || + nal_unit_type == HEVC_NAL_BLA_N_LP) + poc_msb = 0; + + return poc_msb + poc_lsb; +} diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index b0a17bc8f0..45ef9daf1f 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -344,4 +344,9 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, int ff_hevc_encode_nal_vps(HEVCVPS *vps, unsigned int id, uint8_t *buf, int buf_size); +/** + * Compute POC of the current frame and return it. + */ +int ff_hevc_compute_poc(const HEVCSPS *sps, int pocTid0, int poc_lsb, int nal_unit_type); + #endif /* AVCODEC_HEVC_PS_H */ diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 6810ffaf17..fc1385ca55 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -516,29 +516,6 @@ fail: return ret; } -int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb) -{ - int max_poc_lsb = 1 << s->ps.sps->log2_max_poc_lsb; - int prev_poc_lsb = s->pocTid0 % max_poc_lsb; - int prev_poc_msb = s->pocTid0 - prev_poc_lsb; - int poc_msb; - - if (poc_lsb < prev_poc_lsb && prev_poc_lsb - poc_lsb >= max_poc_lsb / 2) - poc_msb = prev_poc_msb + max_poc_lsb; - else if (poc_lsb > prev_poc_lsb && poc_lsb - prev_poc_lsb > max_poc_lsb / 2) - poc_msb = prev_poc_msb - max_poc_lsb; - else - poc_msb = prev_poc_msb; - - // For BLA picture types, POCmsb is set to 0. - if (s->nal_unit_type == HEVC_NAL_BLA_W_LP || - s->nal_unit_type == HEVC_NAL_BLA_W_RADL || - s->nal_unit_type == HEVC_NAL_BLA_N_LP) - poc_msb = 0; - - return poc_msb + poc_lsb; -} - int ff_hevc_frame_nb_refs(HEVCContext *s) { int ret = 0; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 2a02edab28..8f235b0be1 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -541,7 +541,7 @@ static int hls_slice_header(HEVCContext *s) int poc, pos; sh->pic_order_cnt_lsb = get_bits(gb, s->ps.sps->log2_max_poc_lsb); - poc = ff_hevc_compute_poc(s, sh->pic_order_cnt_lsb); + poc = ff_hevc_compute_poc(s->ps.sps, s->pocTid0, sh->pic_order_cnt_lsb, s->nal_unit_type); if (!sh->first_slice_in_pic_flag && poc != s->poc) { av_log(s->avctx, AV_LOG_WARNING, "Ignoring POC change between slices: %d -> %d\n", s->poc, poc); diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index cc7fc7e35f..d8494ee6b1 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -579,11 +579,6 @@ void ff_hevc_clear_refs(HEVCContext *s); */ void ff_hevc_flush_dpb(HEVCContext *s); -/** - * Compute POC of the current frame and return it. - */ -int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb); - RefPicList *ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *frame, int x0, int y0);