Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'

* commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc':
  h264: pass a H2645NAL to slice header decoding

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/h264.c
index 8eb3b13e12a4b942ee606ce1b9c5855da899d995,b96b95a20e1452249109af764da6c32876b13eca..f79735bc18a825d051c94edb57cde7f8c1140018
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -951,28 -851,18 +951,28 @@@ again
          case NAL_SLICE:
              sl->gb = nal->gb;
  
-             if ((err = ff_h264_decode_slice_header(h, sl)))
+             if ((err = ff_h264_decode_slice_header(h, sl, nal)))
                  break;
  
 -            if (h->sei.recovery_point.recovery_frame_cnt >= 0 && h->recovery_frame < 0) {
 -                h->recovery_frame = (h->poc.frame_num + h->sei.recovery_point.recovery_frame_cnt) &
 -                                    ((1 << h->ps.sps->log2_max_frame_num) - 1);
 +            if (h->sei.recovery_point.recovery_frame_cnt >= 0) {
 +                const int sei_recovery_frame_cnt = h->sei.recovery_point.recovery_frame_cnt;
 +
 +                if (h->poc.frame_num != sei_recovery_frame_cnt || sl->slice_type_nos != AV_PICTURE_TYPE_I)
 +                    h->valid_recovery_point = 1;
 +
 +                if (   h->recovery_frame < 0
 +                    || av_mod_uintp2(h->recovery_frame - h->poc.frame_num, h->ps.sps->log2_max_frame_num) > sei_recovery_frame_cnt) {
 +                    h->recovery_frame = av_mod_uintp2(h->poc.frame_num + sei_recovery_frame_cnt, h->ps.sps->log2_max_frame_num);
 +
 +                    if (!h->valid_recovery_point)
 +                        h->recovery_frame = h->poc.frame_num;
 +                }
              }
  
 -            h->cur_pic_ptr->f->key_frame |=
 -                (nal->type == NAL_IDR_SLICE) || (h->sei.recovery_point.recovery_frame_cnt >= 0);
 +            h->cur_pic_ptr->f->key_frame |= (nal->type == NAL_IDR_SLICE);
  
 -            if (nal->type == NAL_IDR_SLICE || h->recovery_frame == h->poc.frame_num) {
 +            if (nal->type == NAL_IDR_SLICE ||
 +                (h->recovery_frame == h->poc.frame_num && nal->ref_idc)) {
                  h->recovery_frame         = -1;
                  h->cur_pic_ptr->recovered = 1;
              }

diff --cc libavcodec/h264.h
index ed8498aee4ba278a25d5acf5e9386bdc34439622,6cd2506e6f0479d4cfd2b1d3e0d1817936506268..1e3dfd512d9afac5fc58d93fcd76765190245de9
--- 1/libavcodec/h264.h
--- 2/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@@ -994,10 -929,8 +994,11 @@@ int ff_h264_slice_context_init(H264Cont
  
  void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height);
  
- int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl);
+ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
+                                 const H2645NAL *nal);
 +#define SLICE_SINGLETHREAD 1
 +#define SLICE_SKIPED 2
 +
  int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count);
  int ff_h264_update_thread_context(AVCodecContext *dst,
                                    const AVCodecContext *src);

diff --cc libavcodec/h264_slice.c
index 444d2819d75196b992eb9b2ae04aa199301ad252,17608b455acfcb69220ebc3274e8e0e6fe9bec5b..2562041be715db3f95e6fe8792a135dfd20e7443
--- 1/libavcodec/h264_slice.c
--- 2/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@@ -1127,9 -988,9 +1127,10 @@@ static int h264_init_ps(H264Context *h
   * slice in a field (or a frame). It decides whether we are decoding a new frame
   * or a second field in a pair and does the necessary setup.
   */
- static int h264_field_start(H264Context *h, const H264SliceContext *sl)
+ static int h264_field_start(H264Context *h, const H264SliceContext *sl,
+                             const H2645NAL *nal)
  {
 +    int i;
      const SPS *sps;
  
      int last_pic_structure, last_pic_droppable, ret;
@@@ -1470,10 -1245,8 +1472,10 @@@ static int h264_slice_header_parse(H264
          h->poc.frame_num = frame_num;
  
      sl->mb_mbaff       = 0;
 +    mb_aff_frame       = 0;
 +    last_mb_aff_frame  = h->mb_aff_frame;
  
-     droppable = h->nal_ref_idc == 0;
+     droppable = nal->ref_idc == 0;
      if (sps->frame_mbs_only_flag) {
          picture_structure = PICT_FRAME;
      } else {
@@@ -1522,8 -1288,8 +1524,8 @@@
          h->max_pic_num  = 1 << (sps->log2_max_frame_num + 1);
      }
  
-     if (h->nal_unit_type == NAL_IDR_SLICE)
+     if (nal->type == NAL_IDR_SLICE)
 -        get_ue_golomb(&sl->gb); /* idr_pic_id */
 +        get_ue_golomb_long(&sl->gb); /* idr_pic_id */
  
      if (sps->poc_type == 0) {
          int poc_lsb = get_bits(&sl->gb, sps->log2_max_poc_lsb);
@@@ -1581,10 -1347,10 +1583,10 @@@
          (pps->weighted_bipred_idc == 1 &&
           sl->slice_type_nos == AV_PICTURE_TYPE_B))
          ff_h264_pred_weight_table(&sl->gb, sps, sl->ref_count,
 -                                  sl->slice_type_nos, &sl->pwt);
 +                                  sl->slice_type_nos, &sl->pwt, h->avctx);
  
      sl->explicit_ref_marking = 0;
-     if (h->nal_ref_idc) {
+     if (nal->ref_idc) {
          ret = ff_h264_decode_ref_pic_marking(h, sl, &sl->gb);
          if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
              return AVERROR_INVALIDDATA;
@@@ -1659,8 -1426,8 +1662,8 @@@ int ff_h264_decode_slice_header(H264Con
  {
      int i, j, ret = 0;
  
-     ret = h264_slice_header_parse(h, sl);
+     ret = h264_slice_header_parse(h, sl, nal);
 -    if (ret < 0)
 +    if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ...
          return ret;
  
      if (h->current_slice == 0) {
@@@ -1716,10 -1481,10 +1719,10 @@@
          (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR  &&
           sl->slice_type_nos == AV_PICTURE_TYPE_B) ||
          (h->avctx->skip_loop_filter >= AVDISCARD_NONREF &&
-          h->nal_ref_idc == 0))
+          nal->ref_idc == 0))
          sl->deblocking_filter = 0;
  
 -    if (sl->deblocking_filter == 1 && h->nb_slice_ctx > 1) {
 +    if (sl->deblocking_filter == 1 && h->max_contexts > 1) {
          if (h->avctx->flags2 & AV_CODEC_FLAG2_FAST) {
              /* Cheat slightly for speed:
               * Do not bother to deblock across slices. */