[vlc-commits] videotoolbox: handle nb_fields > 2

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Fri Mar  2 
14:34:06 2018 +0100| [c85099317702f2073e98680ef5cb39a18f305141] | committer: 
Thomas Guillem

videotoolbox: handle nb_fields > 2

This fixes a deadlock if a sample have more than 2 fields.

Refs #19897

(cherry picked from commit 3f78d1c38f7693c4b6eb6b70d9ffceaba356edc7)
Signed-off-by: Thomas Guillem 

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

 modules/codec/videotoolbox.m | 61 
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 9514156c89..c022282238 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -195,7 +195,7 @@ struct pic_holder
 uint8_t field_reorder_max;
 };
 
-static void pic_holder_update_reorder_max(struct pic_holder *, uint8_t);
+static void pic_holder_update_reorder_max(struct pic_holder *, uint8_t, 
uint8_t);
 
 #pragma mark - start & stop
 
@@ -300,18 +300,6 @@ static bool FillReorderInfoH264(decoder_t *p_dec, const 
block_t *p_block,
 GetxPSH264(slice.i_pic_parameter_set_id, p_sys, _sps, _pps);
 if(p_sps)
 {
-if(!p_sys->b_invalid_pic_reorder_max && i_nal_type == 
H264_NAL_SLICE_IDR)
-{
-unsigned dummy;
-uint8_t i_reorder;
-h264_get_dpb_values(p_sps, _reorder, );
-vlc_mutex_lock(_sys->lock);
-p_sys->i_pic_reorder_max = i_reorder;
-pic_holder_update_reorder_max(p_sys->pic_holder,
-  p_sys->i_pic_reorder_max);
-vlc_mutex_unlock(_sys->lock);
-}
-
 int bFOC;
 h264_compute_poc(p_sps, , _sys->h264_pocctx,
  _info->i_poc, _info->i_foc, );
@@ -344,6 +332,20 @@ static bool FillReorderInfoH264(decoder_t *p_dec, const 
block_t *p_block,
 date_Change( _sys->pts, p_sps->vui.i_time_scale,
   p_sps->vui.i_num_units_in_tick );
 }
+
+if(!p_sys->b_invalid_pic_reorder_max && i_nal_type == 
H264_NAL_SLICE_IDR)
+{
+unsigned dummy;
+uint8_t i_reorder;
+h264_get_dpb_values(p_sps, _reorder, );
+vlc_mutex_lock(_sys->lock);
+p_sys->i_pic_reorder_max = i_reorder;
+pic_holder_update_reorder_max(p_sys->pic_holder,
+  p_sys->i_pic_reorder_max,
+  p_info->i_num_ts);
+vlc_mutex_unlock(_sys->lock);
+}
+
 }
 
 return true; /* No need to parse further NAL */
@@ -657,15 +659,6 @@ static bool FillReorderInfoHEVC(decoder_t *p_dec, const 
block_t *p_block,
 sei.p_sps = p_sps;
 sei.p_timing = NULL;
 
-if(!p_sys->b_invalid_pic_reorder_max && p_vps)
-{
-vlc_mutex_lock(_sys->lock);
-p_sys->i_pic_reorder_max = hevc_get_max_num_reorder(p_vps);
-pic_holder_update_reorder_max(p_sys->pic_holder,
-  p_sys->i_pic_reorder_max);
-vlc_mutex_unlock(_sys->lock);
-}
-
 const int POC = hevc_compute_picture_order_count(p_sps, p_sli,
  
_sys->hevc_pocctx);
 
@@ -691,6 +684,17 @@ static bool FillReorderInfoHEVC(decoder_t *p_dec, const 
block_t *p_block,
 
 if(sei.p_timing)
 hevc_release_sei_pic_timing(sei.p_timing);
+
+if(!p_sys->b_invalid_pic_reorder_max && p_vps)
+{
+vlc_mutex_lock(_sys->lock);
+p_sys->i_pic_reorder_max = hevc_get_max_num_reorder(p_vps);
+pic_holder_update_reorder_max(p_sys->pic_holder,
+  p_sys->i_pic_reorder_max,
+  p_info->i_num_ts);
+vlc_mutex_unlock(_sys->lock);
+}
+
 }
 
 hevc_rbsp_release_slice_header(p_sli);
@@ -924,7 +928,7 @@ static void OnDecodedFrame(decoder_t *p_dec, frame_info_t 
*p_info)
 p_sys->b_invalid_pic_reorder_max = true;
 p_sys->i_pic_reorder_max++;
 pic_holder_update_reorder_max(p_sys->pic_holder,
-  p_sys->i_pic_reorder_max);
+  p_sys->i_pic_reorder_max, 
p_info->i_num_ts);
   

[vlc-commits] videotoolbox: handle nb_fields > 2

[Thomas Guillem]

vlc | branch: master | Thomas Guillem  | Fri Mar  2 14:34:06 
2018 +0100| [3f78d1c38f7693c4b6eb6b70d9ffceaba356edc7] | committer: Thomas 
Guillem

videotoolbox: handle nb_fields > 2

This fixes a deadlock if a sample have more than 2 fields.

Refs #19897

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

 modules/codec/videotoolbox.m | 61 
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index d8a2c2a16b..f3debee31b 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -195,7 +195,7 @@ struct pic_holder
 uint8_t field_reorder_max;
 };
 
