[vlc-commits] packetizer: hevc: fix poc msb on IRAP

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 14 10:37:50 2017 +0100| [a1681fa8311c18b462da0ac8276d9385f448bce8] | committer: Francois Cartegnie

packetizer: hevc: fix poc msb on IRAP

(cherry picked from commit c2c45fcd482612d27af8e84738990c31aa4e5e39)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a1681fa8311c18b462da0ac8276d9385f448bce8
---

 modules/packetizer/hevc_nal.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index c49359643d..d6bf59f1db 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -1484,10 +1484,14 @@ int hevc_compute_picture_order_count( const hevc_sequence_parameter_set_t *p_sps
     /* Not an IRAP with NoRaslOutputFlag == 1 */
     if( !IsIRAP || !NoRaslOutputFlag )
     {
-        pocMSB = 0;
         p_ctx->prevPicOrderCnt.msb = p_ctx->prevTid0PicOrderCnt.msb;
         p_ctx->prevPicOrderCnt.lsb = p_ctx->prevTid0PicOrderCnt.lsb;
     }
+
+    if( IsIRAP && NoRaslOutputFlag )
+    {
+        pocMSB = 0;
+    }
     else
     {
         const unsigned maxPocLSB = 1U << (p_sps->log2_max_pic_order_cnt_lsb_minus4 + 4);