comparison h264data.h @ 10868:13a84faba50d libavcodec

Move golomb_to_int*cbp tables back to h264_data.h as svq3.c used them. Yes i did compile&test, no svq3.c was not recompiled.
author michael
date Wed, 13 Jan 2010 02:17:16 +0000
parents d26e9b4d2ca1
children 7101061bfa0f
comparison
equal deleted inserted replaced
10867:bf309c7ce615 10868:13a84faba50d
35 #include "h264.h" 35 #include "h264.h"
36 36
37 37
38 static const uint8_t golomb_to_pict_type[5]= 38 static const uint8_t golomb_to_pict_type[5]=
39 {FF_P_TYPE, FF_B_TYPE, FF_I_TYPE, FF_SP_TYPE, FF_SI_TYPE}; 39 {FF_P_TYPE, FF_B_TYPE, FF_I_TYPE, FF_SP_TYPE, FF_SI_TYPE};
40
41 static const uint8_t golomb_to_intra4x4_cbp[48]={
42 47, 31, 15, 0, 23, 27, 29, 30, 7, 11, 13, 14, 39, 43, 45, 46,
43 16, 3, 5, 10, 12, 19, 21, 26, 28, 35, 37, 42, 44, 1, 2, 4,
44 8, 17, 18, 20, 24, 6, 9, 22, 25, 32, 33, 34, 36, 40, 38, 41
45 };
46
47 static const uint8_t golomb_to_inter_cbp[48]={
48 0, 16, 1, 2, 4, 8, 32, 3, 5, 10, 12, 15, 47, 7, 11, 13,
49 14, 6, 9, 31, 35, 37, 42, 44, 33, 34, 36, 40, 39, 43, 45, 46,
50 17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41
51 };
40 52
41 static const uint8_t zigzag_scan[16]={ 53 static const uint8_t zigzag_scan[16]={
42 0+0*4, 1+0*4, 0+1*4, 0+2*4, 54 0+0*4, 1+0*4, 0+1*4, 0+2*4,
43 1+1*4, 2+0*4, 3+0*4, 2+1*4, 55 1+1*4, 2+0*4, 3+0*4, 2+1*4,
44 1+2*4, 0+3*4, 1+3*4, 2+2*4, 56 1+2*4, 0+3*4, 1+3*4, 2+2*4,