Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'

* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/Makefile
index 4cda4dc,e66ec51..8f63261
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -509,22 -418,17 +509,22 @@@ OBJS-$(CONFIG_SUNRAST_ENCODER)         
  OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o svq13.o h263data.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o  h263data.o  \
                                            h263.o ituh263enc.o
- OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o mpegutils.o
+ OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o mpegutils.o h264_parse.o
 -OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o
 +OBJS-$(CONFIG_TEXT_DECODER)            += textdec.o ass.o
 +OBJS-$(CONFIG_TEXT_ENCODER)            += srtenc.o ass_split.o
 +OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o takdsp.o
  OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
  OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
 +OBJS-$(CONFIG_TARGA_Y216_DECODER)      += targa_y216dec.o
  OBJS-$(CONFIG_TDSC_DECODER)            += tdsc.o
  OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
 -OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o
 -OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o
 +OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o tiff_data.o tiff_common.o
 +OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o tiff_data.o
  OBJS-$(CONFIG_TMV_DECODER)             += tmv.o cga_data.o
 +OBJS-$(CONFIG_TRUEHD_DECODER)          += mlpdec.o mlpdsp.o
  OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
  OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
 +OBJS-$(CONFIG_TRUEMOTION2RT_DECODER)   += truemotion2rt.o
  OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o
  OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o msrledec.o
  OBJS-$(CONFIG_TSCC2_DECODER)           += tscc2.o

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavcodec/h264.h
index e655995,e00ce88..302f09a
--- 1/libavcodec/h264.h
--- 2/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@@ -900,21 -808,8 +900,8 @@@ int ff_h264_decode_ref_pic_marking(H264
  
  int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice);
  
- /**
-  * Check if the top & left blocks are available if needed & change the
-  * dc mode so it only uses the available blocks.
-  */
- int ff_h264_check_intra4x4_pred_mode(const H264Context *h, H264SliceContext *sl);
- 
- /**
-  * Check if the top & left blocks are available if needed & change the
-  * dc mode so it only uses the available blocks.
-  */
- int ff_h264_check_intra_pred_mode(const H264Context *h, H264SliceContext *sl,
-                                   int mode, int is_chroma);
- 
  void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl);
 -int ff_h264_decode_extradata(H264Context *h);
 +int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size);
  int ff_h264_decode_init(AVCodecContext *avctx);
  void ff_h264_decode_init_vlc(void);
  

diff --cc libavcodec/h264_cabac.c
Simple merge

diff --cc libavcodec/h264_cavlc.c
Simple merge

diff --cc libavcodec/h264_parse.c
index ebd87b0,50b1118..e6cc28e
--- 1/libavcodec/h264_parse.c
--- 2/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@@ -94,3 -84,95 +94,95 @@@ int ff_h264_pred_weight_table(GetBitCon
      pwt->use_weight = pwt->use_weight || pwt->use_weight_chroma;
      return 0;
  }
 -                       "top block unavailable for requested intra4x4 mode %d\n",
+ 
+ /**
+  * Check if the top & left blocks are available if needed and
+  * change the dc mode so it only uses the available blocks.
+  */
+ int ff_h264_check_intra4x4_pred_mode(int8_t *pred_mode_cache, void *logctx,
+                                      int top_samples_available, int left_samples_available)
+ {
+     static const int8_t top[12] = {
+         -1, 0, LEFT_DC_PRED, -1, -1, -1, -1, -1, 0
+     };
+     static const int8_t left[12] = {
+         0, -1, TOP_DC_PRED, 0, -1, -1, -1, 0, -1, DC_128_PRED
+     };
+     int i;
+ 
+     if (!(top_samples_available & 0x8000)) {
+         for (i = 0; i < 4; i++) {
+             int status = top[pred_mode_cache[scan8[0] + i]];
+             if (status < 0) {
+                 av_log(logctx, AV_LOG_ERROR,
 -        if (mode < 0) {
 -            av_log(logctx, AV_LOG_ERROR,
 -                   "left block unavailable for requested intra mode\n");
 -            return AVERROR_INVALIDDATA;
 -        }
++                                         "top block unavailable for requested intra mode %d\n",
+                        status);
+                 return AVERROR_INVALIDDATA;
+             } else if (status) {
+                 pred_mode_cache[scan8[0] + i] = status;
+             }
+         }
+     }
+ 
+     if ((left_samples_available & 0x8888) != 0x8888) {
+         static const int mask[4] = { 0x8000, 0x2000, 0x80, 0x20 };
+         for (i = 0; i < 4; i++)
+             if (!(left_samples_available & mask[i])) {
+                 int status = left[pred_mode_cache[scan8[0] + 8 * i]];
+                 if (status < 0) {
+                     av_log(logctx, AV_LOG_ERROR,
+                            "left block unavailable for requested intra4x4 mode %d\n",
+                            status);
+                     return AVERROR_INVALIDDATA;
+                 } else if (status) {
+                     pred_mode_cache[scan8[0] + 8 * i] = status;
+                 }
+             }
+     }
+ 
+     return 0;
+ }
+ 
+ /**
+  * Check if the top & left blocks are available if needed and
+  * change the dc mode so it only uses the available blocks.
+  */
+ int ff_h264_check_intra_pred_mode(void *logctx, int top_samples_available,
+                                   int left_samples_available,
+                                   int mode, int is_chroma)
+ {
+     static const int8_t top[4]  = { LEFT_DC_PRED8x8, 1, -1, -1 };
+     static const int8_t left[5] = { TOP_DC_PRED8x8, -1,  2, -1, DC_128_PRED8x8 };
+ 
+     if (mode > 3U) {
+         av_log(logctx, AV_LOG_ERROR,
+                "out of range intra chroma pred mode\n");
+         return AVERROR_INVALIDDATA;
+     }
+ 
+     if (!(top_samples_available & 0x8000)) {
+         mode = top[mode];
+         if (mode < 0) {
+             av_log(logctx, AV_LOG_ERROR,
+                    "top block unavailable for requested intra mode\n");
+             return AVERROR_INVALIDDATA;
+         }
+     }
+ 
+     if ((left_samples_available & 0x8080) != 0x8080) {
+         mode = left[mode];
++        if (mode < 0) {
++            av_log(logctx, AV_LOG_ERROR,
++                   "left block unavailable for requested intra mode\n");
++            return AVERROR_INVALIDDATA;
++        }
+         if (is_chroma && (left_samples_available & 0x8080)) {
+             // mad cow disease mode, aka MBAFF + constrained_intra_pred
+             mode = ALZHEIMER_DC_L0T_PRED8x8 +
+                    (!(left_samples_available & 0x8000)) +
+                    2 * (mode == DC_128_PRED8x8);
+         }
+     }
+ 
+     return mode;
+ }

diff --cc libavcodec/h264_parse.h
Simple merge

diff --cc libavcodec/svq3.c
Simple merge