har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Directly check whether a fragment is coded for 4MV mode instead of iterating

Browse Source 
through the entire coded fragment list.

Originally committed as revision 21803 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-02-13 18:55:27 +00:00
parent 15675ce609
commit eb691ef219
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vp3.c
View File

@ -735,7 +735,7 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
*/ */
static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
{ {
int j, k, l, sb_x, sb_y; int j, k, sb_x, sb_y;
int coding_mode; int coding_mode;
int motion_x[6]; int motion_x[6];
int motion_y[6]; int motion_y[6];
@ -802,10 +802,7 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
motion_x[4] = motion_y[4] = 0; motion_x[4] = motion_y[4] = 0;
for (k = 0; k < 4; k++) { for (k = 0; k < 4; k++) {
current_fragment = BLOCK_Y*s->fragment_width + BLOCK_X; current_fragment = BLOCK_Y*s->fragment_width + BLOCK_X;
for (l = 0; l < s->coded_fragment_list_index; l++) if (s->all_fragments[current_fragment].coding_method != MODE_COPY) {
if (s->coded_fragment_list[l] == current_fragment)
break;
if (l < s->coded_fragment_list_index) {
if (coding_mode == 0) { if (coding_mode == 0) {
motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];