[svn] / branches / dev-api-4 / xvidcore / src / bitstream / bitstream.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/bitstream/bitstream.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1058, Mon Jun 9 19:42:25 2003 UTC revision 1079, Sun Jun 29 16:17:51 2003 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: bitstream.c,v 1.39.2.12 2003-06-09 19:42:18 edgomez Exp $   * $Id: bitstream.c,v 1.39.2.14 2003-06-29 16:17:51 chl Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 36  Line 36 
36  static uint32_t __inline  static uint32_t __inline
37  log2bin(uint32_t value)  log2bin(uint32_t value)
38  {  {
 /* Changed by Chenm001 */  
 #if !defined(_MSC_VER)  
39          int n = 0;          int n = 0;
40    
41          while (value) {          while (value) {
# Line 45  Line 43 
43                  n++;                  n++;
44          }          }
45          return n;          return n;
 #else  
         __asm {  
                 bsr eax, value  
                 inc eax  
         }  
 #endif  
46  }  }
47    
48    
# Line 1193  Line 1185 
1185          if (vol_ver_id != 1)          if (vol_ver_id != 1)
1186          {       if ((pParam->vol_flags & XVID_VOL_GMC))          {       if ((pParam->vol_flags & XVID_VOL_GMC))
1187                  {       BitstreamPutBits(bs, 2, 2);             /* sprite_enable=='GMC' */                  {       BitstreamPutBits(bs, 2, 2);             /* sprite_enable=='GMC' */
1188                          BitstreamPutBits(bs, 2, 6);             /* no_of_sprite_warping_points */                          BitstreamPutBits(bs, 3, 6);             /* no_of_sprite_warping_points */
1189                          BitstreamPutBits(bs, 3, 2);             /* sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 */                          BitstreamPutBits(bs, 3, 2);             /* sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 */
1190                          BitstreamPutBit(bs, 0);                 /* sprite_brightness_change (not supported) */                          BitstreamPutBit(bs, 0);                 /* sprite_brightness_change (not supported) */
1191    
# Line 1330  Line 1322 
1322          if (frame->coding_type == S_VOP) {          if (frame->coding_type == S_VOP) {
1323                  if (1)  {               /* no_of_sprite_warping_points>=1 (we use 2!) */                  if (1)  {               /* no_of_sprite_warping_points>=1 (we use 2!) */
1324                          int k;                          int k;
1325                          for (k=0;k<2;k++)                          for (k=0;k<3;k++)
1326                          {                          {
1327                                  bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */                                  bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */
1328                                  WRITE_MARKER();                                  WRITE_MARKER();
Legend:
Removed from v.1058  
changed lines
  Added in v.1079
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4