[xiph-commits] r9046 - in branches/theora-mmx: . debian lib

[j at motherfish-iii.xiph.org]

Author: j
Date: 2005-03-07 12:23:19 -0800 (Mon, 07 Mar 2005)
New Revision: 9046

Added:
   branches/theora-mmx/debian/watch
Modified:
   branches/theora-mmx/
   branches/theora-mmx/configure.ac
   branches/theora-mmx/lib/encoder_toplevel.c
Log:
merge with trunk


Property changes on: branches/theora-mmx
___________________________________________________________________
Name: branch-point
   - 9006
   + 9045

Modified: branches/theora-mmx/configure.ac
===================================================================
--- branches/theora-mmx/configure.ac	2005-03-06 07:32:29 UTC (rev 9045)
+++ branches/theora-mmx/configure.ac	2005-03-07 20:23:19 UTC (rev 9046)
@@ -188,7 +188,10 @@
 AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
   HAVE_OSS=yes
   break
-],AC_MSG_WARN([OSS audio support not found -- not compiling player_example]))
+])
+if test x$HAVE_OSS != xyes; then
+  AC_MSG_WARN([OSS audio support not found -- not compiling player_example])
+fi
 
 if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then
   BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"

Copied: branches/theora-mmx/debian/watch (from rev 9045, trunk/theora/debian/watch)

Modified: branches/theora-mmx/lib/encoder_toplevel.c
===================================================================
--- branches/theora-mmx/lib/encoder_toplevel.c	2005-03-06 07:32:29 UTC (rev 9045)
+++ branches/theora-mmx/lib/encoder_toplevel.c	2005-03-07 20:23:19 UTC (rev 9046)
@@ -739,12 +739,11 @@
     /* Increment the frames since last key frame count */
     cpi->LastKeyFrame++;
 
-    if ( cpi->MotionScore > 0 ){
-      cpi->DropCount = 0;
+    /* Proceed with the frame update. */
+    UpdateFrame(cpi);
+    cpi->DropCount = 0;
 
-      /* Proceed with the frame update. */
-      UpdateFrame(cpi);
-
+    if ( cpi->MotionScore > 0 ){
       /* Note the Quantizer used for each block coded. */
       for ( i = 0; i < cpi->pb.UnitFragments; i++ ){
         if ( cpi->pb.display_fragments[i] ){
@@ -864,8 +863,8 @@
 
   /* Set key frame data rate target; this is nominal keyframe size */
   cpi->Configuration.KeyFrameDataTarget = (c->keyframe_data_target_bitrate *
-                                           c->fps_numerator /
-                                           c->fps_denominator ) / 8;
+                                           c->fps_denominator /
+                                           c->fps_numerator ) / 8;
 
   /* Note the height and width in the pre-processor control structure. */
   cpi->ScanConfig.VideoFrameHeight = cpi->pb.info.height;