[xiph-commits] r8885 - in experimental/derf/theora-exp: . examples lib

[tterribe at motherfish-iii.xiph.org]

Author: tterribe
Date: 2005-02-08 23:43:24 -0800 (Tue, 08 Feb 2005)
New Revision: 8885

Modified:
   experimental/derf/theora-exp/README
   experimental/derf/theora-exp/examples/encoder_example.c
   experimental/derf/theora-exp/lib/fdct.c
   experimental/derf/theora-exp/lib/huffman.h
Log:
Documentation updates and fixes, and one extraneous #include removed.


Modified: experimental/derf/theora-exp/README
===================================================================
--- experimental/derf/theora-exp/README	2005-02-09 07:34:26 UTC (rev 8884)
+++ experimental/derf/theora-exp/README	2005-02-09 07:43:24 UTC (rev 8885)
@@ -27,12 +27,9 @@
 
 Encoder:
 The encoder is highly experimental.
-It currently generates valid bitstreams using ALL of the decoder features
- supported above.
-However, it is also currently broken, producing pretty horrible quality files
- with high bitrates.
-This should be tracked down and fixed before too much longer, but it hasn't
- happened yet.
+It currently generates bitstreams using ALL of the decoder features supported
+ above.
+There are still a few outstanding bugs, and the HVS model is very experimental.
 
 Building:
 A simple GNU Makefile and MSVC++ 6 project files are provided.

Modified: experimental/derf/theora-exp/examples/encoder_example.c
===================================================================
--- experimental/derf/theora-exp/examples/encoder_example.c	2005-02-09 07:34:26 UTC (rev 8884)
+++ experimental/derf/theora-exp/examples/encoder_example.c	2005-02-09 07:43:24 UTC (rev 8885)
@@ -390,13 +390,6 @@
       tmp+=c_w;
       _aux+=c_w;
     }
-    /*For actual interlaced material, this would have to be done separately on
-       each field, and the shift amounts would be different.
-      C_r moves down 1/8, C_b up 3/8 in the top field, and C_r moves down 3/8,
-       C_b up 1/8 in the bottom field.
-      The corresponding filters are:
-       Down 1/8 (reverse order for up): [3 -11 125 15 -4 0]/128
-       Down 3/8 (reverse order for up): [4 -19 98 56 -13 2]/128*/
     switch(pli){
       case 1:{
         tmp-=c_sz;
@@ -428,7 +421,7 @@
       case 2:{
         tmp-=c_sz;
         /*Slide C_r down a quarter-pel.
-          This is the same as the horizonal filter.*/
+          This is the same as the horizontal filter.*/
         for(x=0;x<c_w;x++){
           for(y=0;y<OC_MINI(c_h,2);y++){
             _dst[y*c_w]=OC_CLAMPI(0,4*tmp[0]-17*tmp[OC_MAXI(y-1,0)*c_w]+
@@ -451,6 +444,13 @@
         }
       }break;
     }
+    /*For actual interlaced material, this would have to be done separately on
+       each field, and the shift amounts would be different.
+      C_r moves down 1/8, C_b up 3/8 in the top field, and C_r moves down 3/8,
+       C_b up 1/8 in the bottom field.
+      The corresponding filters would be:
+       Down 1/8 (reverse order for up): [3 -11 125 15 -4 0]/128
+       Down 3/8 (reverse order for up): [4 -19 98 56 -13 2]/128*/
   }
 }
 

Modified: experimental/derf/theora-exp/lib/fdct.c
===================================================================
--- experimental/derf/theora-exp/lib/fdct.c	2005-02-09 07:34:26 UTC (rev 8884)
+++ experimental/derf/theora-exp/lib/fdct.c	2005-02-09 07:43:24 UTC (rev 8885)
@@ -219,8 +219,6 @@
 
 
 
-#include <stdio.h>
-
 /*Pads a single row of a partial block and then performs a forward Type-II DCT
    on the result.
   The output is scaled by a factor of 2 from the orthonormal version of the

Modified: experimental/derf/theora-exp/lib/huffman.h
===================================================================
--- experimental/derf/theora-exp/lib/huffman.h	2005-02-09 07:34:26 UTC (rev 8884)
+++ experimental/derf/theora-exp/lib/huffman.h	2005-02-09 07:43:24 UTC (rev 8885)
@@ -4,7 +4,7 @@
 # include "ocintrin.h"
 
 /*The range of valid quantized DCT coefficient values.
-  VP3 used 511, but the bitstream is capable of 580.*/
+  VP3 used 511 in the encoder, but the bitstream is capable of 580.*/
 #define OC_DCT_VAL_RANGE         (580)
 
 #define OC_NDCT_TOKEN_BITS       (5)