# HG changeset patch
# User romansh
# Date 1141095288 0
# Node ID 28a087ad41d1f7df5320b69038acaa062449e35e
# Parent  27e1b9632715e9370b3333a89a33ac7cb98584ba
Assign class 2 to most macroblocks by default, instead of a more conservative
method defined by SMPTE

Patch by Dan Maas

diff -r 27e1b9632715 -r 28a087ad41d1 dv.c
--- a/dv.c	Mon Feb 27 12:17:20 2006 +0000
+++ b/dv.c	Tue Feb 28 02:54:48 2006 +0000
@@ -658,8 +658,22 @@
                                               const uint8_t* zigzag_scan, const int *weight, int bias)
 {
     int i, area;
+    /* We offer two different methods for class number assignment: the
+       method suggested in SMPTE 314M Table 22, and an improved
+       method. The SMPTE method is very conservative; it assigns class
+       3 (i.e. severe quantization) to any block where the largest AC
+       component is greater than 36. ffmpeg's DV encoder tracks AC bit
+       consumption precisely, so there is no need to bias most blocks
+       towards strongly lossy compression. Instead, we assign class 2
+       to most blocks, and use class 3 only when strictly necessary
+       (for blocks whose largest AC component exceeds 255). */
+
+#if 0 /* SMPTE spec method */
     static const int classes[] = {12, 24, 36, 0xffff};
-    int max=12;
+#else /* improved ffmpeg method */
+    static const int classes[] = {-1, -1, 255, 0xffff};
+#endif
+    int max=classes[0];
     int prev=0;
 
     bi->mb[0] = blk[0];