Mercurial > libavcodec.hg
comparison msmpeg4.c @ 25:2f603eb2f23d libavcodec
types fix
author | glantau |
---|---|
date | Mon, 06 Aug 2001 00:47:50 +0000 |
parents | 20e680e7a490 |
children | 11ce5e672961 |
comparison
equal
deleted
inserted
replaced
24:08265a63313e | 25:2f603eb2f23d |
---|---|
359 s->c_dc_scale = (s->qscale + 13) / 2; | 359 s->c_dc_scale = (s->qscale + 13) / 2; |
360 } | 360 } |
361 | 361 |
362 /* dir = 0: left, dir = 1: top prediction */ | 362 /* dir = 0: left, dir = 1: top prediction */ |
363 static int msmpeg4_pred_dc(MpegEncContext * s, int n, | 363 static int msmpeg4_pred_dc(MpegEncContext * s, int n, |
364 UINT16 **dc_val_ptr, int *dir_ptr) | 364 INT16 **dc_val_ptr, int *dir_ptr) |
365 { | 365 { |
366 int a, b, c, x, y, wrap, pred, scale; | 366 int a, b, c, x, y, wrap, pred, scale; |
367 UINT16 *dc_val; | 367 INT16 *dc_val; |
368 | 368 |
369 /* find prediction */ | 369 /* find prediction */ |
370 if (n < 4) { | 370 if (n < 4) { |
371 x = 2 * s->mb_x + 1 + (n & 1); | 371 x = 2 * s->mb_x + 1 + (n & 1); |
372 y = 2 * s->mb_y + 1 + ((n & 2) >> 1); | 372 y = 2 * s->mb_y + 1 + ((n & 2) >> 1); |
415 | 415 |
416 static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr) | 416 static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr) |
417 { | 417 { |
418 int sign, code; | 418 int sign, code; |
419 int pred; | 419 int pred; |
420 UINT16 *dc_val; | 420 INT16 *dc_val; |
421 | 421 |
422 pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr); | 422 pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr); |
423 | 423 |
424 /* update predictor */ | 424 /* update predictor */ |
425 if (n < 4) { | 425 if (n < 4) { |
861 } | 861 } |
862 | 862 |
863 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) | 863 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) |
864 { | 864 { |
865 int level, pred; | 865 int level, pred; |
866 UINT16 *dc_val; | 866 INT16 *dc_val; |
867 | 867 |
868 if (n < 4) { | 868 if (n < 4) { |
869 level = get_vlc(&s->gb, &dc_lum_vlc[s->dc_table_index]); | 869 level = get_vlc(&s->gb, &dc_lum_vlc[s->dc_table_index]); |
870 } else { | 870 } else { |
871 level = get_vlc(&s->gb, &dc_chroma_vlc[s->dc_table_index]); | 871 level = get_vlc(&s->gb, &dc_chroma_vlc[s->dc_table_index]); |