-static void pic_holder_update_reorder_max(struct pic_holder *, uint8_t);
+static void pic_holder_update_reorder_max(struct pic_holder *, uint8_t, 
uint8_t);
 
 #pragma mark - start & stop
 
@@ -300,18 +300,6 @@ static bool FillReorderInfoH264(decoder_t *p_dec, const 
block_t *p_block,
 GetxPSH264(slice.i_pic_parameter_set_id, p_sys, _sps, _pps);
 if(p_sps)
 {
-if(!p_sys->b_invalid_pic_reorder_max && i_nal_type == 
H264_NAL_SLICE_IDR)
-{
-unsigned dummy;
-uint8_t i_reorder;
-h264_get_dpb_values(p_sps, _reorder, );
-vlc_mutex_lock(_sys->lock);
-p_sys->i_pic_reorder_max = i_reorder;
-pic_holder_update_reorder_max(p_sys->pic_holder,
-  p_sys->i_pic_reorder_max);
-vlc_mutex_unlock(_sys->lock);
-}
-
 int bFOC;
 h264_compute_poc(p_sps, , _sys->h264_pocctx,
  _info->i_poc, _info->i_foc, );
@@ -344,6 +332,20 @@ static bool FillReorderInfoH264(decoder_t *p_dec, const 
block_t *p_block,
 date_Change( _sys->pts, p_sps->vui.i_time_scale,
   p_sps->vui.i_num_units_in_tick );
 }
+
+if(!p_sys->b_invalid_pic_reorder_max && i_nal_type == 
H264_NAL_SLICE_IDR)
+{
+unsigned dummy;
+uint8_t i_reorder;
+h264_get_dpb_values(p_sps, _reorder, );
+vlc_mutex_lock(_sys->lock);
+p_sys->i_pic_reorder_max = i_reorder;
+pic_holder_update_reorder_max(p_sys->pic_holder,
+  p_sys->i_pic_reorder_max,
+  p_info->i_num_ts);
+vlc_mutex_unlock(_sys->lock);
+}
+
 }
 
 return true; /* No need to parse further NAL */
@@ -657,15 +659,6 @@ static bool FillReorderInfoHEVC(decoder_t *p_dec, const 
block_t *p_block,
 sei.p_sps = p_sps;
 sei.p_timing = NULL;
 
-if(!p_sys->b_invalid_pic_reorder_max && p_vps)
-{
-vlc_mutex_lock(_sys->lock);
-p_sys->i_pic_reorder_max = hevc_get_max_num_reorder(p_vps);
-pic_holder_update_reorder_max(p_sys->pic_holder,
-  p_sys->i_pic_reorder_max);
-vlc_mutex_unlock(_sys->lock);
-}
-
 const int POC = hevc_compute_picture_order_count(p_sps, p_sli,
  
_sys->hevc_pocctx);
 
@@ -691,6 +684,17 @@ static bool FillReorderInfoHEVC(decoder_t *p_dec, const 
block_t *p_block,
 
 if(sei.p_timing)
 hevc_release_sei_pic_timing(sei.p_timing);
+
+if(!p_sys->b_invalid_pic_reorder_max && p_vps)
+{
+vlc_mutex_lock(_sys->lock);
+p_sys->i_pic_reorder_max = hevc_get_max_num_reorder(p_vps);
+pic_holder_update_reorder_max(p_sys->pic_holder,
+  p_sys->i_pic_reorder_max,
+  p_info->i_num_ts);
+vlc_mutex_unlock(_sys->lock);
+}
+
 }
 
 hevc_rbsp_release_slice_header(p_sli);
@@ -924,7 +928,7 @@ static void OnDecodedFrame(decoder_t *p_dec, frame_info_t 
*p_info)
 p_sys->b_invalid_pic_reorder_max = true;
 p_sys->i_pic_reorder_max++;
 pic_holder_update_reorder_max(p_sys->pic_holder,
-  p_sys->i_pic_reorder_max);
+  p_sys->i_pic_reorder_max, 
p_info->i_num_ts);
 msg_Info(p_dec, "Raising max DPB to %"PRIu8, 
p_sys->i_pic_reorder_max);
 break;
 }
@@ -935,7