avcodec/h264: Remove au_pps_id
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 29 Jun 2016 12:39:46 +0000 (14:39 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 29 Jun 2016 12:49:15 +0000 (14:49 +0200)
This should not be needed anymore and simplifies the next merge

Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c

index 935f2d0..8eb3b13 100644 (file)
@@ -950,9 +950,6 @@ again:
             h->has_recovery_point = 1;
         case NAL_SLICE:
             sl->gb = nal->gb;
-            if (   nals_needed >= i
-                || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count))
-                h->au_pps_id = -1;
 
             if ((err = ff_h264_decode_slice_header(h, sl)))
                 break;
index cb24e33..133f4b7 100644 (file)
@@ -515,9 +515,6 @@ typedef struct H264Context {
     uint32_t *mb2br_xy;
     int b_stride;       // FIXME use s->b4_stride
 
-
-    int au_pps_id; ///< pps_id of current access unit
-
     uint16_t *slice_table;      ///< slice_table_base + 2*mb_stride + 1
 
     // interlacing specific flags
index 16595e0..45c23c8 100644 (file)
@@ -1139,12 +1139,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
                pps_id);
         return AVERROR_INVALIDDATA;
     }
-    if (h->au_pps_id >= 0 && pps_id != h->au_pps_id) {
-        av_log(h->avctx, AV_LOG_ERROR,
-               "PPS change from %d to %d forbidden\n",
-               h->au_pps_id, pps_id);
-        return AVERROR_INVALIDDATA;
-    }
 
     pps = (const PPS*)h->ps.pps_list[pps_id]->data;
 
@@ -1780,8 +1774,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
                              (sl->ref_list[j][i].reference & 3);
     }
 
-    h->au_pps_id = pps_id;
-
     if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
         av_log(h->avctx, AV_LOG_DEBUG,
                "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",