virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

fixing msmpeg4v2 bugs (is bugfree now afaik)

Browse Source 
Originally committed as revision 378 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-04-05 16:51:12 +00:00
parent 3c4f1840e6
commit 2ed627e64e
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/msmpeg4.c
View File

@ -368,10 +368,9 @@ void msmpeg4_encode_mb(MpegEncContext * s,
/* strongly inspirated from MPEG4, but not exactly the same ! */ /* strongly inspirated from MPEG4, but not exactly the same ! */
void msmpeg4_dc_scale(MpegEncContext * s) void msmpeg4_dc_scale(MpegEncContext * s)
{ {
if (s->qscale < 5){ if (s->qscale < 5 || s->msmpeg4_version==2){
s->y_dc_scale = 8; s->y_dc_scale = 8;
s->c_dc_scale = 8; s->c_dc_scale = 8;
// s->c_dc_scale = (s->qscale + 13)>>1;
}else if (s->qscale < 9){ }else if (s->qscale < 9){
s->y_dc_scale = 2 * s->qscale; s->y_dc_scale = 2 * s->qscale;
s->c_dc_scale = (s->qscale + 13)>>1; s->c_dc_scale = (s->qscale + 13)>>1;
@ -379,24 +378,6 @@ void msmpeg4_dc_scale(MpegEncContext * s)
s->y_dc_scale = s->qscale + 8; s->y_dc_scale = s->qscale + 8;
s->c_dc_scale = (s->qscale + 13)>>1; s->c_dc_scale = (s->qscale + 13)>>1;
} }
// this differs for quant >24 from mpeg4
// if(s->qscale==13) s->c_dc_scale=14;
// if(s->qscale>=6)
// printf("%d", s->qscale);
/* s->c_dc_scale values (found by Michael Nidermayer)
qscale=2 -> 8 (yes iam sure about that)
qscale=3 -> 8
qscale=4 -> 8
qscale=5 -> 9
qscale=6 -> 9
qscale=7 -> 10
qscale=8 -> 10
qscale=9 -> 11
qscale=10-> 11
*/
} }
/* dir = 0: left, dir = 1: top prediction */ /* dir = 0: left, dir = 1: top prediction */
@ -638,7 +619,7 @@ static void init_h263_dc_for_msmpeg4()
int level, uni_code, uni_len; int level, uni_code, uni_len;
inited=1; inited=1;
for(level=-255; level<256; level++){ for(level=-256; level<256; level++){
int size, v, l; int size, v, l;
/* find number of bits */ /* find number of bits */
size = 0; size = 0;
@ -829,8 +810,6 @@ int msmpeg4_decode_picture_header(MpegEncContext * s)
if(s->msmpeg4_version==2) if(s->msmpeg4_version==2)
{ {
int i; int i;
printf("%s q:%d s:%X ", s->pict_type == I_TYPE ? "I" : "P" , s->qscale,
s->pict_type == I_TYPE ? code : s->use_skip_mb_code);
for(i=0; i<s->gb.size*8; i++) for(i=0; i<s->gb.size*8; i++)
// printf("%d", get_bits1(&s->gb)); // printf("%d", get_bits1(&s->gb));
get_bits1(&s->gb); get_bits1(&s->gb);
@ -908,8 +887,6 @@ int msmpeg4v2_decode_mb(MpegEncContext *s,
DCTELEM block[6][64]) DCTELEM block[6][64])
{ {
int cbp, code, i; int cbp, code, i;
//printf("M");
//fflush(stderr); fflush(stdout);
if (s->pict_type == P_TYPE) { if (s->pict_type == P_TYPE) {
if (s->use_skip_mb_code) { if (s->use_skip_mb_code) {
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
@ -932,10 +909,7 @@ int msmpeg4v2_decode_mb(MpegEncContext *s,
cbp = code & 0x3; cbp = code & 0x3;
} else { } else {
s->mb_intra = 1; s->mb_intra = 1;
//printf("%X ", show_bits(&s->gb, 24));
cbp= get_vlc(&s->gb, &v2_intra_cbpc_vlc); cbp= get_vlc(&s->gb, &v2_intra_cbpc_vlc);
//printf("%X ", show_bits(&s->gb, 24));
//printf("CBP: %X ",cbp);
} }
if (!s->mb_intra) { if (!s->mb_intra) {
@ -953,17 +927,13 @@ int msmpeg4v2_decode_mb(MpegEncContext *s,
s->mv[0][0][0] = mx; s->mv[0][0][0] = mx;
s->mv[0][0][1] = my; s->mv[0][0][1] = my;
} else { } else {
//if(s->pict_type == P_TYPE) printf("intra cbp: %X", cbp);
s->ac_pred = get_bits1(&s->gb); s->ac_pred = get_bits1(&s->gb);
//printf("AC: %d ",s->ac_pred);
cbp|= get_vlc(&s->gb, &cbpy_vlc)<<2; cbp|= get_vlc(&s->gb, &cbpy_vlc)<<2;
//printf("cbp: %X ",cbp);
} }
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1) < 0) if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1) < 0)
{ {
//fflush(stderr); fflush(stdout);
fprintf(stderr,"\nIgnoring error while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); fprintf(stderr,"\nIgnoring error while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
return -1; return -1;
} }
@ -1218,7 +1188,6 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
} }
if (level < 0) if (level < 0)
return -1; return -1;
level-=256; level-=256;
}else{ //FIXME optimize use unified tables & index }else{ //FIXME optimize use unified tables & index
if (n < 4) { if (n < 4) {