Merge commit '44d16df413878588659dd8901bba016b5a869fd1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 27 May 2016 12:28:21 +0000 (14:28 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 27 May 2016 12:28:21 +0000 (14:28 +0200)
* commit '44d16df413878588659dd8901bba016b5a869fd1':
  h264_parser: eliminate H264SliceContext usage

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/h264_parser.c

@@@ -134,40 -103,38 +134,40 @@@ static int h264_find_frame_end(H264Pars
  found:
      pc->state             = 7;
      pc->frame_start_found = 0;
 -    return i - (state & 5);
 +    if (h->is_avc)
 +        return next_avc;
 +    return i - (state & 5) - 5 * (state > 7);
  }
  
- static int scan_mmco_reset(AVCodecParserContext *s)
+ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb)
  {
+     H264PredWeightTable pwt;
+     int slice_type_nos = s->pict_type & 3;
      H264ParseContext *p = s->priv_data;
      H264Context      *h = &p->h;
-     H264SliceContext *sl = &h->slice_ctx[0];
      int list_count, ref_count[2];
  
-     sl->slice_type_nos = s->pict_type & 3;
  
      if (h->pps.redundant_pic_cnt_present)
-         get_ue_golomb(&sl->gb); // redundant_pic_count
+         get_ue_golomb(gb); // redundant_pic_count
  
-     if (sl->slice_type_nos == AV_PICTURE_TYPE_B)
-         get_bits1(&sl->gb); // direct_spatial_mv_pred
+     if (slice_type_nos == AV_PICTURE_TYPE_B)
+         get_bits1(gb); // direct_spatial_mv_pred
  
-     if (ff_h264_parse_ref_count(&list_count, ref_count, &sl->gb, &h->pps,
-                                 sl->slice_type_nos, h->picture_structure, h->avctx) < 0)
+     if (ff_h264_parse_ref_count(&list_count, ref_count, gb, &h->pps,
 -                                slice_type_nos, h->picture_structure) < 0)
++                                slice_type_nos, h->picture_structure, h->avctx) < 0)
          return AVERROR_INVALIDDATA;
  
-     if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
+     if (slice_type_nos != AV_PICTURE_TYPE_I) {
          int list;
          for (list = 0; list < list_count; list++) {
-             if (get_bits1(&sl->gb)) {
+             if (get_bits1(gb)) {
                  int index;
                  for (index = 0; ; index++) {
-                     unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(&sl->gb);
+                     unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(gb);
  
                      if (reordering_of_pic_nums_idc < 3)
-                         get_ue_golomb_long(&sl->gb);
 -                        get_ue_golomb(gb);
++                        get_ue_golomb_long(gb);
                      else if (reordering_of_pic_nums_idc > 3) {
                          av_log(h->avctx, AV_LOG_ERROR,
                                 "illegal reordering_of_pic_nums_idc %d\n",
                  return 1;
  
              if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG)
-                 get_ue_golomb_long(&sl->gb); // difference_of_pic_nums_minus1
 -                get_ue_golomb(gb);
++                get_ue_golomb_long(gb); // difference_of_pic_nums_minus1
              if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED ||
                  opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG)
-                 get_ue_golomb_31(&sl->gb);
+                 get_ue_golomb_31(gb);
          }
      }
  
@@@ -231,9 -198,10 +231,8 @@@ static inline int parse_nal_units(AVCod
  {
      H264ParseContext *p = s->priv_data;
      H264Context      *h = &p->h;
-     H264SliceContext *sl = &h->slice_ctx[0];
 -    const uint8_t *buf_end = buf + buf_size;
 -
      H2645NAL nal = { NULL };
 -
 +    int buf_index, next_avc;
      unsigned int pps_id;
      unsigned int slice_type;
      int state = -1, got_reset = 0;
              h->prev_poc_lsb          = 0;
          /* fall through */
          case NAL_SLICE:
-             sl->gb = nal.gb;
-             get_ue_golomb_long(&sl->gb);  // skip first_mb_in_slice
-             slice_type   = get_ue_golomb_31(&sl->gb);
 -            get_ue_golomb(&nal.gb);  // skip first_mb_in_slice
++            get_ue_golomb_long(&nal.gb);  // skip first_mb_in_slice
+             slice_type   = get_ue_golomb_31(&nal.gb);
              s->pict_type = ff_h264_golomb_to_pict_type[slice_type % 5];
              if (h->sei_recovery_frame_cnt >= 0) {
                  /* key frame, since recovery_frame_cnt is set */
                  goto fail;
              }
              h->sps       = *h->sps_buffers[h->pps.sps_id];
-             h->frame_num = get_bits(&sl->gb, h->sps.log2_max_frame_num);
+             h->frame_num = get_bits(&nal.gb, h->sps.log2_max_frame_num);
  
 +            if(h->sps.ref_frame_count <= 1 && h->pps.ref_count[0] <= 1 && s->pict_type == AV_PICTURE_TYPE_I)
 +                s->key_frame = 1;
 +
              s->coded_width  = 16 * h->sps.mb_width;
              s->coded_height = 16 * h->sps.mb_height;
              s->width        = s->coded_width  - (h->sps.crop_right + h->sps.crop_left);
              }
  
              if (h->nal_unit_type == NAL_IDR_SLICE)
-                 get_ue_golomb_long(&sl->gb); /* idr_pic_id */
 -                get_ue_golomb(&nal.gb); /* idr_pic_id */
++                get_ue_golomb_long(&nal.gb); /* idr_pic_id */
              if (h->sps.poc_type == 0) {
-                 h->poc_lsb = get_bits(&sl->gb, h->sps.log2_max_poc_lsb);
+                 h->poc_lsb = get_bits(&nal.gb, h->sps.log2_max_poc_lsb);
  
                  if (h->pps.pic_order_present == 1 &&
                      h->picture_structure == PICT_FRAME)