diff options
author | James Almer <jamrial@gmail.com> | 2017-04-30 16:49:41 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-05-05 17:30:36 -0300 |
commit | 1d53b8e9073c93f75abb1fd2cde6ef6d21c2a22c (patch) | |
tree | ce440605e971ccf03dc1b709033b520b6ee6fe2f /libavcodec/hevc_refs.c | |
parent | a687fb997097ac1d1870b6de5160d45e5f57e871 (diff) | |
download | ffmpeg-1d53b8e9073c93f75abb1fd2cde6ef6d21c2a22c.tar.gz |
avcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()
Move it to hevc_ps as well. This is in preparation for a following patch.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_refs.c')
-rw-r--r-- | libavcodec/hevc_refs.c | 23 |
1 files changed, 0 insertions, 23 deletions
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; |