Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

[ffmpeg] / libavcodec / h264_ps.c

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 0bca9c1a808b2068518c2ca2cb845bdadbb09a26..e0f0946a7ea03d26fd40eb7e1289cb0e010dfc86 100644 (file)
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -29,6 +29,7 @@
 
 #include "libavutil/imgutils.h"
 #include "internal.h"
+#include "mathops.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h"
@@ -37,50 +38,6 @@
 #define MAX_LOG2_MAX_FRAME_NUM    (12 + 4)
 #define MIN_LOG2_MAX_FRAME_NUM    4
 
-#define QP(qP, depth) ((qP) + 6 * ((depth) - 8))
-
-#define CHROMA_QP_TABLE_END(d)                                          \
-    QP(0,  d), QP(1,  d), QP(2,  d), QP(3,  d), QP(4,  d), QP(5,  d),   \
-    QP(6,  d), QP(7,  d), QP(8,  d), QP(9,  d), QP(10, d), QP(11, d),   \
-    QP(12, d), QP(13, d), QP(14, d), QP(15, d), QP(16, d), QP(17, d),   \
-    QP(18, d), QP(19, d), QP(20, d), QP(21, d), QP(22, d), QP(23, d),   \
-    QP(24, d), QP(25, d), QP(26, d), QP(27, d), QP(28, d), QP(29, d),   \
-    QP(29, d), QP(30, d), QP(31, d), QP(32, d), QP(32, d), QP(33, d),   \
-    QP(34, d), QP(34, d), QP(35, d), QP(35, d), QP(36, d), QP(36, d),   \
-    QP(37, d), QP(37, d), QP(37, d), QP(38, d), QP(38, d), QP(38, d),   \
-    QP(39, d), QP(39, d), QP(39, d), QP(39, d)
-
-const uint8_t ff_h264_chroma_qp[7][QP_MAX_NUM + 1] = {
-    { CHROMA_QP_TABLE_END(8) },
-    { 0, 1, 2, 3, 4, 5,
-      CHROMA_QP_TABLE_END(9) },
-    { 0, 1, 2, 3,  4,  5,
-      6, 7, 8, 9, 10, 11,
-      CHROMA_QP_TABLE_END(10) },
-    { 0,  1, 2, 3,  4,  5,
-      6,  7, 8, 9, 10, 11,
-      12,13,14,15, 16, 17,
-      CHROMA_QP_TABLE_END(11) },
-    { 0,  1, 2, 3,  4,  5,
-      6,  7, 8, 9, 10, 11,
-      12,13,14,15, 16, 17,
-      18,19,20,21, 22, 23,
-      CHROMA_QP_TABLE_END(12) },
-    { 0,  1, 2, 3,  4,  5,
-      6,  7, 8, 9, 10, 11,
-      12,13,14,15, 16, 17,
-      18,19,20,21, 22, 23,
-      24,25,26,27, 28, 29,
-      CHROMA_QP_TABLE_END(13) },
-    { 0,  1, 2, 3,  4,  5,
-      6,  7, 8, 9, 10, 11,
-      12,13,14,15, 16, 17,
-      18,19,20,21, 22, 23,
-      24,25,26,27, 28, 29,
-      30,31,32,33, 34, 35,
-      CHROMA_QP_TABLE_END(14) },
-};
-
 static const uint8_t default_scaling4[2][16] = {
     {  6, 13, 20, 28, 13, 20, 28, 32,
       20, 28, 32, 37, 28, 32, 37, 42 },
@@ -272,7 +229,7 @@ static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
                                 const uint8_t *fallback_list)
 {
     int i, last = 8, next = 8;
-    const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct;
+    const uint8_t *scan = size == 16 ? ff_zigzag_scan : ff_zigzag_direct;
     if (!get_bits1(&h->gb)) /* matrix not written, we use the predicted one */
         memcpy(factors, fallback_list, size * sizeof(uint8_t));
     else