Mercurial > libavcodec.hg

comparison vp3.c @ 2709:a119d4eb53d7 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix 4MV MC and reinstate new MC VLC
author melanson
date Wed, 18 May 2005 17:14:59 +0000
parents a23c44f7ed60
children 9c1a436dac6b
comparison
equal deleted inserted replaced
2708:97c135899d7d 2709:a119d4eb53d7
1514 1514
1515 case MODE_INTER_PLUS_MV: 1515 case MODE_INTER_PLUS_MV:
1516 case MODE_GOLDEN_MV: 1516 case MODE_GOLDEN_MV:
1517 /* all 6 fragments use the same motion vector */ 1517 /* all 6 fragments use the same motion vector */
1518 if (coding_mode == 0) { 1518 if (coding_mode == 0) {
1519 #if 0 1519 #if 1
1520 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; 1520 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
1521 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; 1521 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
1522 #else 1522 #else
1523 motion_x[0] = get_motion_vector_vlc(gb); 1523 motion_x[0] = get_motion_vector_vlc(gb);
1524 motion_y[0] = get_motion_vector_vlc(gb); 1524 motion_y[0] = get_motion_vector_vlc(gb);
1546 /* fetch 4 vectors from the bitstream, one for each 1546 /* fetch 4 vectors from the bitstream, one for each
1547 * Y fragment, then average for the C fragment vectors */ 1547 * Y fragment, then average for the C fragment vectors */
1548 motion_x[4] = motion_y[4] = 0; 1548 motion_x[4] = motion_y[4] = 0;
1549 for (k = 0; k < 4; k++) { 1549 for (k = 0; k < 4; k++) {
1550 if (coding_mode == 0) { 1550 if (coding_mode == 0) {
1551 #if 0 1551 #if 1
1552 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; 1552 motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
1553 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; 1553 motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
1554 #else 1554 #else
1555 motion_x[k] = get_motion_vector_vlc(gb); 1555 motion_x[k] = get_motion_vector_vlc(gb);
1556 motion_y[k] = get_motion_vector_vlc(gb); 1556 motion_y[k] = get_motion_vector_vlc(gb);
1557 #endif 1557 #endif
1558 } else { 1558 } else {