diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8f3e14dd5b..fbcf280dd0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -68,6 +68,93 @@ static const uint8_t div6[QP_MAX_NUM + 1] = { 14,14,14,14, }; +static const uint8_t field_scan[16+1] = { + 0 + 0 * 4, 0 + 1 * 4, 1 + 0 * 4, 0 + 2 * 4, + 0 + 3 * 4, 1 + 1 * 4, 1 + 2 * 4, 1 + 3 * 4, + 2 + 0 * 4, 2 + 1 * 4, 2 + 2 * 4, 2 + 3 * 4, + 3 + 0 * 4, 3 + 1 * 4, 3 + 2 * 4, 3 + 3 * 4, +}; + +static const uint8_t field_scan8x8[64+1] = { + 0 + 0 * 8, 0 + 1 * 8, 0 + 2 * 8, 1 + 0 * 8, + 1 + 1 * 8, 0 + 3 * 8, 0 + 4 * 8, 1 + 2 * 8, + 2 + 0 * 8, 1 + 3 * 8, 0 + 5 * 8, 0 + 6 * 8, + 0 + 7 * 8, 1 + 4 * 8, 2 + 1 * 8, 3 + 0 * 8, + 2 + 2 * 8, 1 + 5 * 8, 1 + 6 * 8, 1 + 7 * 8, + 2 + 3 * 8, 3 + 1 * 8, 4 + 0 * 8, 3 + 2 * 8, + 2 + 4 * 8, 2 + 5 * 8, 2 + 6 * 8, 2 + 7 * 8, + 3 + 3 * 8, 4 + 1 * 8, 5 + 0 * 8, 4 + 2 * 8, + 3 + 4 * 8, 3 + 5 * 8, 3 + 6 * 8, 3 + 7 * 8, + 4 + 3 * 8, 5 + 1 * 8, 6 + 0 * 8, 5 + 2 * 8, + 4 + 4 * 8, 4 + 5 * 8, 4 + 6 * 8, 4 + 7 * 8, + 5 + 3 * 8, 6 + 1 * 8, 6 + 2 * 8, 5 + 4 * 8, + 5 + 5 * 8, 5 + 6 * 8, 5 + 7 * 8, 6 + 3 * 8, + 7 + 0 * 8, 7 + 1 * 8, 6 + 4 * 8, 6 + 5 * 8, + 6 + 6 * 8, 6 + 7 * 8, 7 + 2 * 8, 7 + 3 * 8, + 7 + 4 * 8, 7 + 5 * 8, 7 + 6 * 8, 7 + 7 * 8, +}; + +static const uint8_t field_scan8x8_cavlc[64+1] = { + 0 + 0 * 8, 1 + 1 * 8, 2 + 0 * 8, 0 + 7 * 8, + 2 + 2 * 8, 2 + 3 * 8, 2 + 4 * 8, 3 + 3 * 8, + 3 + 4 * 8, 4 + 3 * 8, 4 + 4 * 8, 5 + 3 * 8, + 5 + 5 * 8, 7 + 0 * 8, 6 + 6 * 8, 7 + 4 * 8, + 0 + 1 * 8, 0 + 3 * 8, 1 + 3 * 8, 1 + 4 * 8, + 1 + 5 * 8, 3 + 1 * 8, 2 + 5 * 8, 4 + 1 * 8, + 3 + 5 * 8, 5 + 1 * 8, 4 + 5 * 8, 6 + 1 * 8, + 5 + 6 * 8, 7 + 1 * 8, 6 + 7 * 8, 7 + 5 * 8, + 0 + 2 * 8, 0 + 4 * 8, 0 + 5 * 8, 2 + 1 * 8, + 1 + 6 * 8, 4 + 0 * 8, 2 + 6 * 8, 5 + 0 * 8, + 3 + 6 * 8, 6 + 0 * 8, 4 + 6 * 8, 6 + 2 * 8, + 5 + 7 * 8, 6 + 4 * 8, 7 + 2 * 8, 7 + 6 * 8, + 1 + 0 * 8, 1 + 2 * 8, 0 + 6 * 8, 3 + 0 * 8, + 1 + 7 * 8, 3 + 2 * 8, 2 + 7 * 8, 4 + 2 * 8, + 3 + 7 * 8, 5 + 2 * 8, 4 + 7 * 8, 5 + 4 * 8, + 6 + 3 * 8, 6 + 5 * 8, 7 + 3 * 8, 7 + 7 * 8, +}; + +// zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)] +static const uint8_t zigzag_scan8x8_cavlc[64+1] = { + 0 + 0 * 8, 1 + 1 * 8, 1 + 2 * 8, 2 + 2 * 8, + 4 + 1 * 8, 0 + 5 * 8, 3 + 3 * 8, 7 + 0 * 8, + 3 + 4 * 8, 1 + 7 * 8, 5 + 3 * 8, 6 + 3 * 8, + 2 + 7 * 8, 6 + 4 * 8, 5 + 6 * 8, 7 + 5 * 8, + 1 + 0 * 8, 2 + 0 * 8, 0 + 3 * 8, 3 + 1 * 8, + 3 + 2 * 8, 0 + 6 * 8, 4 + 2 * 8, 6 + 1 * 8, + 2 + 5 * 8, 2 + 6 * 8, 6 + 2 * 8, 5 + 4 * 8, + 3 + 7 * 8, 7 + 3 * 8, 4 + 7 * 8, 7 + 6 * 8, + 0 + 1 * 8, 3 + 0 * 8, 0 + 4 * 8, 4 + 0 * 8, + 2 + 3 * 8, 1 + 5 * 8, 5 + 1 * 8, 5 + 2 * 8, + 1 + 6 * 8, 3 + 5 * 8, 7 + 1 * 8, 4 + 5 * 8, + 4 + 6 * 8, 7 + 4 * 8, 5 + 7 * 8, 6 + 7 * 8, + 0 + 2 * 8, 2 + 1 * 8, 1 + 3 * 8, 5 + 0 * 8, + 1 + 4 * 8, 2 + 4 * 8, 6 + 0 * 8, 4 + 3 * 8, + 0 + 7 * 8, 4 + 4 * 8, 7 + 2 * 8, 3 + 6 * 8, + 5 + 5 * 8, 6 + 5 * 8, 6 + 6 * 8, 7 + 7 * 8, +}; + +static const uint8_t dequant4_coeff_init[6][3] = { + { 10, 13, 16 }, + { 11, 14, 18 }, + { 13, 16, 20 }, + { 14, 18, 23 }, + { 16, 20, 25 }, + { 18, 23, 29 }, +}; + +static const uint8_t dequant8_coeff_init_scan[16] = { + 0, 3, 4, 3, 3, 1, 5, 1, 4, 5, 2, 5, 3, 1, 5, 1 +}; + +static const uint8_t dequant8_coeff_init[6][6] = { + { 20, 18, 32, 19, 25, 24 }, + { 22, 19, 35, 21, 28, 26 }, + { 26, 23, 42, 24, 33, 31 }, + { 28, 25, 45, 26, 35, 33 }, + { 32, 28, 51, 30, 40, 38 }, + { 36, 32, 58, 34, 46, 43 }, +}; + static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = { #if CONFIG_H264_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 2ad16de915..eb229f3f4d 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -59,20 +59,6 @@ static const uint8_t zigzag_scan[16+1] = { 3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4, }; -static const uint8_t field_scan[16+1] = { - 0 + 0 * 4, 0 + 1 * 4, 1 + 0 * 4, 0 + 2 * 4, - 0 + 3 * 4, 1 + 1 * 4, 1 + 2 * 4, 1 + 3 * 4, - 2 + 0 * 4, 2 + 1 * 4, 2 + 2 * 4, 2 + 3 * 4, - 3 + 0 * 4, 3 + 1 * 4, 3 + 2 * 4, 3 + 3 * 4, -}; - -static const uint8_t luma_dc_zigzag_scan[16] = { - 0 * 16 + 0 * 64, 1 * 16 + 0 * 64, 2 * 16 + 0 * 64, 0 * 16 + 2 * 64, - 3 * 16 + 0 * 64, 0 * 16 + 1 * 64, 1 * 16 + 1 * 64, 2 * 16 + 1 * 64, - 1 * 16 + 2 * 64, 2 * 16 + 2 * 64, 3 * 16 + 2 * 64, 0 * 16 + 3 * 64, - 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 2 * 16 + 3 * 64, 3 * 16 + 3 * 64, -}; - static const uint8_t chroma_dc_scan[4] = { (0 + 0 * 2) * 16, (1 + 0 * 2) * 16, (0 + 1 * 2) * 16, (1 + 1 * 2) * 16, @@ -85,64 +71,6 @@ static const uint8_t chroma422_dc_scan[8] = { (1 + 2 * 2) * 16, (1 + 3 * 2) * 16, }; -// zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)] -static const uint8_t zigzag_scan8x8_cavlc[64+1] = { - 0 + 0 * 8, 1 + 1 * 8, 1 + 2 * 8, 2 + 2 * 8, - 4 + 1 * 8, 0 + 5 * 8, 3 + 3 * 8, 7 + 0 * 8, - 3 + 4 * 8, 1 + 7 * 8, 5 + 3 * 8, 6 + 3 * 8, - 2 + 7 * 8, 6 + 4 * 8, 5 + 6 * 8, 7 + 5 * 8, - 1 + 0 * 8, 2 + 0 * 8, 0 + 3 * 8, 3 + 1 * 8, - 3 + 2 * 8, 0 + 6 * 8, 4 + 2 * 8, 6 + 1 * 8, - 2 + 5 * 8, 2 + 6 * 8, 6 + 2 * 8, 5 + 4 * 8, - 3 + 7 * 8, 7 + 3 * 8, 4 + 7 * 8, 7 + 6 * 8, - 0 + 1 * 8, 3 + 0 * 8, 0 + 4 * 8, 4 + 0 * 8, - 2 + 3 * 8, 1 + 5 * 8, 5 + 1 * 8, 5 + 2 * 8, - 1 + 6 * 8, 3 + 5 * 8, 7 + 1 * 8, 4 + 5 * 8, - 4 + 6 * 8, 7 + 4 * 8, 5 + 7 * 8, 6 + 7 * 8, - 0 + 2 * 8, 2 + 1 * 8, 1 + 3 * 8, 5 + 0 * 8, - 1 + 4 * 8, 2 + 4 * 8, 6 + 0 * 8, 4 + 3 * 8, - 0 + 7 * 8, 4 + 4 * 8, 7 + 2 * 8, 3 + 6 * 8, - 5 + 5 * 8, 6 + 5 * 8, 6 + 6 * 8, 7 + 7 * 8, -}; - -static const uint8_t field_scan8x8[64+1] = { - 0 + 0 * 8, 0 + 1 * 8, 0 + 2 * 8, 1 + 0 * 8, - 1 + 1 * 8, 0 + 3 * 8, 0 + 4 * 8, 1 + 2 * 8, - 2 + 0 * 8, 1 + 3 * 8, 0 + 5 * 8, 0 + 6 * 8, - 0 + 7 * 8, 1 + 4 * 8, 2 + 1 * 8, 3 + 0 * 8, - 2 + 2 * 8, 1 + 5 * 8, 1 + 6 * 8, 1 + 7 * 8, - 2 + 3 * 8, 3 + 1 * 8, 4 + 0 * 8, 3 + 2 * 8, - 2 + 4 * 8, 2 + 5 * 8, 2 + 6 * 8, 2 + 7 * 8, - 3 + 3 * 8, 4 + 1 * 8, 5 + 0 * 8, 4 + 2 * 8, - 3 + 4 * 8, 3 + 5 * 8, 3 + 6 * 8, 3 + 7 * 8, - 4 + 3 * 8, 5 + 1 * 8, 6 + 0 * 8, 5 + 2 * 8, - 4 + 4 * 8, 4 + 5 * 8, 4 + 6 * 8, 4 + 7 * 8, - 5 + 3 * 8, 6 + 1 * 8, 6 + 2 * 8, 5 + 4 * 8, - 5 + 5 * 8, 5 + 6 * 8, 5 + 7 * 8, 6 + 3 * 8, - 7 + 0 * 8, 7 + 1 * 8, 6 + 4 * 8, 6 + 5 * 8, - 6 + 6 * 8, 6 + 7 * 8, 7 + 2 * 8, 7 + 3 * 8, - 7 + 4 * 8, 7 + 5 * 8, 7 + 6 * 8, 7 + 7 * 8, -}; - -static const uint8_t field_scan8x8_cavlc[64+1] = { - 0 + 0 * 8, 1 + 1 * 8, 2 + 0 * 8, 0 + 7 * 8, - 2 + 2 * 8, 2 + 3 * 8, 2 + 4 * 8, 3 + 3 * 8, - 3 + 4 * 8, 4 + 3 * 8, 4 + 4 * 8, 5 + 3 * 8, - 5 + 5 * 8, 7 + 0 * 8, 6 + 6 * 8, 7 + 4 * 8, - 0 + 1 * 8, 0 + 3 * 8, 1 + 3 * 8, 1 + 4 * 8, - 1 + 5 * 8, 3 + 1 * 8, 2 + 5 * 8, 4 + 1 * 8, - 3 + 5 * 8, 5 + 1 * 8, 4 + 5 * 8, 6 + 1 * 8, - 5 + 6 * 8, 7 + 1 * 8, 6 + 7 * 8, 7 + 5 * 8, - 0 + 2 * 8, 0 + 4 * 8, 0 + 5 * 8, 2 + 1 * 8, - 1 + 6 * 8, 4 + 0 * 8, 2 + 6 * 8, 5 + 0 * 8, - 3 + 6 * 8, 6 + 0 * 8, 4 + 6 * 8, 6 + 2 * 8, - 5 + 7 * 8, 6 + 4 * 8, 7 + 2 * 8, 7 + 6 * 8, - 1 + 0 * 8, 1 + 2 * 8, 0 + 6 * 8, 3 + 0 * 8, - 1 + 7 * 8, 3 + 2 * 8, 2 + 7 * 8, 4 + 2 * 8, - 3 + 7 * 8, 5 + 2 * 8, 4 + 7 * 8, 5 + 4 * 8, - 6 + 3 * 8, 6 + 5 * 8, 7 + 3 * 8, 7 + 7 * 8, -}; - typedef struct IMbInfo { uint16_t type; uint8_t pred_mode; @@ -240,26 +168,4 @@ static const PMbInfo b_sub_mb_type_info[13] = { { MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 4, }, }; -static const uint8_t dequant4_coeff_init[6][3] = { - { 10, 13, 16 }, - { 11, 14, 18 }, - { 13, 16, 20 }, - { 14, 18, 23 }, - { 16, 20, 25 }, - { 18, 23, 29 }, -}; - -static const uint8_t dequant8_coeff_init_scan[16] = { - 0, 3, 4, 3, 3, 1, 5, 1, 4, 5, 2, 5, 3, 1, 5, 1 -}; - -static const uint8_t dequant8_coeff_init[6][6] = { - { 20, 18, 32, 19, 25, 24 }, - { 22, 19, 35, 21, 28, 26 }, - { 26, 23, 42, 24, 33, 31 }, - { 28, 25, 45, 26, 35, 33 }, - { 32, 28, 51, 30, 40, 38 }, - { 36, 32, 58, 34, 46, 43 }, -}; - #endif /* AVCODEC_H264DATA_H */ diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 717f89d4ca..cd21cae3fe 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -107,6 +107,13 @@ static const uint8_t svq3_scan[16] = { 0 + 3 * 4, 1 + 3 * 4, 2 + 3 * 4, 3 + 3 * 4, }; +static const uint8_t luma_dc_zigzag_scan[16] = { + 0 * 16 + 0 * 64, 1 * 16 + 0 * 64, 2 * 16 + 0 * 64, 0 * 16 + 2 * 64, + 3 * 16 + 0 * 64, 0 * 16 + 1 * 64, 1 * 16 + 1 * 64, 2 * 16 + 1 * 64, + 1 * 16 + 2 * 64, 2 * 16 + 2 * 64, 3 * 16 + 2 * 64, 0 * 16 + 3 * 64, + 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 2 * 16 + 3 * 64, 3 * 16 + 3 * 64, +}; + static const uint8_t svq3_pred_0[25][2] = { { 0, 0 }, { 1, 0 }, { 0, 1 },