changeset 9290:0bd35457454e libavcodec

Record MPEG-4 sprite trajectory points [up to num_sprite_warping_points][isY].
author gb
date Mon, 30 Mar 2009 20:39:08 +0000
parents 238dd89b7ac3
children 6220870901f5
files h263.c mpegvideo.h
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/h263.c	Mon Mar 30 15:36:59 2009 +0000
+++ b/h263.c	Mon Mar 30 20:39:08 2009 +0000
@@ -5339,9 +5339,11 @@
         }
         skip_bits1(gb); /* marker bit */
 //printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy);
-        d[i][0]= x;
-        d[i][1]= y;
-    }
+        s->sprite_traj[i][0]= d[i][0]= x;
+        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<<beta )<h) beta++; // there seems to be a typo in the mpeg4 std for the definition of w' and h'
--- a/mpegvideo.h	Mon Mar 30 15:36:59 2009 +0000
+++ b/mpegvideo.h	Mon Mar 30 20:39:08 2009 +0000
@@ -519,6 +519,7 @@
     int sprite_brightness_change;
     int num_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_delta[2][2];          ///< sprite_delta [isY][isMVY]
     int sprite_shift[2];             ///< sprite shift [isChroma]