[xiph-commits] r16187 - branches/theora-thusnelda/lib/enc

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2009-06-28 08:06:54 -0700 (Sun, 28 Jun 2009)
New Revision: 16187

Modified:
   branches/theora-thusnelda/lib/enc/encfrag.c
Log:
Subtract the mean from intra SATD, not inter SATD.


Modified: branches/theora-thusnelda/lib/enc/encfrag.c
===================================================================
--- branches/theora-thusnelda/lib/enc/encfrag.c	2009-06-26 04:00:07 UTC (rev 16186)
+++ branches/theora-thusnelda/lib/enc/encfrag.c	2009-06-28 15:06:54 UTC (rev 16187)
@@ -330,8 +330,7 @@
  const unsigned char *_ref,int _ystride,unsigned _thresh){
   ogg_int16_t buf[64];
   oc_diff_hadamard(buf,_src,_ref,_ystride);
-  return oc_hadamard_sad_thresh(buf,_thresh)
-   -abs(buf[0]+buf[1]+buf[2]+buf[3]+buf[4]+buf[5]+buf[6]+buf[7]);
+  return oc_hadamard_sad_thresh(buf,_thresh);
 }
 
 unsigned oc_enc_frag_satd2_thresh(const oc_enc_ctx *_enc,
@@ -357,7 +356,8 @@
 unsigned oc_enc_frag_intra_satd_c(const unsigned char *_src,int _ystride){
   ogg_int16_t buf[64];
   oc_intra_hadamard(buf,_src,_ystride);
-  return oc_hadamard_sad_thresh(buf,0xFF000);
+  return oc_hadamard_sad_thresh(buf,0xFF000)
+   -abs(buf[0]+buf[1]+buf[2]+buf[3]+buf[4]+buf[5]+buf[6]+buf[7]);
 }
 
 void oc_enc_frag_copy2(const oc_enc_ctx *_enc,unsigned char *_dst,