Mercurial > libavcodec.hg
annotate msmpeg4.c @ 1651:ccf7c96a630f libavcodec
h263 modified quantization fix
| author | michael |
|---|---|
| date | Wed, 03 Dec 2003 16:07:41 +0000 |
| parents | 932d306bf1dc |
| children | 07a484280a82 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * MSMPEG4 backend for ffmpeg encoder and decoder | |
| 429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
| 0 | 4 * |
| 429 | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Lesser General Public | |
| 7 * License as published by the Free Software Foundation; either | |
| 8 * version 2 of the License, or (at your option) any later version. | |
| 0 | 9 * |
| 429 | 10 * This library is distributed in the hope that it will be useful, |
| 0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Lesser General Public License for more details. | |
| 0 | 14 * |
| 429 | 15 * You should have received a copy of the GNU Lesser General Public |
| 16 * License along with this library; if not, write to the Free Software | |
| 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
|
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
18 * |
| 457 | 19 * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> |
| 0 | 20 */ |
| 1106 | 21 |
| 22 /** | |
| 23 * @file msmpeg4.c | |
| 24 * MSMPEG4 backend for ffmpeg encoder and decoder. | |
| 25 */ | |
| 26 | |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
347
diff
changeset
|
27 #include "avcodec.h" |
| 0 | 28 #include "dsputil.h" |
| 29 #include "mpegvideo.h" | |
|
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
30 |
| 0 | 31 /* |
| 32 * You can also call this codec : MPEG4 with a twist ! | |
| 33 * | |
| 34 * TODO: | |
| 35 * - (encoding) select best mv table (two choices) | |
| 36 * - (encoding) select best vlc/dc table | |
| 37 */ | |
| 38 //#define DEBUG | |
| 39 | |
| 531 | 40 #define DC_VLC_BITS 9 |
| 41 #define CBPY_VLC_BITS 6 | |
| 42 #define INTER_INTRA_VLC_BITS 3 | |
| 43 #define V1_INTRA_CBPC_VLC_BITS 6 | |
| 44 #define V1_INTER_CBPC_VLC_BITS 6 | |
| 45 #define V2_INTRA_CBPC_VLC_BITS 3 | |
| 46 #define V2_MB_TYPE_VLC_BITS 7 | |
| 47 #define MV_VLC_BITS 9 | |
| 48 #define V2_MV_VLC_BITS 9 | |
| 49 #define TEX_VLC_BITS 9 | |
| 50 #define MB_NON_INTRA_VLC_BITS 9 | |
| 51 #define MB_INTRA_VLC_BITS 9 | |
| 52 | |
| 578 | 53 #define II_BITRATE 128*1024 |
| 54 #define MBAC_BITRATE 50*1024 | |
| 55 | |
| 936 | 56 #define DEFAULT_INTER_INDEX 3 |
| 57 | |
| 1064 | 58 static uint32_t v2_dc_lum_table[512][2]; |
| 59 static uint32_t v2_dc_chroma_table[512][2]; | |
| 307 | 60 |
| 499 | 61 static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n); |
| 62 static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, | |
| 936 | 63 int n, int coded, const uint8_t *scantable); |
| 0 | 64 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); |
| 65 static int msmpeg4_decode_motion(MpegEncContext * s, | |
| 66 int *mx_ptr, int *my_ptr); | |
| 310 | 67 static void msmpeg4v2_encode_motion(MpegEncContext * s, int val); |
| 468 | 68 static void init_h263_dc_for_msmpeg4(void); |
| 519 | 69 static inline void msmpeg4_memsetw(short *tab, int val, int n); |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
70 #ifdef CONFIG_ENCODERS |
| 601 | 71 static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra); |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
72 #endif //CONFIG_ENCODERS |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
73 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
74 static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); |
| 936 | 75 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); |
| 0 | 76 |
| 601 | 77 |
| 0 | 78 #ifdef DEBUG |
| 79 int intra_count = 0; | |
| 80 int frame_count = 0; | |
| 81 #endif | |
| 82 | |
| 83 #include "msmpeg4data.h" | |
| 84 | |
| 1325 | 85 #ifdef CONFIG_ENCODERS //strangely gcc includes this even if its not references |
| 1064 | 86 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2]; |
| 1325 | 87 #endif //CONFIG_ENCODERS |
| 601 | 88 |
| 0 | 89 #ifdef STATS |
| 90 | |
| 91 const char *st_names[ST_NB] = { | |
| 92 "unknown", | |
| 93 "dc", | |
| 94 "intra_ac", | |
| 95 "inter_ac", | |
| 96 "intra_mb", | |
| 97 "inter_mb", | |
| 98 "mv", | |
| 99 }; | |
| 100 | |
| 101 int st_current_index = 0; | |
| 102 unsigned int st_bit_counts[ST_NB]; | |
| 103 unsigned int st_out_bit_counts[ST_NB]; | |
| 104 | |
| 105 #define set_stat(var) st_current_index = var; | |
| 106 | |
| 107 void print_stats(void) | |
| 108 { | |
| 109 unsigned int total; | |
| 110 int i; | |
| 111 | |
| 112 printf("Input:\n"); | |
| 113 total = 0; | |
| 114 for(i=0;i<ST_NB;i++) | |
| 115 total += st_bit_counts[i]; | |
| 116 if (total == 0) | |
| 117 total = 1; | |
| 118 for(i=0;i<ST_NB;i++) { | |
| 119 printf("%-10s : %10.1f %5.1f%%\n", | |
| 120 st_names[i], | |
| 121 (double)st_bit_counts[i] / 8.0, | |
| 122 (double)st_bit_counts[i] * 100.0 / total); | |
| 123 } | |
| 124 printf("%-10s : %10.1f %5.1f%%\n", | |
| 125 "total", | |
| 126 (double)total / 8.0, | |
| 127 100.0); | |
| 128 | |
| 129 printf("Output:\n"); | |
| 130 total = 0; | |
| 131 for(i=0;i<ST_NB;i++) | |
| 132 total += st_out_bit_counts[i]; | |
| 133 if (total == 0) | |
| 134 total = 1; | |
| 135 for(i=0;i<ST_NB;i++) { | |
| 136 printf("%-10s : %10.1f %5.1f%%\n", | |
| 137 st_names[i], | |
| 138 (double)st_out_bit_counts[i] / 8.0, | |
| 139 (double)st_out_bit_counts[i] * 100.0 / total); | |
| 140 } | |
| 141 printf("%-10s : %10.1f %5.1f%%\n", | |
| 142 "total", | |
| 143 (double)total / 8.0, | |
| 144 100.0); | |
| 145 } | |
| 146 | |
| 147 #else | |
| 148 | |
| 149 #define set_stat(var) | |
| 150 | |
| 151 #endif | |
| 152 | |
| 499 | 153 static void common_init(MpegEncContext * s) |
| 154 { | |
| 155 static int inited=0; | |
| 156 | |
| 157 switch(s->msmpeg4_version){ | |
| 158 case 1: | |
| 159 case 2: | |
| 160 s->y_dc_scale_table= | |
| 161 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
| 162 break; | |
| 163 case 3: | |
| 164 if(s->workaround_bugs){ | |
| 165 s->y_dc_scale_table= old_ff_y_dc_scale_table; | |
| 166 s->c_dc_scale_table= old_ff_c_dc_scale_table; | |
| 167 } else{ | |
| 168 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; | |
| 169 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; | |
| 170 } | |
| 171 break; | |
| 172 case 4: | |
| 936 | 173 case 5: |
| 499 | 174 s->y_dc_scale_table= wmv1_y_dc_scale_table; |
| 175 s->c_dc_scale_table= wmv1_c_dc_scale_table; | |
| 176 break; | |
| 177 } | |
| 178 | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
179 |
| 936 | 180 if(s->msmpeg4_version>=4){ |
| 1273 | 181 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , wmv1_scantable[1]); |
| 182 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, wmv1_scantable[2]); | |
| 183 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, wmv1_scantable[3]); | |
| 184 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , wmv1_scantable[0]); | |
| 499 | 185 } |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
186 //Note the default tables are set in common_init in mpegvideo.c |
| 499 | 187 |
| 188 if(!inited){ | |
| 189 inited=1; | |
| 190 | |
| 191 init_h263_dc_for_msmpeg4(); | |
| 192 } | |
| 193 } | |
| 194 | |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
195 #ifdef CONFIG_ENCODERS |
|
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
196 |
| 0 | 197 /* build the table which associate a (x,y) motion vector to a vlc */ |
| 198 static void init_mv_table(MVTable *tab) | |
| 199 { | |
| 200 int i, x, y; | |
| 201 | |
| 1064 | 202 tab->table_mv_index = av_malloc(sizeof(uint16_t) * 4096); |
| 0 | 203 /* mark all entries as not used */ |
| 204 for(i=0;i<4096;i++) | |
| 205 tab->table_mv_index[i] = tab->n; | |
| 206 | |
| 207 for(i=0;i<tab->n;i++) { | |
| 208 x = tab->table_mvx[i]; | |
| 209 y = tab->table_mvy[i]; | |
| 210 tab->table_mv_index[(x << 6) | y] = i; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 static void code012(PutBitContext *pb, int n) | |
| 215 { | |
| 216 if (n == 0) { | |
| 217 put_bits(pb, 1, 0); | |
| 218 } else { | |
| 219 put_bits(pb, 1, 1); | |
| 220 put_bits(pb, 1, (n >= 2)); | |
| 221 } | |
| 222 } | |
| 223 | |
| 499 | 224 void ff_msmpeg4_encode_init(MpegEncContext *s) |
| 225 { | |
| 226 static int init_done=0; | |
| 227 int i; | |
| 228 | |
| 229 common_init(s); | |
| 230 if(s->msmpeg4_version>=4){ | |
| 231 s->min_qcoeff= -255; | |
| 232 s->max_qcoeff= 255; | |
| 233 } | |
| 234 | |
| 235 if (!init_done) { | |
| 236 /* init various encoding tables */ | |
| 237 init_done = 1; | |
| 238 init_mv_table(&mv_tables[0]); | |
| 239 init_mv_table(&mv_tables[1]); | |
| 240 for(i=0;i<NB_RL_TABLES;i++) | |
| 241 init_rl(&rl_table[i]); | |
| 601 | 242 |
| 243 for(i=0; i<NB_RL_TABLES; i++){ | |
| 244 int level; | |
| 245 for(level=0; level<=MAX_LEVEL; level++){ | |
| 246 int run; | |
| 247 for(run=0; run<=MAX_RUN; run++){ | |
| 248 int last; | |
| 249 for(last=0; last<2; last++){ | |
|
774
baa66649df35
mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents:
773
diff
changeset
|
250 rl_length[i][level][run][last]= get_size_of_code(s, &rl_table[ i], last, run, level, 0); |
| 601 | 251 } |
| 252 } | |
| 253 } | |
| 254 } | |
| 499 | 255 } |
| 256 } | |
| 257 | |
| 258 static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra){ | |
| 259 int size=0; | |
| 260 int code; | |
| 261 int run_diff= intra ? 0 : 1; | |
| 262 | |
| 263 code = get_rl_index(rl, last, run, level); | |
| 264 size+= rl->table_vlc[code][1]; | |
| 265 if (code == rl->n) { | |
| 266 int level1, run1; | |
| 267 | |
| 268 level1 = level - rl->max_level[last][run]; | |
| 269 if (level1 < 1) | |
| 270 goto esc2; | |
| 271 code = get_rl_index(rl, last, run, level1); | |
| 272 if (code == rl->n) { | |
| 273 esc2: | |
| 274 size++; | |
| 275 if (level > MAX_LEVEL) | |
| 276 goto esc3; | |
| 277 run1 = run - rl->max_run[last][level] - run_diff; | |
| 278 if (run1 < 0) | |
| 279 goto esc3; | |
| 280 code = get_rl_index(rl, last, run1, level); | |
| 281 if (code == rl->n) { | |
| 282 esc3: | |
| 283 /* third escape */ | |
| 284 size+=1+1+6+8; | |
| 285 } else { | |
| 286 /* second escape */ | |
| 287 size+= 1+1+ rl->table_vlc[code][1]; | |
| 288 } | |
| 289 } else { | |
| 290 /* first escape */ | |
| 291 size+= 1+1+ rl->table_vlc[code][1]; | |
| 292 } | |
| 293 } else { | |
| 294 size++; | |
| 295 } | |
| 296 return size; | |
| 297 } | |
| 298 | |
| 299 static void find_best_tables(MpegEncContext * s) | |
| 300 { | |
| 301 int i; | |
| 302 int best =-1, best_size =9999999; | |
| 303 int chroma_best=-1, best_chroma_size=9999999; | |
| 601 | 304 |
| 499 | 305 for(i=0; i<3; i++){ |
| 306 int level; | |
| 307 int chroma_size=0; | |
| 308 int size=0; | |
| 309 | |
| 310 if(i>0){// ;) | |
| 311 size++; | |
| 312 chroma_size++; | |
| 313 } | |
| 314 for(level=0; level<=MAX_LEVEL; level++){ | |
| 315 int run; | |
| 316 for(run=0; run<=MAX_RUN; run++){ | |
| 317 int last; | |
| 601 | 318 const int last_size= size + chroma_size; |
| 499 | 319 for(last=0; last<2; last++){ |
| 320 int inter_count = s->ac_stats[0][0][level][run][last] + s->ac_stats[0][1][level][run][last]; | |
| 321 int intra_luma_count = s->ac_stats[1][0][level][run][last]; | |
| 322 int intra_chroma_count= s->ac_stats[1][1][level][run][last]; | |
| 601 | 323 |
| 499 | 324 if(s->pict_type==I_TYPE){ |
|
774
baa66649df35
mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents:
773
diff
changeset
|
325 size += intra_luma_count *rl_length[i ][level][run][last]; |
|
baa66649df35
mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents:
773
diff
changeset
|
326 chroma_size+= intra_chroma_count*rl_length[i+3][level][run][last]; |
| 499 | 327 }else{ |
|
774
baa66649df35
mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents:
773
diff
changeset
|
328 size+= intra_luma_count *rl_length[i ][level][run][last] |
|
baa66649df35
mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents:
773
diff
changeset
|
329 +intra_chroma_count*rl_length[i+3][level][run][last] |
|
baa66649df35
mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents:
773
diff
changeset
|
330 +inter_count *rl_length[i+3][level][run][last]; |
| 499 | 331 } |
| 332 } | |
| 601 | 333 if(last_size == size+chroma_size) break; |
| 499 | 334 } |
| 335 } | |
| 336 if(size<best_size){ | |
| 337 best_size= size; | |
| 338 best= i; | |
| 339 } | |
| 340 if(chroma_size<best_chroma_size){ | |
| 341 best_chroma_size= chroma_size; | |
| 342 chroma_best= i; | |
| 343 } | |
| 344 } | |
| 601 | 345 |
| 499 | 346 // printf("type:%d, best:%d, qp:%d, var:%d, mcvar:%d, size:%d //\n", |
| 347 // s->pict_type, best, s->qscale, s->mb_var_sum, s->mc_mb_var_sum, best_size); | |
| 348 | |
| 349 if(s->pict_type==P_TYPE) chroma_best= best; | |
| 350 | |
| 351 memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2); | |
| 352 | |
| 353 s->rl_table_index = best; | |
| 354 s->rl_chroma_table_index= chroma_best; | |
| 355 | |
| 356 if(s->pict_type != s->last_non_b_pict_type){ | |
| 357 s->rl_table_index= 2; | |
| 358 if(s->pict_type==I_TYPE) | |
| 359 s->rl_chroma_table_index= 1; | |
| 360 else | |
| 361 s->rl_chroma_table_index= 2; | |
| 362 } | |
| 363 | |
| 364 } | |
| 365 | |
| 457 | 366 /* write MSMPEG4 compatible frame header */ |
| 0 | 367 void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) |
| 368 { | |
| 499 | 369 find_best_tables(s); |
| 0 | 370 |
| 371 align_put_bits(&s->pb); | |
| 372 put_bits(&s->pb, 2, s->pict_type - 1); | |
| 373 | |
| 374 put_bits(&s->pb, 5, s->qscale); | |
| 499 | 375 if(s->msmpeg4_version<=2){ |
| 376 s->rl_table_index = 2; | |
| 377 s->rl_chroma_table_index = 2; | |
| 378 } | |
| 310 | 379 |
| 0 | 380 s->dc_table_index = 1; |
| 381 s->mv_table_index = 1; /* only if P frame */ | |
| 382 s->use_skip_mb_code = 1; /* only if P frame */ | |
| 499 | 383 s->per_mb_rl_table = 0; |
| 759 | 384 if(s->msmpeg4_version==4) |
| 385 s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==P_TYPE); | |
| 936 | 386 //printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height); |
| 499 | 387 |
| 0 | 388 if (s->pict_type == I_TYPE) { |
| 519 | 389 s->slice_height= s->mb_height/1; |
| 390 put_bits(&s->pb, 5, 0x16 + s->mb_height/s->slice_height); | |
| 499 | 391 |
| 392 if(s->msmpeg4_version==4){ | |
| 393 msmpeg4_encode_ext_header(s); | |
| 578 | 394 if(s->bit_rate>MBAC_BITRATE) |
| 519 | 395 put_bits(&s->pb, 1, s->per_mb_rl_table); |
| 499 | 396 } |
| 0 | 397 |
| 457 | 398 if(s->msmpeg4_version>2){ |
| 499 | 399 if(!s->per_mb_rl_table){ |
| 400 code012(&s->pb, s->rl_chroma_table_index); | |
| 401 code012(&s->pb, s->rl_table_index); | |
| 402 } | |
| 0 | 403 |
| 310 | 404 put_bits(&s->pb, 1, s->dc_table_index); |
| 405 } | |
| 0 | 406 } else { |
| 407 put_bits(&s->pb, 1, s->use_skip_mb_code); | |
| 408 | |
| 578 | 409 if(s->msmpeg4_version==4 && s->bit_rate>MBAC_BITRATE) |
| 499 | 410 put_bits(&s->pb, 1, s->per_mb_rl_table); |
| 411 | |
| 457 | 412 if(s->msmpeg4_version>2){ |
| 499 | 413 if(!s->per_mb_rl_table) |
| 414 code012(&s->pb, s->rl_table_index); | |
| 0 | 415 |
| 310 | 416 put_bits(&s->pb, 1, s->dc_table_index); |
| 0 | 417 |
| 310 | 418 put_bits(&s->pb, 1, s->mv_table_index); |
| 419 } | |
| 0 | 420 } |
| 421 | |
| 499 | 422 s->esc3_level_length= 0; |
| 423 s->esc3_run_length= 0; | |
| 0 | 424 |
| 425 #ifdef DEBUG | |
| 426 intra_count = 0; | |
| 427 printf("*****frame %d:\n", frame_count++); | |
| 428 #endif | |
| 429 } | |
| 430 | |
| 208 | 431 void msmpeg4_encode_ext_header(MpegEncContext * s) |
| 432 { | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
433 put_bits(&s->pb, 5, s->avctx->frame_rate / s->avctx->frame_rate_base); //yes 29.97 -> 29 |
| 208 | 434 |
| 847 | 435 put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); |
| 208 | 436 |
| 1163 | 437 if(s->msmpeg4_version>=3) |
| 457 | 438 put_bits(&s->pb, 1, s->flipflop_rounding); |
| 1163 | 439 else |
| 440 assert(s->flipflop_rounding==0); | |
| 208 | 441 } |
| 442 | |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
443 #endif //CONFIG_ENCODERS |
|
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
444 |
| 0 | 445 /* predict coded block */ |
| 1064 | 446 static inline int coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr) |
| 0 | 447 { |
| 299 | 448 int xy, wrap, pred, a, b, c; |
| 0 | 449 |
| 299 | 450 xy = s->block_index[n]; |
| 451 wrap = s->block_wrap[0]; | |
| 0 | 452 |
| 453 /* B C | |
| 454 * A X | |
| 455 */ | |
| 299 | 456 a = s->coded_block[xy - 1 ]; |
| 457 b = s->coded_block[xy - 1 - wrap]; | |
| 458 c = s->coded_block[xy - wrap]; | |
| 0 | 459 |
| 460 if (b == c) { | |
| 461 pred = a; | |
| 462 } else { | |
| 463 pred = c; | |
| 464 } | |
| 465 | |
| 466 /* store value */ | |
| 299 | 467 *coded_block_ptr = &s->coded_block[xy]; |
| 0 | 468 |
| 469 return pred; | |
| 470 } | |
| 471 | |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
472 #ifdef CONFIG_ENCODERS |
|
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
473 |
| 0 | 474 static void msmpeg4_encode_motion(MpegEncContext * s, |
| 475 int mx, int my) | |
| 476 { | |
| 477 int code; | |
| 478 MVTable *mv; | |
| 479 | |
| 480 /* modulo encoding */ | |
| 481 /* WARNING : you cannot reach all the MVs even with the modulo | |
| 482 encoding. This is a somewhat strange compromise they took !!! */ | |
| 483 if (mx <= -64) | |
| 484 mx += 64; | |
| 485 else if (mx >= 64) | |
| 486 mx -= 64; | |
| 487 if (my <= -64) | |
| 488 my += 64; | |
| 489 else if (my >= 64) | |
| 490 my -= 64; | |
| 491 | |
| 492 mx += 32; | |
| 493 my += 32; | |
| 494 #if 0 | |
| 495 if ((unsigned)mx >= 64 || | |
| 496 (unsigned)my >= 64) | |
| 497 fprintf(stderr, "error mx=%d my=%d\n", mx, my); | |
| 498 #endif | |
| 499 mv = &mv_tables[s->mv_table_index]; | |
| 500 | |
| 501 code = mv->table_mv_index[(mx << 6) | my]; | |
| 502 set_stat(ST_MV); | |
| 503 put_bits(&s->pb, | |
| 504 mv->table_mv_bits[code], | |
| 505 mv->table_mv_code[code]); | |
| 506 if (code == mv->n) { | |
| 507 /* escape : code litterally */ | |
| 508 put_bits(&s->pb, 6, mx); | |
| 509 put_bits(&s->pb, 6, my); | |
| 510 } | |
| 511 } | |
| 512 | |
| 519 | 513 static inline void handle_slices(MpegEncContext *s){ |
| 514 if (s->mb_x == 0) { | |
| 515 if (s->slice_height && (s->mb_y % s->slice_height) == 0) { | |
| 983 | 516 if(s->msmpeg4_version < 4){ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
517 ff_mpeg4_clean_buffers(s); |
| 519 | 518 } |
| 519 s->first_slice_line = 1; | |
| 520 } else { | |
| 521 s->first_slice_line = 0; | |
| 522 } | |
| 523 } | |
| 524 } | |
| 525 | |
| 0 | 526 void msmpeg4_encode_mb(MpegEncContext * s, |
| 527 DCTELEM block[6][64], | |
| 528 int motion_x, int motion_y) | |
| 529 { | |
| 530 int cbp, coded_cbp, i; | |
| 531 int pred_x, pred_y; | |
| 1064 | 532 uint8_t *coded_block; |
| 0 | 533 |
| 519 | 534 handle_slices(s); |
| 535 | |
| 0 | 536 if (!s->mb_intra) { |
| 537 /* compute cbp */ | |
| 538 set_stat(ST_INTER_MB); | |
| 539 cbp = 0; | |
| 540 for (i = 0; i < 6; i++) { | |
| 541 if (s->block_last_index[i] >= 0) | |
| 542 cbp |= 1 << (5 - i); | |
| 543 } | |
| 544 if (s->use_skip_mb_code && (cbp | motion_x | motion_y) == 0) { | |
| 545 /* skip macroblock */ | |
| 546 put_bits(&s->pb, 1, 1); | |
| 1164 | 547 s->last_bits++; |
| 548 s->misc_bits++; | |
| 1216 | 549 s->skip_count++; |
| 1164 | 550 |
| 0 | 551 return; |
| 552 } | |
| 553 if (s->use_skip_mb_code) | |
| 554 put_bits(&s->pb, 1, 0); /* mb coded */ | |
| 555 | |
| 457 | 556 if(s->msmpeg4_version<=2){ |
| 310 | 557 put_bits(&s->pb, |
| 558 v2_mb_type[cbp&3][1], | |
| 559 v2_mb_type[cbp&3][0]); | |
| 560 if((cbp&3) != 3) coded_cbp= cbp ^ 0x3C; | |
| 561 else coded_cbp= cbp; | |
| 0 | 562 |
| 310 | 563 put_bits(&s->pb, |
| 564 cbpy_tab[coded_cbp>>2][1], | |
| 565 cbpy_tab[coded_cbp>>2][0]); | |
| 1164 | 566 |
| 567 s->misc_bits += get_bits_diff(s); | |
| 568 | |
| 310 | 569 h263_pred_motion(s, 0, &pred_x, &pred_y); |
| 570 msmpeg4v2_encode_motion(s, motion_x - pred_x); | |
| 571 msmpeg4v2_encode_motion(s, motion_y - pred_y); | |
| 572 }else{ | |
| 573 put_bits(&s->pb, | |
| 574 table_mb_non_intra[cbp + 64][1], | |
| 575 table_mb_non_intra[cbp + 64][0]); | |
| 576 | |
| 1164 | 577 s->misc_bits += get_bits_diff(s); |
| 578 | |
| 310 | 579 /* motion vector */ |
| 580 h263_pred_motion(s, 0, &pred_x, &pred_y); | |
| 581 msmpeg4_encode_motion(s, motion_x - pred_x, | |
| 582 motion_y - pred_y); | |
| 583 } | |
| 1164 | 584 |
| 585 s->mv_bits += get_bits_diff(s); | |
| 586 | |
| 587 for (i = 0; i < 6; i++) { | |
| 588 msmpeg4_encode_block(s, block[i], i); | |
| 589 } | |
| 590 s->p_tex_bits += get_bits_diff(s); | |
| 0 | 591 } else { |
| 592 /* compute cbp */ | |
| 593 cbp = 0; | |
| 594 coded_cbp = 0; | |
| 595 for (i = 0; i < 6; i++) { | |
| 596 int val, pred; | |
| 597 val = (s->block_last_index[i] >= 1); | |
| 598 cbp |= val << (5 - i); | |
| 599 if (i < 4) { | |
| 600 /* predict value for close blocks only for luma */ | |
| 601 pred = coded_block_pred(s, i, &coded_block); | |
| 602 *coded_block = val; | |
| 603 val = val ^ pred; | |
| 604 } | |
| 605 coded_cbp |= val << (5 - i); | |
| 606 } | |
| 607 #if 0 | |
| 608 if (coded_cbp) | |
| 609 printf("cbp=%x %x\n", cbp, coded_cbp); | |
| 610 #endif | |
| 611 | |
| 457 | 612 if(s->msmpeg4_version<=2){ |
| 310 | 613 if (s->pict_type == I_TYPE) { |
| 614 put_bits(&s->pb, | |
| 615 v2_intra_cbpc[cbp&3][1], v2_intra_cbpc[cbp&3][0]); | |
| 616 } else { | |
| 617 if (s->use_skip_mb_code) | |
| 618 put_bits(&s->pb, 1, 0); /* mb coded */ | |
| 619 put_bits(&s->pb, | |
| 620 v2_mb_type[(cbp&3) + 4][1], | |
| 621 v2_mb_type[(cbp&3) + 4][0]); | |
| 622 } | |
| 623 put_bits(&s->pb, 1, 0); /* no AC prediction yet */ | |
| 0 | 624 put_bits(&s->pb, |
| 310 | 625 cbpy_tab[cbp>>2][1], |
| 626 cbpy_tab[cbp>>2][0]); | |
| 627 }else{ | |
| 628 if (s->pict_type == I_TYPE) { | |
| 629 set_stat(ST_INTRA_MB); | |
| 630 put_bits(&s->pb, | |
| 631 table_mb_intra[coded_cbp][1], table_mb_intra[coded_cbp][0]); | |
| 632 } else { | |
| 633 if (s->use_skip_mb_code) | |
| 634 put_bits(&s->pb, 1, 0); /* mb coded */ | |
| 635 put_bits(&s->pb, | |
| 636 table_mb_non_intra[cbp][1], | |
| 637 table_mb_non_intra[cbp][0]); | |
| 638 } | |
| 639 set_stat(ST_INTRA_MB); | |
| 640 put_bits(&s->pb, 1, 0); /* no AC prediction yet */ | |
| 578 | 641 if(s->inter_intra_pred){ |
| 642 s->h263_aic_dir=0; | |
| 643 put_bits(&s->pb, table_inter_intra[s->h263_aic_dir][1], table_inter_intra[s->h263_aic_dir][0]); | |
| 644 } | |
| 0 | 645 } |
| 1164 | 646 s->misc_bits += get_bits_diff(s); |
| 0 | 647 |
| 1164 | 648 for (i = 0; i < 6; i++) { |
| 649 msmpeg4_encode_block(s, block[i], i); | |
| 650 } | |
| 651 s->i_tex_bits += get_bits_diff(s); | |
| 1216 | 652 s->i_count++; |
| 0 | 653 } |
| 654 } | |
| 655 | |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
656 #endif //CONFIG_ENCODERS |
|
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
657 |
|
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
658 /* old ffmpeg msmpeg4v3 mode */ |
| 1057 | 659 static void ff_old_msmpeg4_dc_scale(MpegEncContext * s) |
| 0 | 660 { |
|
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
661 if (s->qscale < 5){ |
|
195
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
662 s->y_dc_scale = 8; |
|
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
663 s->c_dc_scale = 8; |
|
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
664 }else if (s->qscale < 9){ |
|
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
665 s->y_dc_scale = 2 * s->qscale; |
|
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
666 s->c_dc_scale = (s->qscale + 13)>>1; |
|
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
667 }else{ |
|
195
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
668 s->y_dc_scale = s->qscale + 8; |
|
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
669 s->c_dc_scale = (s->qscale + 13)>>1; |
|
92f726205082
s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
186
diff
changeset
|
670 } |
| 0 | 671 } |
| 672 | |
| 499 | 673 static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n, |
| 1064 | 674 int32_t **dc_val_ptr) |
| 457 | 675 { |
| 676 int i; | |
| 677 | |
| 678 if (n < 4) { | |
| 679 i= 0; | |
| 680 } else { | |
| 681 i= n-3; | |
| 682 } | |
| 683 | |
| 684 *dc_val_ptr= &s->last_dc[i]; | |
| 685 return s->last_dc[i]; | |
| 686 } | |
| 687 | |
| 519 | 688 static int get_dc(uint8_t *src, int stride, int scale) |
| 689 { | |
| 690 int y; | |
| 691 int sum=0; | |
| 692 for(y=0; y<8; y++){ | |
| 693 int x; | |
| 694 for(x=0; x<8; x++){ | |
| 695 sum+=src[x + y*stride]; | |
| 696 } | |
| 697 } | |
|
1261
362947395f5c
fastdiv patch by (BERO <bero at geocities dot co dot jp>) with fixes & cleanup by me
michaelni
parents:
1255
diff
changeset
|
698 return FASTDIV((sum + (scale>>1)), scale); |
| 519 | 699 } |
| 700 | |
| 0 | 701 /* dir = 0: left, dir = 1: top prediction */ |
| 499 | 702 static inline int msmpeg4_pred_dc(MpegEncContext * s, int n, |
| 1064 | 703 uint16_t **dc_val_ptr, int *dir_ptr) |
| 0 | 704 { |
| 299 | 705 int a, b, c, wrap, pred, scale; |
| 1064 | 706 int16_t *dc_val; |
| 0 | 707 |
| 708 /* find prediction */ | |
| 709 if (n < 4) { | |
| 710 scale = s->y_dc_scale; | |
| 711 } else { | |
| 712 scale = s->c_dc_scale; | |
| 713 } | |
| 457 | 714 |
| 299 | 715 wrap = s->block_wrap[n]; |
| 716 dc_val= s->dc_val[0] + s->block_index[n]; | |
| 0 | 717 |
| 718 /* B C | |
| 719 * A X | |
| 720 */ | |
| 299 | 721 a = dc_val[ - 1]; |
| 722 b = dc_val[ - 1 - wrap]; | |
| 723 c = dc_val[ - wrap]; | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
724 |
| 983 | 725 if(s->first_slice_line && (n&2)==0 && s->msmpeg4_version<4){ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
726 b=c=1024; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
727 } |
| 0 | 728 |
| 729 /* XXX: the following solution consumes divisions, but it does not | |
| 730 necessitate to modify mpegvideo.c. The problem comes from the | |
| 731 fact they decided to store the quantized DC (which would lead | |
| 732 to problems if Q could vary !) */ | |
| 221 | 733 #if defined ARCH_X86 && !defined PIC |
| 204 | 734 asm volatile( |
| 735 "movl %3, %%eax \n\t" | |
| 736 "shrl $1, %%eax \n\t" | |
| 737 "addl %%eax, %2 \n\t" | |
| 738 "addl %%eax, %1 \n\t" | |
| 739 "addl %0, %%eax \n\t" | |
|
225
ae145876789d
use multiply instead of divides for DC prediction on X86
michaelni
parents:
221
diff
changeset
|
740 "mull %4 \n\t" |
|
ae145876789d
use multiply instead of divides for DC prediction on X86
michaelni
parents:
221
diff
changeset
|
741 "movl %%edx, %0 \n\t" |
| 204 | 742 "movl %1, %%eax \n\t" |
|
225
ae145876789d
use multiply instead of divides for DC prediction on X86
michaelni
parents:
221
diff
changeset
|
743 "mull %4 \n\t" |
|
ae145876789d
use multiply instead of divides for DC prediction on X86
michaelni
parents:
221
diff
changeset
|
744 "movl %%edx, %1 \n\t" |
| 204 | 745 "movl %2, %%eax \n\t" |
|
225
ae145876789d
use multiply instead of divides for DC prediction on X86
michaelni
parents:
221
diff
changeset
|
746 "mull %4 \n\t" |
|
ae145876789d
use multiply instead of divides for DC prediction on X86
michaelni
parents:
221
diff
changeset
|
747 "movl %%edx, %2 \n\t" |
| 228 | 748 : "+b" (a), "+c" (b), "+D" (c) |
| 749 : "g" (scale), "S" (inverse[scale]) | |
| 204 | 750 : "%eax", "%edx" |
| 751 ); | |
| 221 | 752 #else |
| 753 /* #elif defined (ARCH_ALPHA) */ | |
|
214
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
754 /* Divisions are extremely costly on Alpha; optimize the most |
| 221 | 755 common case. But they are costly everywhere... |
| 756 */ | |
|
214
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
757 if (scale == 8) { |
|
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
758 a = (a + (8 >> 1)) / 8; |
|
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
759 b = (b + (8 >> 1)) / 8; |
|
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
760 c = (c + (8 >> 1)) / 8; |
|
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
761 } else { |
|
1261
362947395f5c
fastdiv patch by (BERO <bero at geocities dot co dot jp>) with fixes & cleanup by me
michaelni
parents:
1255
diff
changeset
|
762 a = FASTDIV((a + (scale >> 1)), scale); |
|
362947395f5c
fastdiv patch by (BERO <bero at geocities dot co dot jp>) with fixes & cleanup by me
michaelni
parents:
1255
diff
changeset
|
763 b = FASTDIV((b + (scale >> 1)), scale); |
|
362947395f5c
fastdiv patch by (BERO <bero at geocities dot co dot jp>) with fixes & cleanup by me
michaelni
parents:
1255
diff
changeset
|
764 c = FASTDIV((c + (scale >> 1)), scale); |
|
214
73df666cacc7
Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents:
208
diff
changeset
|
765 } |
| 204 | 766 #endif |
| 0 | 767 /* XXX: WARNING: they did not choose the same test as MPEG4. This |
| 768 is very important ! */ | |
|
501
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
769 if(s->msmpeg4_version>3){ |
| 519 | 770 if(s->inter_intra_pred){ |
| 771 uint8_t *dest; | |
| 772 int wrap; | |
| 773 | |
| 774 if(n==1){ | |
| 775 pred=a; | |
| 776 *dir_ptr = 0; | |
| 777 }else if(n==2){ | |
| 778 pred=c; | |
| 779 *dir_ptr = 1; | |
| 780 }else if(n==3){ | |
| 781 if (abs(a - b) < abs(b - c)) { | |
| 782 pred = c; | |
| 783 *dir_ptr = 1; | |
| 784 } else { | |
| 785 pred = a; | |
| 786 *dir_ptr = 0; | |
| 787 } | |
| 788 }else{ | |
| 789 if(n<4){ | |
| 790 wrap= s->linesize; | |
| 903 | 791 dest= s->current_picture.data[0] + (((n>>1) + 2*s->mb_y) * 8* wrap ) + ((n&1) + 2*s->mb_x) * 8; |
| 519 | 792 }else{ |
| 556 | 793 wrap= s->uvlinesize; |
| 903 | 794 dest= s->current_picture.data[n-3] + (s->mb_y * 8 * wrap) + s->mb_x * 8; |
| 519 | 795 } |
| 796 if(s->mb_x==0) a= (1024 + (scale>>1))/scale; | |
| 797 else a= get_dc(dest-8, wrap, scale*8); | |
| 798 if(s->mb_y==0) c= (1024 + (scale>>1))/scale; | |
| 799 else c= get_dc(dest-8*wrap, wrap, scale*8); | |
| 800 | |
| 801 if (s->h263_aic_dir==0) { | |
| 802 pred= a; | |
| 803 *dir_ptr = 0; | |
| 804 }else if (s->h263_aic_dir==1) { | |
| 805 if(n==0){ | |
| 806 pred= c; | |
| 807 *dir_ptr = 1; | |
| 808 }else{ | |
| 809 pred= a; | |
| 810 *dir_ptr = 0; | |
| 811 } | |
| 812 }else if (s->h263_aic_dir==2) { | |
| 813 if(n==0){ | |
| 814 pred= a; | |
| 815 *dir_ptr = 0; | |
| 816 }else{ | |
| 817 pred= c; | |
| 818 *dir_ptr = 1; | |
| 819 } | |
| 820 } else { | |
| 821 pred= c; | |
| 822 *dir_ptr = 1; | |
| 823 } | |
| 824 } | |
| 825 }else{ | |
| 826 if (abs(a - b) < abs(b - c)) { | |
| 827 pred = c; | |
| 828 *dir_ptr = 1; | |
| 829 } else { | |
| 830 pred = a; | |
| 831 *dir_ptr = 0; | |
| 832 } | |
|
501
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
833 } |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
834 }else{ |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
835 if (abs(a - b) <= abs(b - c)) { |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
836 pred = c; |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
837 *dir_ptr = 1; |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
838 } else { |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
839 pred = a; |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
840 *dir_ptr = 0; |
|
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
841 } |
| 0 | 842 } |
| 843 | |
| 844 /* update predictor */ | |
| 299 | 845 *dc_val_ptr = &dc_val[0]; |
| 0 | 846 return pred; |
| 847 } | |
| 848 | |
| 849 #define DC_MAX 119 | |
| 850 | |
| 851 static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr) | |
| 852 { | |
| 853 int sign, code; | |
| 854 int pred; | |
| 855 | |
| 457 | 856 if(s->msmpeg4_version==1){ |
| 1064 | 857 int32_t *dc_val; |
| 457 | 858 pred = msmpeg4v1_pred_dc(s, n, &dc_val); |
| 859 | |
| 860 /* update predictor */ | |
| 861 *dc_val= level; | |
| 862 }else{ | |
| 1064 | 863 uint16_t *dc_val; |
|
501
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
864 pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr); |
| 457 | 865 |
| 866 /* update predictor */ | |
| 867 if (n < 4) { | |
| 868 *dc_val = level * s->y_dc_scale; | |
| 869 } else { | |
| 870 *dc_val = level * s->c_dc_scale; | |
| 871 } | |
| 0 | 872 } |
| 873 | |
| 874 /* do the prediction */ | |
| 875 level -= pred; | |
| 876 | |
| 457 | 877 if(s->msmpeg4_version<=2){ |
| 310 | 878 if (n < 4) { |
| 879 put_bits(&s->pb, | |
| 880 v2_dc_lum_table[level+256][1], | |
| 881 v2_dc_lum_table[level+256][0]); | |
| 882 }else{ | |
| 883 put_bits(&s->pb, | |
| 884 v2_dc_chroma_table[level+256][1], | |
| 885 v2_dc_chroma_table[level+256][0]); | |
| 886 } | |
| 887 }else{ | |
| 888 sign = 0; | |
| 889 if (level < 0) { | |
| 890 level = -level; | |
| 891 sign = 1; | |
| 892 } | |
| 893 code = level; | |
| 894 if (code > DC_MAX) | |
| 895 code = DC_MAX; | |
| 0 | 896 |
| 310 | 897 if (s->dc_table_index == 0) { |
| 898 if (n < 4) { | |
| 899 put_bits(&s->pb, table0_dc_lum[code][1], table0_dc_lum[code][0]); | |
| 900 } else { | |
| 901 put_bits(&s->pb, table0_dc_chroma[code][1], table0_dc_chroma[code][0]); | |
| 902 } | |
| 0 | 903 } else { |
| 310 | 904 if (n < 4) { |
| 905 put_bits(&s->pb, table1_dc_lum[code][1], table1_dc_lum[code][0]); | |
| 906 } else { | |
| 907 put_bits(&s->pb, table1_dc_chroma[code][1], table1_dc_chroma[code][0]); | |
| 908 } | |
| 0 | 909 } |
| 310 | 910 |
| 911 if (code == DC_MAX) | |
| 912 put_bits(&s->pb, 8, level); | |
| 913 | |
| 914 if (level != 0) { | |
| 915 put_bits(&s->pb, 1, sign); | |
| 916 } | |
| 0 | 917 } |
| 918 } | |
| 919 | |
| 920 /* Encoding of a block. Very similar to MPEG4 except for a different | |
| 921 escape coding (same as H263) and more vlc tables. | |
| 922 */ | |
| 499 | 923 static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n) |
| 0 | 924 { |
| 925 int level, run, last, i, j, last_index; | |
| 926 int last_non_zero, sign, slevel; | |
| 927 int code, run_diff, dc_pred_dir; | |
| 928 const RLTable *rl; | |
| 1064 | 929 const uint8_t *scantable; |
| 0 | 930 |
| 931 if (s->mb_intra) { | |
| 932 set_stat(ST_DC); | |
| 933 msmpeg4_encode_dc(s, block[0], n, &dc_pred_dir); | |
| 934 i = 1; | |
| 935 if (n < 4) { | |
| 936 rl = &rl_table[s->rl_table_index]; | |
| 937 } else { | |
| 938 rl = &rl_table[3 + s->rl_chroma_table_index]; | |
| 939 } | |
| 940 run_diff = 0; | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
941 scantable= s->intra_scantable.permutated; |
| 0 | 942 set_stat(ST_INTRA_AC); |
| 943 } else { | |
| 944 i = 0; | |
| 945 rl = &rl_table[3 + s->rl_table_index]; | |
| 457 | 946 if(s->msmpeg4_version<=2) |
| 310 | 947 run_diff = 0; |
| 948 else | |
| 949 run_diff = 1; | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
950 scantable= s->inter_scantable.permutated; |
| 0 | 951 set_stat(ST_INTER_AC); |
| 952 } | |
| 953 | |
| 499 | 954 /* recalculate block_last_index for M$ wmv1 */ |
| 936 | 955 if(s->msmpeg4_version>=4 && s->block_last_index[n]>0){ |
| 499 | 956 for(last_index=63; last_index>=0; last_index--){ |
| 957 if(block[scantable[last_index]]) break; | |
| 958 } | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
959 s->block_last_index[n]= last_index; |
| 499 | 960 }else |
| 961 last_index = s->block_last_index[n]; | |
| 0 | 962 /* AC coefs */ |
| 963 last_non_zero = i - 1; | |
| 964 for (; i <= last_index; i++) { | |
| 499 | 965 j = scantable[i]; |
| 0 | 966 level = block[j]; |
| 967 if (level) { | |
| 968 run = i - last_non_zero - 1; | |
| 969 last = (i == last_index); | |
| 970 sign = 0; | |
| 971 slevel = level; | |
| 972 if (level < 0) { | |
| 973 sign = 1; | |
| 974 level = -level; | |
| 975 } | |
| 601 | 976 |
| 499 | 977 if(level<=MAX_LEVEL && run<=MAX_RUN){ |
| 978 s->ac_stats[s->mb_intra][n>3][level][run][last]++; | |
| 979 } | |
| 980 #if 0 | |
| 981 else | |
| 982 s->ac_stats[s->mb_intra][n>3][40][63][0]++; //esc3 like | |
| 983 #endif | |
| 0 | 984 code = get_rl_index(rl, last, run, level); |
| 985 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); | |
| 986 if (code == rl->n) { | |
| 987 int level1, run1; | |
| 988 | |
| 989 level1 = level - rl->max_level[last][run]; | |
| 990 if (level1 < 1) | |
| 991 goto esc2; | |
| 992 code = get_rl_index(rl, last, run, level1); | |
| 993 if (code == rl->n) { | |
| 994 esc2: | |
| 995 put_bits(&s->pb, 1, 0); | |
| 996 if (level > MAX_LEVEL) | |
| 997 goto esc3; | |
| 998 run1 = run - rl->max_run[last][level] - run_diff; | |
| 999 if (run1 < 0) | |
| 1000 goto esc3; | |
| 1001 code = get_rl_index(rl, last, run1, level); | |
| 1002 if (code == rl->n) { | |
| 1003 esc3: | |
| 1004 /* third escape */ | |
| 1005 put_bits(&s->pb, 1, 0); | |
| 1006 put_bits(&s->pb, 1, last); | |
| 936 | 1007 if(s->msmpeg4_version>=4){ |
| 499 | 1008 if(s->esc3_level_length==0){ |
| 1009 s->esc3_level_length=8; | |
| 1010 s->esc3_run_length= 6; | |
| 1011 if(s->qscale<8) | |
| 1012 put_bits(&s->pb, 6, 3); | |
| 1013 else | |
| 1014 put_bits(&s->pb, 8, 3); | |
| 1015 } | |
| 1016 put_bits(&s->pb, s->esc3_run_length, run); | |
| 1017 put_bits(&s->pb, 1, sign); | |
| 1018 put_bits(&s->pb, s->esc3_level_length, level); | |
| 1019 }else{ | |
| 1020 put_bits(&s->pb, 6, run); | |
| 1021 put_bits(&s->pb, 8, slevel & 0xff); | |
| 1022 } | |
| 0 | 1023 } else { |
| 1024 /* second escape */ | |
| 1025 put_bits(&s->pb, 1, 1); | |
| 1026 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); | |
| 1027 put_bits(&s->pb, 1, sign); | |
| 1028 } | |
| 1029 } else { | |
| 1030 /* first escape */ | |
| 1031 put_bits(&s->pb, 1, 1); | |
| 1032 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); | |
| 1033 put_bits(&s->pb, 1, sign); | |
| 1034 } | |
| 1035 } else { | |
| 1036 put_bits(&s->pb, 1, sign); | |
| 1037 } | |
| 1038 last_non_zero = i; | |
| 1039 } | |
| 1040 } | |
| 1041 } | |
| 1042 | |
| 1043 /****************************************/ | |
| 1044 /* decoding stuff */ | |
| 1045 | |
| 936 | 1046 static VLC mb_non_intra_vlc[4]; |
| 0 | 1047 static VLC mb_intra_vlc; |
| 1048 static VLC dc_lum_vlc[2]; | |
| 1049 static VLC dc_chroma_vlc[2]; | |
| 307 | 1050 static VLC v2_dc_lum_vlc; |
| 1051 static VLC v2_dc_chroma_vlc; | |
| 1052 static VLC cbpy_vlc; | |
| 1053 static VLC v2_intra_cbpc_vlc; | |
| 1054 static VLC v2_mb_type_vlc; | |
| 1055 static VLC v2_mv_vlc; | |
| 457 | 1056 static VLC v1_intra_cbpc_vlc; |
| 1057 static VLC v1_inter_cbpc_vlc; | |
| 519 | 1058 static VLC inter_intra_vlc; |
| 307 | 1059 |
| 1060 /* this table is practically identical to the one from h263 except that its inverted */ | |
| 468 | 1061 static void init_h263_dc_for_msmpeg4(void) |
| 307 | 1062 { |
| 1063 int level, uni_code, uni_len; | |
| 1064 | |
| 309 | 1065 for(level=-256; level<256; level++){ |
| 307 | 1066 int size, v, l; |
| 1067 /* find number of bits */ | |
| 1068 size = 0; | |
| 1069 v = abs(level); | |
| 1070 while (v) { | |
| 1071 v >>= 1; | |
| 1072 size++; | |
| 1073 } | |
| 1074 | |
| 1075 if (level < 0) | |
| 1076 l= (-level) ^ ((1 << size) - 1); | |
| 1077 else | |
| 1078 l= level; | |
| 1079 | |
| 1080 /* luminance h263 */ | |
| 1081 uni_code= DCtab_lum[size][0]; | |
| 1082 uni_len = DCtab_lum[size][1]; | |
| 1083 uni_code ^= (1<<uni_len)-1; //M$ doesnt like compatibility | |
| 1084 | |
| 1085 if (size > 0) { | |
| 1086 uni_code<<=size; uni_code|=l; | |
| 1087 uni_len+=size; | |
| 1088 if (size > 8){ | |
| 1089 uni_code<<=1; uni_code|=1; | |
| 1090 uni_len++; | |
| 1091 } | |
| 1092 } | |
| 1093 v2_dc_lum_table[level+256][0]= uni_code; | |
| 1094 v2_dc_lum_table[level+256][1]= uni_len; | |
| 1095 | |
| 1096 /* chrominance h263 */ | |
| 1097 uni_code= DCtab_chrom[size][0]; | |
| 1098 uni_len = DCtab_chrom[size][1]; | |
| 1099 uni_code ^= (1<<uni_len)-1; //M$ doesnt like compatibility | |
| 1100 | |
| 1101 if (size > 0) { | |
| 1102 uni_code<<=size; uni_code|=l; | |
| 1103 uni_len+=size; | |
| 1104 if (size > 8){ | |
| 1105 uni_code<<=1; uni_code|=1; | |
| 1106 uni_len++; | |
| 1107 } | |
| 1108 } | |
| 1109 v2_dc_chroma_table[level+256][0]= uni_code; | |
| 1110 v2_dc_chroma_table[level+256][1]= uni_len; | |
| 1111 | |
| 1112 } | |
| 1113 } | |
| 0 | 1114 |
| 1115 /* init all vlc decoding tables */ | |
| 499 | 1116 int ff_msmpeg4_decode_init(MpegEncContext *s) |
| 0 | 1117 { |
| 483 | 1118 static int done = 0; |
| 0 | 1119 int i; |
| 1120 MVTable *mv; | |
| 1121 | |
| 499 | 1122 common_init(s); |
| 483 | 1123 |
| 1124 if (!done) { | |
| 1125 done = 1; | |
| 0 | 1126 |
| 483 | 1127 for(i=0;i<NB_RL_TABLES;i++) { |
| 1128 init_rl(&rl_table[i]); | |
| 1129 init_vlc_rl(&rl_table[i]); | |
| 1130 } | |
| 1131 for(i=0;i<2;i++) { | |
| 1132 mv = &mv_tables[i]; | |
| 531 | 1133 init_vlc(&mv->vlc, MV_VLC_BITS, mv->n + 1, |
| 483 | 1134 mv->table_mv_bits, 1, 1, |
| 1135 mv->table_mv_code, 2, 2); | |
| 1136 } | |
| 1137 | |
| 531 | 1138 init_vlc(&dc_lum_vlc[0], DC_VLC_BITS, 120, |
| 483 | 1139 &table0_dc_lum[0][1], 8, 4, |
| 1140 &table0_dc_lum[0][0], 8, 4); | |
| 531 | 1141 init_vlc(&dc_chroma_vlc[0], DC_VLC_BITS, 120, |
| 483 | 1142 &table0_dc_chroma[0][1], 8, 4, |
| 1143 &table0_dc_chroma[0][0], 8, 4); | |
| 531 | 1144 init_vlc(&dc_lum_vlc[1], DC_VLC_BITS, 120, |
| 483 | 1145 &table1_dc_lum[0][1], 8, 4, |
| 1146 &table1_dc_lum[0][0], 8, 4); | |
| 531 | 1147 init_vlc(&dc_chroma_vlc[1], DC_VLC_BITS, 120, |
| 483 | 1148 &table1_dc_chroma[0][1], 8, 4, |
| 1149 &table1_dc_chroma[0][0], 8, 4); | |
| 307 | 1150 |
| 531 | 1151 init_vlc(&v2_dc_lum_vlc, DC_VLC_BITS, 512, |
| 483 | 1152 &v2_dc_lum_table[0][1], 8, 4, |
| 1153 &v2_dc_lum_table[0][0], 8, 4); | |
| 531 | 1154 init_vlc(&v2_dc_chroma_vlc, DC_VLC_BITS, 512, |
| 483 | 1155 &v2_dc_chroma_table[0][1], 8, 4, |
| 1156 &v2_dc_chroma_table[0][0], 8, 4); | |
| 307 | 1157 |
| 531 | 1158 init_vlc(&cbpy_vlc, CBPY_VLC_BITS, 16, |
| 483 | 1159 &cbpy_tab[0][1], 2, 1, |
| 1160 &cbpy_tab[0][0], 2, 1); | |
| 531 | 1161 init_vlc(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4, |
| 483 | 1162 &v2_intra_cbpc[0][1], 2, 1, |
| 1163 &v2_intra_cbpc[0][0], 2, 1); | |
| 531 | 1164 init_vlc(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8, |
| 483 | 1165 &v2_mb_type[0][1], 2, 1, |
| 1166 &v2_mb_type[0][0], 2, 1); | |
| 531 | 1167 init_vlc(&v2_mv_vlc, V2_MV_VLC_BITS, 33, |
| 483 | 1168 &mvtab[0][1], 2, 1, |
| 1169 &mvtab[0][0], 2, 1); | |
| 0 | 1170 |
| 936 | 1171 for(i=0; i<4; i++){ |
| 1172 init_vlc(&mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128, | |
| 1173 &wmv2_inter_table[i][0][1], 8, 4, | |
| 1174 &wmv2_inter_table[i][0][0], 8, 4); //FIXME name? | |
| 1175 } | |
| 1176 | |
| 531 | 1177 init_vlc(&mb_intra_vlc, MB_INTRA_VLC_BITS, 64, |
| 483 | 1178 &table_mb_intra[0][1], 4, 2, |
| 1179 &table_mb_intra[0][0], 4, 2); | |
| 457 | 1180 |
| 531 | 1181 init_vlc(&v1_intra_cbpc_vlc, V1_INTRA_CBPC_VLC_BITS, 8, |
| 483 | 1182 intra_MCBPC_bits, 1, 1, |
| 1183 intra_MCBPC_code, 1, 1); | |
| 531 | 1184 init_vlc(&v1_inter_cbpc_vlc, V1_INTER_CBPC_VLC_BITS, 25, |
| 483 | 1185 inter_MCBPC_bits, 1, 1, |
| 1186 inter_MCBPC_code, 1, 1); | |
| 519 | 1187 |
| 531 | 1188 init_vlc(&inter_intra_vlc, INTER_INTRA_VLC_BITS, 4, |
| 519 | 1189 &table_inter_intra[0][1], 2, 1, |
| 1190 &table_inter_intra[0][0], 2, 1); | |
| 483 | 1191 } |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1192 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1193 switch(s->msmpeg4_version){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1194 case 1: |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1195 case 2: |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1196 s->decode_mb= msmpeg4v12_decode_mb; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1197 break; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1198 case 3: |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1199 case 4: |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1200 s->decode_mb= msmpeg4v34_decode_mb; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1201 break; |
| 936 | 1202 case 5: |
| 1203 s->decode_mb= wmv2_decode_mb; | |
| 1204 break; | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1205 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1206 |
|
769
9f8c4905928b
fixing decoding of streams with no keyframe at the start
michaelni
parents:
759
diff
changeset
|
1207 s->slice_height= s->mb_height; //to avoid 1/0 if the first frame isnt a keyframe |
|
9f8c4905928b
fixing decoding of streams with no keyframe at the start
michaelni
parents:
759
diff
changeset
|
1208 |
| 0 | 1209 return 0; |
| 1210 } | |
| 1211 | |
| 1212 static int decode012(GetBitContext *gb) | |
| 1213 { | |
| 1214 int n; | |
| 21 | 1215 n = get_bits1(gb); |
| 0 | 1216 if (n == 0) |
| 1217 return 0; | |
| 1218 else | |
| 21 | 1219 return get_bits1(gb) + 1; |
| 0 | 1220 } |
| 1221 | |
| 307 | 1222 int msmpeg4_decode_picture_header(MpegEncContext * s) |
|
300
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1223 { |
| 499 | 1224 int code; |
|
300
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1225 |
| 311 | 1226 #if 0 |
| 1227 { | |
| 1228 int i; | |
|
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
983
diff
changeset
|
1229 for(i=0; i<s->gb.size_in_bits; i++) |
| 311 | 1230 printf("%d", get_bits1(&s->gb)); |
| 1231 // get_bits1(&s->gb); | |
| 1232 printf("END\n"); | |
| 1233 return -1; | |
| 1234 } | |
| 1235 #endif | |
| 457 | 1236 |
| 1237 if(s->msmpeg4_version==1){ | |
| 1238 int start_code, num; | |
| 1239 start_code = (get_bits(&s->gb, 16)<<16) | get_bits(&s->gb, 16); | |
| 1240 if(start_code!=0x00000100){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1241 av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n"); |
| 457 | 1242 return -1; |
| 1243 } | |
| 1244 | |
| 1245 num= get_bits(&s->gb, 5); // frame number */ | |
| 1246 } | |
| 1247 | |
|
300
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1248 s->pict_type = get_bits(&s->gb, 2) + 1; |
|
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1249 if (s->pict_type != I_TYPE && |
| 457 | 1250 s->pict_type != P_TYPE){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1251 av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n"); |
|
300
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1252 return -1; |
| 457 | 1253 } |
| 519 | 1254 #if 0 |
| 1255 { | |
| 1256 static int had_i=0; | |
| 1257 if(s->pict_type == I_TYPE) had_i=1; | |
| 1258 if(!had_i) return -1; | |
| 1259 } | |
| 1260 #endif | |
| 1651 | 1261 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
|
1063
fdeac9642346
check for qscale==0 (fixes 1/0 on one corrupted stream)
michaelni
parents:
1057
diff
changeset
|
1262 if(s->qscale==0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1263 av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n"); |
|
1063
fdeac9642346
check for qscale==0 (fixes 1/0 on one corrupted stream)
michaelni
parents:
1057
diff
changeset
|
1264 return -1; |
|
fdeac9642346
check for qscale==0 (fixes 1/0 on one corrupted stream)
michaelni
parents:
1057
diff
changeset
|
1265 } |
|
300
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1266 |
|
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1267 if (s->pict_type == I_TYPE) { |
|
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1268 code = get_bits(&s->gb, 5); |
| 457 | 1269 if(s->msmpeg4_version==1){ |
| 1270 if(code==0 || code>s->mb_height){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1271 av_log(s->avctx, AV_LOG_ERROR, "invalid slice height %d\n", code); |
| 457 | 1272 return -1; |
| 1273 } | |
| 1274 | |
| 1275 s->slice_height = code; | |
| 1276 }else{ | |
| 1277 /* 0x17: one slice, 0x18: two slices, ... */ | |
| 519 | 1278 if (code < 0x17){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1279 av_log(s->avctx, AV_LOG_ERROR, "error, slice code was %X\n", code); |
| 457 | 1280 return -1; |
| 519 | 1281 } |
| 457 | 1282 |
| 1283 s->slice_height = s->mb_height / (code - 0x16); | |
| 1284 } | |
| 311 | 1285 |
| 1286 switch(s->msmpeg4_version){ | |
| 457 | 1287 case 1: |
| 311 | 1288 case 2: |
| 307 | 1289 s->rl_chroma_table_index = 2; |
| 1290 s->rl_table_index = 2; | |
|
300
d874359e58f1
msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents:
299
diff
changeset
|
1291 |
| 307 | 1292 s->dc_table_index = 0; //not used |
| 311 | 1293 break; |
| 1294 case 3: | |
| 307 | 1295 s->rl_chroma_table_index = decode012(&s->gb); |
| 1296 s->rl_table_index = decode012(&s->gb); | |
| 0 | 1297 |
| 307 | 1298 s->dc_table_index = get_bits1(&s->gb); |
| 311 | 1299 break; |
| 1300 case 4: | |
| 499 | 1301 msmpeg4_decode_ext_header(s, (2+5+5+17+7)/8); |
| 1302 | |
| 578 | 1303 if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb); |
| 1304 else s->per_mb_rl_table= 0; | |
| 519 | 1305 |
| 499 | 1306 if(!s->per_mb_rl_table){ |
| 1307 s->rl_chroma_table_index = decode012(&s->gb); | |
| 1308 s->rl_table_index = decode012(&s->gb); | |
| 311 | 1309 } |
| 1310 | |
| 499 | 1311 s->dc_table_index = get_bits1(&s->gb); |
| 519 | 1312 s->inter_intra_pred= 0; |
| 311 | 1313 break; |
| 307 | 1314 } |
| 0 | 1315 s->no_rounding = 1; |
| 1388 | 1316 if(s->avctx->debug&FF_DEBUG_PICT_INFO) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1317 av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d slice:%d \n", |
| 200 | 1318 s->qscale, |
| 1319 s->rl_chroma_table_index, | |
| 1320 s->rl_table_index, | |
| 499 | 1321 s->dc_table_index, |
| 519 | 1322 s->per_mb_rl_table, |
| 1388 | 1323 s->slice_height); |
| 0 | 1324 } else { |
| 457 | 1325 switch(s->msmpeg4_version){ |
| 1326 case 1: | |
| 1327 case 2: | |
| 1328 if(s->msmpeg4_version==1) | |
| 1329 s->use_skip_mb_code = 1; | |
| 1330 else | |
| 1331 s->use_skip_mb_code = get_bits1(&s->gb); | |
| 307 | 1332 s->rl_table_index = 2; |
| 1333 s->rl_chroma_table_index = s->rl_table_index; | |
| 1334 s->dc_table_index = 0; //not used | |
| 1335 s->mv_table_index = 0; | |
| 457 | 1336 break; |
| 1337 case 3: | |
| 1338 s->use_skip_mb_code = get_bits1(&s->gb); | |
| 307 | 1339 s->rl_table_index = decode012(&s->gb); |
| 1340 s->rl_chroma_table_index = s->rl_table_index; | |
| 0 | 1341 |
| 307 | 1342 s->dc_table_index = get_bits1(&s->gb); |
| 1343 | |
| 1344 s->mv_table_index = get_bits1(&s->gb); | |
| 457 | 1345 break; |
| 499 | 1346 case 4: |
| 1347 s->use_skip_mb_code = get_bits1(&s->gb); | |
| 519 | 1348 |
| 578 | 1349 if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb); |
| 1350 else s->per_mb_rl_table= 0; | |
| 519 | 1351 |
| 499 | 1352 if(!s->per_mb_rl_table){ |
| 1353 s->rl_table_index = decode012(&s->gb); | |
| 1354 s->rl_chroma_table_index = s->rl_table_index; | |
| 1355 } | |
| 1356 | |
| 1357 s->dc_table_index = get_bits1(&s->gb); | |
| 1358 | |
| 1359 s->mv_table_index = get_bits1(&s->gb); | |
| 578 | 1360 s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); |
| 499 | 1361 break; |
| 307 | 1362 } |
| 1388 | 1363 |
| 1364 if(s->avctx->debug&FF_DEBUG_PICT_INFO) | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1365 av_log(s->avctx, AV_LOG_DEBUG, "skip:%d rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d \n", |
| 200 | 1366 s->use_skip_mb_code, |
| 1367 s->rl_table_index, | |
| 1368 s->rl_chroma_table_index, | |
| 1369 s->dc_table_index, | |
| 499 | 1370 s->mv_table_index, |
| 519 | 1371 s->per_mb_rl_table, |
| 1388 | 1372 s->qscale); |
| 1373 | |
| 208 | 1374 if(s->flipflop_rounding){ |
| 1375 s->no_rounding ^= 1; | |
| 1376 }else{ | |
| 1377 s->no_rounding = 0; | |
| 1378 } | |
| 0 | 1379 } |
| 936 | 1380 //printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height); |
| 499 | 1381 |
| 1382 s->esc3_level_length= 0; | |
| 1383 s->esc3_run_length= 0; | |
| 307 | 1384 |
| 0 | 1385 #ifdef DEBUG |
| 1386 printf("*****frame %d:\n", frame_count++); | |
| 1387 #endif | |
| 1388 return 0; | |
| 1389 } | |
| 1390 | |
| 208 | 1391 int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size) |
| 1392 { | |
| 457 | 1393 int left= buf_size*8 - get_bits_count(&s->gb); |
| 1394 int length= s->msmpeg4_version>=3 ? 17 : 16; | |
| 208 | 1395 /* the alt_bitstream reader could read over the end so we need to check it */ |
| 457 | 1396 if(left>=length && left<length+8) |
| 208 | 1397 { |
|
251
75091bfc577b
fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents:
246
diff
changeset
|
1398 int fps; |
|
75091bfc577b
fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents:
246
diff
changeset
|
1399 |
|
75091bfc577b
fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents:
246
diff
changeset
|
1400 fps= get_bits(&s->gb, 5); |
| 578 | 1401 s->bit_rate= get_bits(&s->gb, 11)*1024; |
| 457 | 1402 if(s->msmpeg4_version>=3) |
| 1403 s->flipflop_rounding= get_bits1(&s->gb); | |
| 1404 else | |
| 1405 s->flipflop_rounding= 0; | |
|
251
75091bfc577b
fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents:
246
diff
changeset
|
1406 |
| 578 | 1407 // printf("fps:%2d bps:%2d roundingType:%1d\n", fps, s->bit_rate/1024, s->flipflop_rounding); |
| 457 | 1408 } |
| 1409 else if(left<length+8) | |
| 1410 { | |
| 1411 s->flipflop_rounding= 0; | |
| 1399 | 1412 if(s->msmpeg4_version != 2) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1413 av_log(s->avctx, AV_LOG_ERROR, "ext header missing, %d left\n", left); |
| 208 | 1414 } |
| 1415 else | |
| 1416 { | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1417 av_log(s->avctx, AV_LOG_ERROR, "I frame too long, ignoring ext header\n"); |
| 208 | 1418 } |
|
251
75091bfc577b
fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents:
246
diff
changeset
|
1419 |
| 208 | 1420 return 0; |
| 1421 } | |
| 1422 | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
1423 static inline void msmpeg4_memsetw(short *tab, int val, int n) |
| 0 | 1424 { |
| 1425 int i; | |
| 1426 for(i=0;i<n;i++) | |
| 1427 tab[i] = val; | |
| 1428 } | |
| 1429 | |
| 310 | 1430 static void msmpeg4v2_encode_motion(MpegEncContext * s, int val) |
| 1431 { | |
| 1432 int range, bit_size, sign, code, bits; | |
| 1433 | |
| 1434 if (val == 0) { | |
| 1435 /* zero vector */ | |
| 1436 code = 0; | |
| 1437 put_bits(&s->pb, mvtab[code][1], mvtab[code][0]); | |
| 1438 } else { | |
| 1439 bit_size = s->f_code - 1; | |
| 1440 range = 1 << bit_size; | |
| 1441 if (val <= -64) | |
| 1442 val += 64; | |
| 1443 else if (val >= 64) | |
| 1444 val -= 64; | |
| 1445 | |
| 1446 if (val >= 0) { | |
| 1447 sign = 0; | |
| 1448 } else { | |
| 1449 val = -val; | |
| 1450 sign = 1; | |
| 1451 } | |
| 1452 val--; | |
| 1453 code = (val >> bit_size) + 1; | |
| 1454 bits = val & (range - 1); | |
| 1455 | |
| 1456 put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign); | |
| 1457 if (bit_size > 0) { | |
| 1458 put_bits(&s->pb, bit_size, bits); | |
| 1459 } | |
| 1460 } | |
| 1461 } | |
| 1462 | |
| 307 | 1463 /* this is identical to h263 except that its range is multiplied by 2 */ |
| 1464 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) | |
| 1465 { | |
| 1466 int code, val, sign, shift; | |
| 1467 | |
| 531 | 1468 code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2); |
| 457 | 1469 // printf("MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred); |
| 307 | 1470 if (code < 0) |
| 1471 return 0xffff; | |
| 1472 | |
| 1473 if (code == 0) | |
| 1474 return pred; | |
| 1475 sign = get_bits1(&s->gb); | |
| 1476 shift = f_code - 1; | |
|
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1216
diff
changeset
|
1477 val = code; |
|
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1216
diff
changeset
|
1478 if (shift) { |
|
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1216
diff
changeset
|
1479 val = (val - 1) << shift; |
| 307 | 1480 val |= get_bits(&s->gb, shift); |
|
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1216
diff
changeset
|
1481 val++; |
|
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1216
diff
changeset
|
1482 } |
| 307 | 1483 if (sign) |
| 1484 val = -val; | |
| 457 | 1485 |
| 307 | 1486 val += pred; |
| 1487 if (val <= -64) | |
| 1488 val += 64; | |
| 1489 else if (val >= 64) | |
| 1490 val -= 64; | |
| 1491 | |
| 1492 return val; | |
| 1493 } | |
| 1494 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1495 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) |
| 307 | 1496 { |
| 1497 int cbp, code, i; | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1498 |
| 307 | 1499 if (s->pict_type == P_TYPE) { |
| 1500 if (s->use_skip_mb_code) { | |
| 1501 if (get_bits1(&s->gb)) { | |
| 1502 /* skip mb */ | |
| 1503 s->mb_intra = 0; | |
| 1504 for(i=0;i<6;i++) | |
| 1505 s->block_last_index[i] = -1; | |
| 1506 s->mv_dir = MV_DIR_FORWARD; | |
| 1507 s->mv_type = MV_TYPE_16X16; | |
| 1508 s->mv[0][0][0] = 0; | |
| 1509 s->mv[0][0][1] = 0; | |
| 1510 s->mb_skiped = 1; | |
| 1511 return 0; | |
| 1512 } | |
| 1513 } | |
| 1514 | |
| 457 | 1515 if(s->msmpeg4_version==2) |
| 531 | 1516 code = get_vlc2(&s->gb, v2_mb_type_vlc.table, V2_MB_TYPE_VLC_BITS, 1); |
| 457 | 1517 else |
| 531 | 1518 code = get_vlc2(&s->gb, v1_inter_cbpc_vlc.table, V1_INTER_CBPC_VLC_BITS, 3); |
| 457 | 1519 if(code<0 || code>7){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1520 av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code, s->mb_x, s->mb_y); |
| 457 | 1521 return -1; |
| 1522 } | |
| 1523 | |
| 307 | 1524 s->mb_intra = code >>2; |
| 1525 | |
| 1526 cbp = code & 0x3; | |
| 1527 } else { | |
| 1528 s->mb_intra = 1; | |
| 457 | 1529 if(s->msmpeg4_version==2) |
| 531 | 1530 cbp= get_vlc2(&s->gb, v2_intra_cbpc_vlc.table, V2_INTRA_CBPC_VLC_BITS, 1); |
| 457 | 1531 else |
| 531 | 1532 cbp= get_vlc2(&s->gb, v1_intra_cbpc_vlc.table, V1_INTRA_CBPC_VLC_BITS, 1); |
| 457 | 1533 if(cbp<0 || cbp>3){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1534 av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 457 | 1535 return -1; |
| 1536 } | |
| 307 | 1537 } |
| 1538 | |
| 1539 if (!s->mb_intra) { | |
| 457 | 1540 int mx, my, cbpy; |
| 1541 | |
| 531 | 1542 cbpy= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
| 457 | 1543 if(cbpy<0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1544 av_log(s->avctx, AV_LOG_ERROR, "cbpy %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 457 | 1545 return -1; |
| 1546 } | |
| 307 | 1547 |
| 457 | 1548 cbp|= cbpy<<2; |
| 1549 if(s->msmpeg4_version==1 || (cbp&3) != 3) cbp^= 0x3C; | |
| 307 | 1550 |
| 1551 h263_pred_motion(s, 0, &mx, &my); | |
| 1552 mx= msmpeg4v2_decode_motion(s, mx, 1); | |
| 1553 my= msmpeg4v2_decode_motion(s, my, 1); | |
| 1554 | |
| 1555 s->mv_dir = MV_DIR_FORWARD; | |
| 1556 s->mv_type = MV_TYPE_16X16; | |
| 1557 s->mv[0][0][0] = mx; | |
| 1558 s->mv[0][0][1] = my; | |
| 1559 } else { | |
| 457 | 1560 if(s->msmpeg4_version==2){ |
| 1561 s->ac_pred = get_bits1(&s->gb); | |
| 531 | 1562 cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors |
| 457 | 1563 } else{ |
| 1564 s->ac_pred = 0; | |
| 531 | 1565 cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors |
| 457 | 1566 if(s->pict_type==P_TYPE) cbp^=0x3C; |
| 1567 } | |
| 307 | 1568 } |
| 1569 | |
| 1570 for (i = 0; i < 6; i++) { | |
| 936 | 1571 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) |
| 307 | 1572 { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1573 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); |
| 307 | 1574 return -1; |
| 1575 } | |
| 1576 } | |
| 1577 return 0; | |
| 1578 } | |
| 1579 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1580 static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) |
| 0 | 1581 { |
| 1582 int cbp, code, i; | |
| 1064 | 1583 uint8_t *coded_val; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1584 uint32_t * const mb_type_ptr= &s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]; |
| 0 | 1585 |
| 1586 if (s->pict_type == P_TYPE) { | |
| 1587 set_stat(ST_INTER_MB); | |
| 1588 if (s->use_skip_mb_code) { | |
| 21 | 1589 if (get_bits1(&s->gb)) { |
| 0 | 1590 /* skip mb */ |
| 1591 s->mb_intra = 0; | |
| 1592 for(i=0;i<6;i++) | |
| 1593 s->block_last_index[i] = -1; | |
| 1594 s->mv_dir = MV_DIR_FORWARD; | |
| 1595 s->mv_type = MV_TYPE_16X16; | |
| 1596 s->mv[0][0][0] = 0; | |
| 1597 s->mv[0][0][1] = 0; | |
|
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1598 s->mb_skiped = 1; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1599 *mb_type_ptr = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1600 |
| 0 | 1601 return 0; |
| 1602 } | |
| 1603 } | |
| 1604 | |
| 936 | 1605 code = get_vlc2(&s->gb, mb_non_intra_vlc[DEFAULT_INTER_INDEX].table, MB_NON_INTRA_VLC_BITS, 3); |
| 0 | 1606 if (code < 0) |
| 1607 return -1; | |
| 246 | 1608 //s->mb_intra = (code & 0x40) ? 0 : 1; |
| 1609 s->mb_intra = (~code & 0x40) >> 6; | |
| 0 | 1610 |
| 1611 cbp = code & 0x3f; | |
| 1612 } else { | |
| 1613 set_stat(ST_INTRA_MB); | |
| 1614 s->mb_intra = 1; | |
| 531 | 1615 code = get_vlc2(&s->gb, mb_intra_vlc.table, MB_INTRA_VLC_BITS, 2); |
| 0 | 1616 if (code < 0) |
| 1617 return -1; | |
| 1618 /* predict coded block pattern */ | |
| 1619 cbp = 0; | |
| 1620 for(i=0;i<6;i++) { | |
| 246 | 1621 int val = ((code >> (5 - i)) & 1); |
| 0 | 1622 if (i < 4) { |
| 246 | 1623 int pred = coded_block_pred(s, i, &coded_val); |
| 0 | 1624 val = val ^ pred; |
| 1625 *coded_val = val; | |
| 1626 } | |
| 1627 cbp |= val << (5 - i); | |
| 1628 } | |
| 1629 } | |
| 1630 | |
| 1631 if (!s->mb_intra) { | |
| 1632 int mx, my; | |
| 499 | 1633 //printf("P at %d %d\n", s->mb_x, s->mb_y); |
| 1634 if(s->per_mb_rl_table && cbp){ | |
| 1635 s->rl_table_index = decode012(&s->gb); | |
| 1636 s->rl_chroma_table_index = s->rl_table_index; | |
| 1637 } | |
| 0 | 1638 set_stat(ST_MV); |
| 1639 h263_pred_motion(s, 0, &mx, &my); | |
| 1640 if (msmpeg4_decode_motion(s, &mx, &my) < 0) | |
| 1641 return -1; | |
| 1642 s->mv_dir = MV_DIR_FORWARD; | |
| 1643 s->mv_type = MV_TYPE_16X16; | |
| 1644 s->mv[0][0][0] = mx; | |
| 1645 s->mv[0][0][1] = my; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1646 *mb_type_ptr = MB_TYPE_L0 | MB_TYPE_16x16; |
| 0 | 1647 } else { |
| 499 | 1648 //printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24)); |
| 0 | 1649 set_stat(ST_INTRA_MB); |
| 21 | 1650 s->ac_pred = get_bits1(&s->gb); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1651 *mb_type_ptr = MB_TYPE_INTRA; |
| 519 | 1652 if(s->inter_intra_pred){ |
| 531 | 1653 s->h263_aic_dir= get_vlc2(&s->gb, inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1); |
| 519 | 1654 // printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y); |
| 1655 } | |
| 499 | 1656 if(s->per_mb_rl_table && cbp){ |
| 1657 s->rl_table_index = decode012(&s->gb); | |
| 1658 s->rl_chroma_table_index = s->rl_table_index; | |
| 1659 } | |
| 0 | 1660 } |
| 1661 | |
| 1662 for (i = 0; i < 6; i++) { | |
| 936 | 1663 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) |
| 246 | 1664 { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1665 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); |
| 457 | 1666 return -1; |
| 246 | 1667 } |
| 0 | 1668 } |
|
501
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
1669 |
| 0 | 1670 return 0; |
| 1671 } | |
| 563 | 1672 //#define ERROR_DETAILS |
| 499 | 1673 static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, |
| 936 | 1674 int n, int coded, const uint8_t *scan_table) |
| 0 | 1675 { |
| 542 | 1676 int level, i, last, run, run_diff; |
| 0 | 1677 int dc_pred_dir; |
| 1678 RLTable *rl; | |
| 542 | 1679 RL_VLC_ELEM *rl_vlc; |
| 200 | 1680 int qmul, qadd; |
| 0 | 1681 |
| 1682 if (s->mb_intra) { | |
| 200 | 1683 qmul=1; |
| 1684 qadd=0; | |
| 1685 | |
| 0 | 1686 /* DC coef */ |
| 1687 set_stat(ST_DC); | |
| 1688 level = msmpeg4_decode_dc(s, n, &dc_pred_dir); | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1689 |
| 457 | 1690 if (level < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1691 av_log(s->avctx, AV_LOG_ERROR, "dc overflow- block: %d qscale: %d//\n", n, s->qscale); |
| 519 | 1692 if(s->inter_intra_pred) level=0; |
| 1693 else return -1; | |
| 457 | 1694 } |
| 0 | 1695 if (n < 4) { |
| 1696 rl = &rl_table[s->rl_table_index]; | |
| 457 | 1697 if(level > 256*s->y_dc_scale){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1698 av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ L qscale: %d//\n", s->qscale); |
| 519 | 1699 if(!s->inter_intra_pred) return -1; |
| 457 | 1700 } |
| 0 | 1701 } else { |
| 1702 rl = &rl_table[3 + s->rl_chroma_table_index]; | |
| 457 | 1703 if(level > 256*s->c_dc_scale){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1704 av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ C qscale: %d//\n", s->qscale); |
| 519 | 1705 if(!s->inter_intra_pred) return -1; |
| 457 | 1706 } |
| 0 | 1707 } |
| 457 | 1708 block[0] = level; |
| 200 | 1709 |
| 0 | 1710 run_diff = 0; |
| 542 | 1711 i = 0; |
| 0 | 1712 if (!coded) { |
| 1713 goto not_coded; | |
| 1714 } | |
| 1715 if (s->ac_pred) { | |
| 1716 if (dc_pred_dir == 0) | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
1717 scan_table = s->intra_v_scantable.permutated; /* left */ |
| 0 | 1718 else |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
1719 scan_table = s->intra_h_scantable.permutated; /* top */ |
| 0 | 1720 } else { |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
601
diff
changeset
|
1721 scan_table = s->intra_scantable.permutated; |
| 0 | 1722 } |
| 1723 set_stat(ST_INTRA_AC); | |
| 542 | 1724 rl_vlc= rl->rl_vlc[0]; |
| 0 | 1725 } else { |
| 200 | 1726 qmul = s->qscale << 1; |
| 1727 qadd = (s->qscale - 1) | 1; | |
| 542 | 1728 i = -1; |
| 0 | 1729 rl = &rl_table[3 + s->rl_table_index]; |
| 307 | 1730 |
| 1731 if(s->msmpeg4_version==2) | |
| 1732 run_diff = 0; | |
| 1733 else | |
| 1734 run_diff = 1; | |
| 1735 | |
| 0 | 1736 if (!coded) { |
| 542 | 1737 s->block_last_index[n] = i; |
| 0 | 1738 return 0; |
| 1739 } | |
| 936 | 1740 if(!scan_table) |
| 1741 scan_table = s->inter_scantable.permutated; | |
| 0 | 1742 set_stat(ST_INTER_AC); |
| 542 | 1743 rl_vlc= rl->rl_vlc[s->qscale]; |
| 0 | 1744 } |
| 542 | 1745 { |
| 1746 OPEN_READER(re, &s->gb); | |
| 0 | 1747 for(;;) { |
| 542 | 1748 UPDATE_CACHE(re, &s->gb); |
| 1749 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2); | |
| 1750 if (level==0) { | |
| 1751 int cache; | |
| 1752 cache= GET_CACHE(re, &s->gb); | |
| 0 | 1753 /* escape */ |
| 542 | 1754 if (s->msmpeg4_version==1 || (cache&0x80000000)==0) { |
| 1755 if (s->msmpeg4_version==1 || (cache&0x40000000)==0) { | |
| 0 | 1756 /* third escape */ |
| 542 | 1757 if(s->msmpeg4_version!=1) LAST_SKIP_BITS(re, &s->gb, 2); |
| 1758 UPDATE_CACHE(re, &s->gb); | |
| 499 | 1759 if(s->msmpeg4_version<=3){ |
| 542 | 1760 last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); |
| 1761 run= SHOW_UBITS(re, &s->gb, 6); SKIP_CACHE(re, &s->gb, 6); | |
| 1762 level= SHOW_SBITS(re, &s->gb, 8); LAST_SKIP_CACHE(re, &s->gb, 8); | |
| 1763 SKIP_COUNTER(re, &s->gb, 1+6+8); | |
| 1764 }else{ | |
| 499 | 1765 int sign; |
| 542 | 1766 last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1); |
| 499 | 1767 if(!s->esc3_level_length){ |
| 1768 int ll; | |
| 1769 //printf("ESC-3 %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y); | |
| 1770 if(s->qscale<8){ | |
| 542 | 1771 ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3); |
| 499 | 1772 if(ll==0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1773 if(SHOW_UBITS(re, &s->gb, 1)) av_log(s->avctx, AV_LOG_ERROR, "cool a new vlc code ,contact the ffmpeg developers and upload the file\n"); |
| 542 | 1774 SKIP_BITS(re, &s->gb, 1); |
| 499 | 1775 ll=8; |
| 1776 } | |
| 1777 }else{ | |
| 1778 ll=2; | |
| 542 | 1779 while(ll<8 && SHOW_UBITS(re, &s->gb, 1)==0){ |
| 1780 ll++; | |
| 1781 SKIP_BITS(re, &s->gb, 1); | |
| 1782 } | |
| 578 | 1783 if(ll<8) SKIP_BITS(re, &s->gb, 1); |
| 499 | 1784 } |
| 1785 | |
| 1786 s->esc3_level_length= ll; | |
| 542 | 1787 s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2); |
| 499 | 1788 //printf("level length:%d, run length: %d\n", ll, s->esc3_run_length); |
| 578 | 1789 UPDATE_CACHE(re, &s->gb); |
| 499 | 1790 } |
| 542 | 1791 run= SHOW_UBITS(re, &s->gb, s->esc3_run_length); |
| 1792 SKIP_BITS(re, &s->gb, s->esc3_run_length); | |
| 1793 | |
| 1794 sign= SHOW_UBITS(re, &s->gb, 1); | |
| 1795 SKIP_BITS(re, &s->gb, 1); | |
| 1796 | |
| 1797 level= SHOW_UBITS(re, &s->gb, s->esc3_level_length); | |
| 1798 SKIP_BITS(re, &s->gb, s->esc3_level_length); | |
| 499 | 1799 if(sign) level= -level; |
| 1800 } | |
| 1801 //printf("level: %d, run: %d at %d %d\n", level, run, s->mb_x, s->mb_y); | |
| 457 | 1802 #if 0 // waste of time / this will detect very few errors |
| 1803 { | |
| 1804 const int abs_level= ABS(level); | |
| 1805 const int run1= run - rl->max_run[last][abs_level] - run_diff; | |
| 1806 if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ | |
| 1807 if(abs_level <= rl->max_level[last][run]){ | |
| 1808 fprintf(stderr, "illegal 3. esc, vlc encoding possible\n"); | |
| 1809 return DECODING_AC_LOST; | |
| 1810 } | |
| 1811 if(abs_level <= rl->max_level[last][run]*2){ | |
| 1812 fprintf(stderr, "illegal 3. esc, esc 1 encoding possible\n"); | |
| 1813 return DECODING_AC_LOST; | |
| 1814 } | |
| 499 | 1815 if(run1>=0 && abs_level <= rl->max_level[last][run1]){ |
| 457 | 1816 fprintf(stderr, "illegal 3. esc, esc 2 encoding possible\n"); |
| 1817 return DECODING_AC_LOST; | |
| 1818 } | |
| 1819 } | |
| 1820 } | |
| 1821 #endif | |
| 246 | 1822 //level = level * qmul + (level>0) * qadd - (level<=0) * qadd ; |
| 1823 if (level>0) level= level * qmul + qadd; | |
| 457 | 1824 else level= level * qmul - qadd; |
| 1825 #if 0 // waste of time too :( | |
| 1826 if(level>2048 || level<-2048){ | |
| 1827 fprintf(stderr, "|level| overflow in 3. esc\n"); | |
| 1828 return DECODING_AC_LOST; | |
| 1829 } | |
| 1830 #endif | |
| 542 | 1831 i+= run + 1; |
| 1832 if(last) i+=192; | |
| 563 | 1833 #ifdef ERROR_DETAILS |
| 1834 if(run==66) | |
| 1835 fprintf(stderr, "illegal vlc code in ESC3 level=%d\n", level); | |
| 1836 else if((i>62 && i<192) || i>192+63) | |
| 1837 fprintf(stderr, "run overflow in ESC3 i=%d run=%d level=%d\n", i, run, level); | |
| 1838 #endif | |
| 0 | 1839 } else { |
| 1840 /* second escape */ | |
| 542 | 1841 #if MIN_CACHE_BITS < 23 |
| 1842 LAST_SKIP_BITS(re, &s->gb, 2); | |
| 1843 UPDATE_CACHE(re, &s->gb); | |
| 1844 #else | |
| 1845 SKIP_BITS(re, &s->gb, 2); | |
| 1846 #endif | |
| 1847 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2); | |
| 1848 i+= run + rl->max_run[run>>7][level/qmul] + run_diff; //FIXME opt indexing | |
| 1849 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 1850 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 563 | 1851 #ifdef ERROR_DETAILS |
| 1852 if(run==66) | |
| 1853 fprintf(stderr, "illegal vlc code in ESC2 level=%d\n", level); | |
| 1854 else if((i>62 && i<192) || i>192+63) | |
| 1855 fprintf(stderr, "run overflow in ESC2 i=%d run=%d level=%d\n", i, run, level); | |
| 1856 #endif | |
| 0 | 1857 } |
| 1858 } else { | |
| 1859 /* first escape */ | |
| 542 | 1860 #if MIN_CACHE_BITS < 22 |
| 1861 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 1862 UPDATE_CACHE(re, &s->gb); | |
| 1863 #else | |
| 1864 SKIP_BITS(re, &s->gb, 1); | |
| 1865 #endif | |
| 1866 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2); | |
| 1867 i+= run; | |
| 1868 level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing | |
| 1869 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 1870 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 563 | 1871 #ifdef ERROR_DETAILS |
| 1872 if(run==66) | |
| 1873 fprintf(stderr, "illegal vlc code in ESC1 level=%d\n", level); | |
| 1874 else if((i>62 && i<192) || i>192+63) | |
| 1875 fprintf(stderr, "run overflow in ESC1 i=%d run=%d level=%d\n", i, run, level); | |
| 1876 #endif | |
| 0 | 1877 } |
| 1878 } else { | |
| 542 | 1879 i+= run; |
| 1880 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 1881 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 563 | 1882 #ifdef ERROR_DETAILS |
| 1883 if(run==66) | |
| 1884 fprintf(stderr, "illegal vlc code level=%d\n", level); | |
| 1885 else if((i>62 && i<192) || i>192+63) | |
| 1886 fprintf(stderr, "run overflow i=%d run=%d level=%d\n", i, run, level); | |
| 1887 #endif | |
| 0 | 1888 } |
| 542 | 1889 if (i > 62){ |
| 1890 i-= 192; | |
| 1891 if(i&(~63)){ | |
|
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
983
diff
changeset
|
1892 const int left= s->gb.size_in_bits - get_bits_count(&s->gb); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
743
diff
changeset
|
1893 if(((i+192 == 64 && level/qmul==-1) || s->error_resilience<=1) && left>=0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1894 av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y); |
| 563 | 1895 break; |
| 1896 }else{ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1897 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
| 563 | 1898 return -1; |
| 1899 } | |
| 542 | 1900 } |
| 1901 | |
| 1902 block[scan_table[i]] = level; | |
| 1903 break; | |
| 499 | 1904 } |
| 457 | 1905 |
| 542 | 1906 block[scan_table[i]] = level; |
| 0 | 1907 } |
| 542 | 1908 CLOSE_READER(re, &s->gb); |
| 1909 } | |
| 0 | 1910 not_coded: |
| 1911 if (s->mb_intra) { | |
| 1912 mpeg4_pred_ac(s, block, n, dc_pred_dir); | |
| 1913 if (s->ac_pred) { | |
| 542 | 1914 i = 63; /* XXX: not optimal */ |
| 0 | 1915 } |
| 1916 } | |
| 936 | 1917 if(s->msmpeg4_version>=4 && i>0) i=63; //FIXME/XXX optimize |
| 542 | 1918 s->block_last_index[n] = i; |
| 499 | 1919 |
| 0 | 1920 return 0; |
| 1921 } | |
| 1922 | |
| 1923 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) | |
| 1924 { | |
| 1925 int level, pred; | |
| 1926 | |
| 457 | 1927 if(s->msmpeg4_version<=2){ |
| 307 | 1928 if (n < 4) { |
| 531 | 1929 level = get_vlc2(&s->gb, v2_dc_lum_vlc.table, DC_VLC_BITS, 3); |
| 307 | 1930 } else { |
| 531 | 1931 level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, DC_VLC_BITS, 3); |
| 307 | 1932 } |
| 309 | 1933 if (level < 0) |
| 307 | 1934 return -1; |
| 1935 level-=256; | |
| 1936 }else{ //FIXME optimize use unified tables & index | |
| 1937 if (n < 4) { | |
| 531 | 1938 level = get_vlc2(&s->gb, dc_lum_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
| 307 | 1939 } else { |
| 531 | 1940 level = get_vlc2(&s->gb, dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
| 307 | 1941 } |
| 457 | 1942 if (level < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1943 av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); |
| 307 | 1944 return -1; |
| 457 | 1945 } |
| 307 | 1946 |
| 1947 if (level == DC_MAX) { | |
| 1948 level = get_bits(&s->gb, 8); | |
| 1949 if (get_bits1(&s->gb)) | |
| 1950 level = -level; | |
| 1951 } else if (level != 0) { | |
| 1952 if (get_bits1(&s->gb)) | |
| 1953 level = -level; | |
| 1954 } | |
| 0 | 1955 } |
| 1956 | |
| 457 | 1957 if(s->msmpeg4_version==1){ |
| 1064 | 1958 int32_t *dc_val; |
| 457 | 1959 pred = msmpeg4v1_pred_dc(s, n, &dc_val); |
| 1960 level += pred; | |
| 1961 | |
| 1962 /* update predictor */ | |
| 1963 *dc_val= level; | |
| 1964 }else{ | |
| 1064 | 1965 uint16_t *dc_val; |
|
501
2241bce35bb9
fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents:
499
diff
changeset
|
1966 pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr); |
| 457 | 1967 level += pred; |
| 0 | 1968 |
| 457 | 1969 /* update predictor */ |
| 1970 if (n < 4) { | |
| 1971 *dc_val = level * s->y_dc_scale; | |
| 1972 } else { | |
| 1973 *dc_val = level * s->c_dc_scale; | |
| 1974 } | |
| 0 | 1975 } |
| 1976 | |
| 1977 return level; | |
| 1978 } | |
| 1979 | |
| 1980 static int msmpeg4_decode_motion(MpegEncContext * s, | |
| 1981 int *mx_ptr, int *my_ptr) | |
| 1982 { | |
| 1983 MVTable *mv; | |
| 1984 int code, mx, my; | |
| 1985 | |
| 1986 mv = &mv_tables[s->mv_table_index]; | |
| 1987 | |
| 531 | 1988 code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2); |
| 499 | 1989 if (code < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1399
diff
changeset
|
1990 av_log(s->avctx, AV_LOG_ERROR, "illegal MV code at %d %d\n", s->mb_x, s->mb_y); |
| 0 | 1991 return -1; |
| 499 | 1992 } |
| 0 | 1993 if (code == mv->n) { |
| 499 | 1994 //printf("MV ESC %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y); |
| 0 | 1995 mx = get_bits(&s->gb, 6); |
| 1996 my = get_bits(&s->gb, 6); | |
| 1997 } else { | |
| 1998 mx = mv->table_mvx[code]; | |
| 1999 my = mv->table_mvy[code]; | |
| 2000 } | |
| 2001 | |
| 2002 mx += *mx_ptr - 32; | |
| 2003 my += *my_ptr - 32; | |
| 2004 /* WARNING : they do not do exactly modulo encoding */ | |
| 2005 if (mx <= -64) | |
| 2006 mx += 64; | |
| 2007 else if (mx >= 64) | |
| 2008 mx -= 64; | |
| 2009 | |
| 2010 if (my <= -64) | |
| 2011 my += 64; | |
| 2012 else if (my >= 64) | |
| 2013 my -= 64; | |
| 2014 *mx_ptr = mx; | |
| 2015 *my_ptr = my; | |
| 2016 return 0; | |
| 2017 } | |
| 936 | 2018 |
| 2019 /* cleanest way to support it | |
| 2020 * there is too much shared between versions so that we cant have 1 file per version & 1 common | |
| 2021 * as allmost everything would be in the common file | |
| 2022 */ | |
| 2023 #include "wmv2.c" |
