[xiph-commits] r9163 - experimental/derf/theora-exp/lib

[tterribe at motherfish-iii.xiph.org]

Author: tterribe
Date: 2005-04-21 08:55:13 -0700 (Thu, 21 Apr 2005)
New Revision: 9163

Modified:
   experimental/derf/theora-exp/lib/Makefile.am
   experimental/derf/theora-exp/lib/encode.c
Log:
Always set the block QI list to the INTER list in the encoder.
In the case that intra_bits was smaller than inter_bits before adding in the
 cost of uncoded blocks, the QI list was never getting set.
If the frame is truly coded as an INTRA frame, the list will be reset to the
 INTRA list in oc_enc_mark_all_intra().


Modified: experimental/derf/theora-exp/lib/Makefile.am
===================================================================
--- experimental/derf/theora-exp/lib/Makefile.am	2005-04-21 12:50:27 UTC (rev 9162)
+++ experimental/derf/theora-exp/lib/Makefile.am	2005-04-21 15:55:13 UTC (rev 9163)
@@ -1,8 +1,23 @@
 lib_LTLIBRARIES = libtheorabase.la libtheoraenc.la libtheoradec.la
 
 INCLUDES = -I $(top_srcdir)/include
-AM_CFLAGS = $(OGG_CFLAGS)
+AM_CFLAGS = $(OGG_CFLAGS) @OPTIMIZATION_CFLAGS@
 
+if OC_X86ASM
+X86ASMSOURCES = \
+	x86/mmxstate.c \
+	x86/x86state.c \
+	x86/mmxfrag.c \
+	x86/cpu.c 
+X86ASMHEADERS = 
+else
+X86ASMSOURCES = 
+X86ASMHEADERS = \
+	x86/mmxstate.c \
+	x86/x86state.c \
+	x86/mmxfrag.c \
+	x86/cpu.c 
+endif
 noinst_HEADERS = \
 	dct.h \
 	decint.h \
@@ -17,16 +32,22 @@
 	internal.h \
 	ocintrin.h \
 	psych.h \
-	quant.h 
+	quant.h \
+	x86/x86int.h \
+	x86/cpu.h \
+	$(X86ASMHEADERS)
 
+
 libtheorabase_la_SOURCES = \
 	fragment.c \
 	idct.c \
 	info.c \
 	internal.c \
 	quant.c \
-	state.c
+	state.c \
+	$(X86ASMSOURCES)
 
+
 libtheorabase_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
 
 libtheoraenc_la_SOURCES = \
@@ -49,4 +70,3 @@
 	huffdec.c
 
 libtheoradec_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ @OGG_LIBS@
-

Modified: experimental/derf/theora-exp/lib/encode.c
===================================================================
--- experimental/derf/theora-exp/lib/encode.c	2005-04-21 12:50:27 UTC (rev 9162)
+++ experimental/derf/theora-exp/lib/encode.c	2005-04-21 15:55:13 UTC (rev 9163)
@@ -2278,13 +2278,13 @@
   inter_bits+=oc_enc_partial_sb_flags_pack(_enc);
   inter_bits+=oc_enc_coded_sb_flags_pack(_enc);
   inter_bits+=oc_enc_coded_block_flags_pack(_enc);
+  /*Select the quantizer list for INTER frames.*/
+  _enc->state.nqis=_enc->nqis[OC_INTER_FRAME];
+  for(qii=0;qii<_enc->state.nqis;qii++){
+    _enc->state.qis[qii]=_enc->qis[OC_INTER_FRAME][qii];
+  }
   if(intra_bits>inter_bits){
     _enc->est_bits=inter_bits;
-    /*Select the quantizer list for INTER frames.*/
-    _enc->state.nqis=_enc->nqis[OC_INTER_FRAME];
-    for(qii=0;qii<_enc->state.nqis;qii++){
-      _enc->state.qis[qii]=_enc->qis[OC_INTER_FRAME][qii];
-    }
     return OC_INTER_FRAME;
   }
   /*All INTRA mode is smaller, but we haven't counted up the cost of all the