Mercurial > libavcodec.hg

comparison msmpeg4.c @ 9396:bb9f74aa37ee libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of INIT_VLC_USE_STATIC in msmpeg4
author michael
date Sat, 11 Apr 2009 13:29:05 +0000
parents 25b3650b4db5
children 6cb61c6220c3
comparison
equal deleted inserted replaced
9395:14e8350b27b4 9396:bb9f74aa37ee
1068 INIT_VLC_RL(rl_table[1], 1104); 1068 INIT_VLC_RL(rl_table[1], 1104);
1069 INIT_VLC_RL(rl_table[2], 554); 1069 INIT_VLC_RL(rl_table[2], 554);
1070 INIT_VLC_RL(rl_table[3], 940); 1070 INIT_VLC_RL(rl_table[3], 940);
1071 INIT_VLC_RL(rl_table[4], 962); 1071 INIT_VLC_RL(rl_table[4], 962);
1072 INIT_VLC_RL(rl_table[5], 554); 1072 INIT_VLC_RL(rl_table[5], 554);
1073 for(i=0;i<2;i++) { 1073
1074 mv = &mv_tables[i]; 1074 mv = &mv_tables[0];
1075 init_vlc(&mv->vlc, MV_VLC_BITS, mv->n + 1, 1075 INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,
1076 mv->table_mv_bits, 1, 1, 1076 mv->table_mv_bits, 1, 1,
1077 mv->table_mv_code, 2, 2, INIT_VLC_USE_STATIC); 1077 mv->table_mv_code, 2, 2, 3714);
1078 } 1078 mv = &mv_tables[1];
1079 1079 INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,
1080 init_vlc(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120, 1080 mv->table_mv_bits, 1, 1,
1081 mv->table_mv_code, 2, 2, 2694);
1082
1083 INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120,
1081 &ff_table0_dc_lum[0][1], 8, 4, 1084 &ff_table0_dc_lum[0][1], 8, 4,
1082 &ff_table0_dc_lum[0][0], 8, 4, INIT_VLC_USE_STATIC); 1085 &ff_table0_dc_lum[0][0], 8, 4, 1158);
1083 init_vlc(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120, 1086 INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120,
1084 &ff_table0_dc_chroma[0][1], 8, 4, 1087 &ff_table0_dc_chroma[0][1], 8, 4,
1085 &ff_table0_dc_chroma[0][0], 8, 4, INIT_VLC_USE_STATIC); 1088 &ff_table0_dc_chroma[0][0], 8, 4, 1118);
1086 init_vlc(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120, 1089 INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120,
1087 &ff_table1_dc_lum[0][1], 8, 4, 1090 &ff_table1_dc_lum[0][1], 8, 4,
1088 &ff_table1_dc_lum[0][0], 8, 4, INIT_VLC_USE_STATIC); 1091 &ff_table1_dc_lum[0][0], 8, 4, 1476);
1089 init_vlc(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120, 1092 INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120,
1090 &ff_table1_dc_chroma[0][1], 8, 4, 1093 &ff_table1_dc_chroma[0][1], 8, 4,
1091 &ff_table1_dc_chroma[0][0], 8, 4, INIT_VLC_USE_STATIC); 1094 &ff_table1_dc_chroma[0][0], 8, 4, 1216);
1092 1095
1093 init_vlc(&v2_dc_lum_vlc, DC_VLC_BITS, 512, 1096 INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512,
1094 &v2_dc_lum_table[0][1], 8, 4, 1097 &v2_dc_lum_table[0][1], 8, 4,
1095 &v2_dc_lum_table[0][0], 8, 4, INIT_VLC_USE_STATIC); 1098 &v2_dc_lum_table[0][0], 8, 4, 1472);
1096 init_vlc(&v2_dc_chroma_vlc, DC_VLC_BITS, 512, 1099 INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512,
1097 &v2_dc_chroma_table[0][1], 8, 4, 1100 &v2_dc_chroma_table[0][1], 8, 4,
1098 &v2_dc_chroma_table[0][0], 8, 4, INIT_VLC_USE_STATIC); 1101 &v2_dc_chroma_table[0][0], 8, 4, 1506);
1099 1102
1100 init_vlc(&cbpy_vlc, CBPY_VLC_BITS, 16, 1103 INIT_VLC_STATIC(&cbpy_vlc, CBPY_VLC_BITS, 16,
1101 &cbpy_tab[0][1], 2, 1, 1104 &cbpy_tab[0][1], 2, 1,
1102 &cbpy_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); 1105 &cbpy_tab[0][0], 2, 1, 64);
1103 init_vlc(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4, 1106 INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
1104 &v2_intra_cbpc[0][1], 2, 1, 1107 &v2_intra_cbpc[0][1], 2, 1,
1105 &v2_intra_cbpc[0][0], 2, 1, INIT_VLC_USE_STATIC); 1108 &v2_intra_cbpc[0][0], 2, 1, 8);
1106 init_vlc(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8, 1109 INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8,
1107 &v2_mb_type[0][1], 2, 1, 1110 &v2_mb_type[0][1], 2, 1,
1108 &v2_mb_type[0][0], 2, 1, INIT_VLC_USE_STATIC); 1111 &v2_mb_type[0][0], 2, 1, 128);
1109 init_vlc(&v2_mv_vlc, V2_MV_VLC_BITS, 33, 1112 INIT_VLC_STATIC(&v2_mv_vlc, V2_MV_VLC_BITS, 33,
1110 &mvtab[0][1], 2, 1, 1113 &mvtab[0][1], 2, 1,
1111 &mvtab[0][0], 2, 1, INIT_VLC_USE_STATIC); 1114 &mvtab[0][0], 2, 1, 538);
1112 1115
1113 for(i=0; i<4; i++){ 1116 INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128,
1114 init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128, 1117 &wmv2_inter_table[0][0][1], 8, 4,
1115 &wmv2_inter_table[i][0][1], 8, 4, 1118 &wmv2_inter_table[0][0][0], 8, 4, 1636);
1116 &wmv2_inter_table[i][0][0], 8, 4, INIT_VLC_USE_STATIC); //FIXME name? 1119 INIT_VLC_STATIC(&ff_mb_non_intra_vlc[1], MB_NON_INTRA_VLC_BITS, 128,
1117 } 1120 &wmv2_inter_table[1][0][1], 8, 4,
1118 1121 &wmv2_inter_table[1][0][0], 8, 4, 2648);
1119 init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, 1122 INIT_VLC_STATIC(&ff_mb_non_intra_vlc[2], MB_NON_INTRA_VLC_BITS, 128,
1123 &wmv2_inter_table[2][0][1], 8, 4,
1124 &wmv2_inter_table[2][0][0], 8, 4, 1532);
1125 INIT_VLC_STATIC(&ff_mb_non_intra_vlc[3], MB_NON_INTRA_VLC_BITS, 128,
1126 &wmv2_inter_table[3][0][1], 8, 4,
1127 &wmv2_inter_table[3][0][0], 8, 4, 2488);
1128
1129 INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
1120 &ff_msmp4_mb_i_table[0][1], 4, 2, 1130 &ff_msmp4_mb_i_table[0][1], 4, 2,
1121 &ff_msmp4_mb_i_table[0][0], 4, 2, INIT_VLC_USE_STATIC); 1131 &ff_msmp4_mb_i_table[0][0], 4, 2, 536);
1122 1132
1123 init_vlc(&v1_intra_cbpc_vlc, V1_INTRA_CBPC_VLC_BITS, 8, 1133 INIT_VLC_STATIC(&v1_intra_cbpc_vlc, V1_INTRA_CBPC_VLC_BITS, 8,
1124 intra_MCBPC_bits, 1, 1, 1134 intra_MCBPC_bits, 1, 1,
1125 intra_MCBPC_code, 1, 1, INIT_VLC_USE_STATIC); 1135 intra_MCBPC_code, 1, 1, 64);
1126 init_vlc(&v1_inter_cbpc_vlc, V1_INTER_CBPC_VLC_BITS, 25, 1136 INIT_VLC_STATIC(&v1_inter_cbpc_vlc, V1_INTER_CBPC_VLC_BITS, 25,
1127 inter_MCBPC_bits, 1, 1, 1137 inter_MCBPC_bits, 1, 1,
1128 inter_MCBPC_code, 1, 1, INIT_VLC_USE_STATIC); 1138 inter_MCBPC_code, 1, 1, 104);
1129 1139
1130 init_vlc(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4, 1140 INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
1131 &table_inter_intra[0][1], 2, 1, 1141 &table_inter_intra[0][1], 2, 1,
1132 &table_inter_intra[0][0], 2, 1, INIT_VLC_USE_STATIC); 1142 &table_inter_intra[0][0], 2, 1, 8);
1133 } 1143 }
1134 1144
1135 switch(s->msmpeg4_version){ 1145 switch(s->msmpeg4_version){
1136 case 1: 1146 case 1:
1137 case 2: 1147 case 2: