Commit 6df7a2d0 authored by gb's avatar gb

Record MPEG-4 sprite trajectory points [up to num_sprite_warping_points][isY].


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18250 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 8d7b4423
...@@ -5339,9 +5339,11 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb ...@@ -5339,9 +5339,11 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb
} }
skip_bits1(gb); /* marker bit */ skip_bits1(gb); /* marker bit */
//printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy); //printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy);
d[i][0]= x; s->sprite_traj[i][0]= d[i][0]= x;
d[i][1]= y; s->sprite_traj[i][1]= d[i][1]= y;
} }
for(; i<4; i++)
s->sprite_traj[i][0]= s->sprite_traj[i][1]= 0;
while((1<<alpha)<w) alpha++; while((1<<alpha)<w) alpha++;
while((1<<beta )<h) beta++; // there seems to be a typo in the mpeg4 std for the definition of w' and h' while((1<<beta )<h) beta++; // there seems to be a typo in the mpeg4 std for the definition of w' and h'
......
...@@ -519,6 +519,7 @@ typedef struct MpegEncContext { ...@@ -519,6 +519,7 @@ typedef struct MpegEncContext {
int sprite_brightness_change; int sprite_brightness_change;
int num_sprite_warping_points; int num_sprite_warping_points;
int real_sprite_warping_points; int real_sprite_warping_points;
uint16_t sprite_traj[4][2]; ///< sprite trajectory points
int sprite_offset[2][2]; ///< sprite offset[isChroma][isMVY] int sprite_offset[2][2]; ///< sprite offset[isChroma][isMVY]
int sprite_delta[2][2]; ///< sprite_delta [isY][isMVY] int sprite_delta[2][2]; ///< sprite_delta [isY][isMVY]
int sprite_shift[2]; ///< sprite shift [isChroma] int sprite_shift[2]; ///< sprite shift [isChroma]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment