adpcm_ima_ws: fix stereo decoding

[ffmpeg] / libavcodec / h264pred.h

diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index b7fd2a2b7a188f37dd03ee576e8b4ba43d74bb89..b880446121775ed1328d44741a5b7c111a9901f2 100644 (file)
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -2,20 +2,20 @@
  * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
  * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -45,29 +45,45 @@
 #define VERT_LEFT_PRED        7
 #define HOR_UP_PRED           8
 
+// DC edge (not for VP8)
 #define LEFT_DC_PRED          9
 #define TOP_DC_PRED           10
 #define DC_128_PRED           11
 
-#define TM_VP8_PRED           9     ///< "True Motion", used instead of plane
-
+// RV40 specific
 #define DIAG_DOWN_LEFT_PRED_RV40_NODOWN   12
 #define HOR_UP_PRED_RV40_NODOWN           13
 #define VERT_LEFT_PRED_RV40_NODOWN        14
 
+// VP8 specific
+#define TM_VP8_PRED           9     ///< "True Motion", used instead of plane
+#define VERT_VP8_PRED         10    ///< for VP8, #VERT_PRED is the average of
+                                    ///< (left col+cur col x2+right col) / 4;
+                                    ///< this is the "unaveraged" one
+#define HOR_VP8_PRED          11    ///< unaveraged version of #HOR_PRED, see
+                                    ///< #VERT_VP8_PRED for details
+#define DC_127_PRED           12
+#define DC_129_PRED           13
+
 #define DC_PRED8x8            0
 #define HOR_PRED8x8           1
 #define VERT_PRED8x8          2
 #define PLANE_PRED8x8         3
 
+// DC edge
 #define LEFT_DC_PRED8x8       4
 #define TOP_DC_PRED8x8        5
 #define DC_128_PRED8x8        6
 
+// H264/SVQ3 (8x8) specific
 #define ALZHEIMER_DC_L0T_PRED8x8 7
 #define ALZHEIMER_DC_0LT_PRED8x8 8
 #define ALZHEIMER_DC_L00_PRED8x8 9
 #define ALZHEIMER_DC_0L0_PRED8x8 10
+
+// VP8 specific
+#define DC_127_PRED8x8        7
+#define DC_129_PRED8x8        8
 //@}
 
 /**
@@ -77,7 +93,7 @@ typedef struct H264PredContext{
     void (*pred4x4  [9+3+3])(uint8_t *src, const uint8_t *topright, int stride);//FIXME move to dsp?
     void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride);
     void (*pred8x8  [4+3+4])(uint8_t *src, int stride);
-    void (*pred16x16[4+3])(uint8_t *src, int stride);
+    void (*pred16x16[4+3+2])(uint8_t *src, int stride);
 
     void (*pred4x4_add  [2])(uint8_t *pix/*align  4*/, const DCTELEM *block/*align 16*/, int stride);
     void (*pred8x8l_add [2])(uint8_t *pix/*align  8*/, const DCTELEM *block/*align 16*/, int stride);
@@ -85,8 +101,8 @@ typedef struct H264PredContext{
     void (*pred16x16_add[3])(uint8_t *pix/*align 16*/, const int *block_offset, const DCTELEM *block/*align 16*/, int stride);
 }H264PredContext;
 
-void ff_h264_pred_init(H264PredContext *h, int codec_id);
-void ff_h264_pred_init_arm(H264PredContext *h, int codec_id);
-void ff_h264_pred_init_x86(H264PredContext *h, int codec_id);
+void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc);
+void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc);
+void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc);
 
 #endif /* AVCODEC_H264PRED_H */