[svn] / branches / dev-api-4 / xvidcore / src / utils / mbtransquant.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/utils/mbtransquant.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1011, Fri May 9 22:03:13 2003 UTC revision 1053, Mon Jun 9 01:25:19 2003 UTC
# Line 21  Line 21 
21   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: mbtransquant.c,v 1.21.2.10 2003-05-09 22:03:13 chl Exp $   * $Id: mbtransquant.c,v 1.21.2.13 2003-06-09 01:25:05 edgomez Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
28  #include <string.h>  #include <stdio.h>
29  #include <stdlib.h>  #include <stdlib.h>
30    #include <string.h>
31    
32  #include "../portab.h"  #include "../portab.h"
33  #include "mbfunctions.h"  #include "mbfunctions.h"
# Line 161  Line 162 
162    
163    
164  static int  static int
165  dct_quantize_trellis_h263_c(int16_t *const Out, const int16_t *const In, int Q, const uint16_t * const Zigzag, int Non_Zero);  dct_quantize_trellis_h263_c(int16_t *const Out,
166                                                            const int16_t *const In,
167                                                            int Q,
168                                                            const uint16_t * const Zigzag,
169                                                            int Non_Zero);
170    
171    #if 0
172  static int  static int
173  dct_quantize_trellis_mpeg_c(int16_t *const Out, const int16_t *const In, int Q, const uint16_t * const Zigzag, int Non_Zero);  dct_quantize_trellis_mpeg_c(int16_t *const Out,
174                                                            const int16_t *const In,
175                                                            int Q,
176                                                            const uint16_t * const Zigzag,
177                                                            int Non_Zero);
178    #endif
179    
180  /* Quantize all blocks -- Inter mode */  /* Quantize all blocks -- Inter mode */
181  static __inline uint8_t  static __inline uint8_t
# Line 195  Line 205 
205                          }                          }
206                  } else {                  } else {
207                          sum = quant4_inter(&qcoeff[i * 64], &data[i * 64], pMB->quant);                          sum = quant4_inter(&qcoeff[i * 64], &data[i * 64], pMB->quant);
208  //                      if ( (sum) && (frame->vop_flags & XVID_VOP_TRELLISQUANT) )  #if 0
209  //                              sum = dct_quantize_trellis_mpeg_c (&qcoeff[i*64], &data[i*64], pMB->quant)+1;                          if ( (sum) && (frame->vop_flags & XVID_VOP_TRELLISQUANT) )
210                                    sum = dct_quantize_trellis_mpeg_c (&qcoeff[i*64], &data[i*64], pMB->quant)+1;
211    #endif
212                  }                  }
213                  stop_quant_timer();                  stop_quant_timer();
214    
# Line 545  Line 557 
557    
558          /* left blocks */          /* left blocks */
559    
560          // 1=2, 2=4, 4=8, 8=1          /* 1=2, 2=4, 4=8, 8=1 */
561          MOVLINE(tmp, LINE(0, 1));          MOVLINE(tmp, LINE(0, 1));
562          MOVLINE(LINE(0, 1), LINE(0, 2));          MOVLINE(LINE(0, 1), LINE(0, 2));
563          MOVLINE(LINE(0, 2), LINE(0, 4));          MOVLINE(LINE(0, 2), LINE(0, 4));
564          MOVLINE(LINE(0, 4), LINE(2, 0));          MOVLINE(LINE(0, 4), LINE(2, 0));
565          MOVLINE(LINE(2, 0), tmp);          MOVLINE(LINE(2, 0), tmp);
566    
567          // 3=6, 6=12, 12=9, 9=3          /* 3=6, 6=12, 12=9, 9=3 */
568          MOVLINE(tmp, LINE(0, 3));          MOVLINE(tmp, LINE(0, 3));
569          MOVLINE(LINE(0, 3), LINE(0, 6));          MOVLINE(LINE(0, 3), LINE(0, 6));
570          MOVLINE(LINE(0, 6), LINE(2, 4));          MOVLINE(LINE(0, 6), LINE(2, 4));
571          MOVLINE(LINE(2, 4), LINE(2, 1));          MOVLINE(LINE(2, 4), LINE(2, 1));
572          MOVLINE(LINE(2, 1), tmp);          MOVLINE(LINE(2, 1), tmp);
573    
574          // 5=10, 10=5          /* 5=10, 10=5 */
575          MOVLINE(tmp, LINE(0, 5));          MOVLINE(tmp, LINE(0, 5));
576          MOVLINE(LINE(0, 5), LINE(2, 2));          MOVLINE(LINE(0, 5), LINE(2, 2));
577          MOVLINE(LINE(2, 2), tmp);          MOVLINE(LINE(2, 2), tmp);
578    
579          // 7=14, 14=13, 13=11, 11=7          /* 7=14, 14=13, 13=11, 11=7 */
580          MOVLINE(tmp, LINE(0, 7));          MOVLINE(tmp, LINE(0, 7));
581          MOVLINE(LINE(0, 7), LINE(2, 6));          MOVLINE(LINE(0, 7), LINE(2, 6));
582          MOVLINE(LINE(2, 6), LINE(2, 5));          MOVLINE(LINE(2, 6), LINE(2, 5));
# Line 573  Line 585 
585    
586          /* right blocks */          /* right blocks */
587    
588          // 1=2, 2=4, 4=8, 8=1          /* 1=2, 2=4, 4=8, 8=1 */
589          MOVLINE(tmp, LINE(1, 1));          MOVLINE(tmp, LINE(1, 1));
590          MOVLINE(LINE(1, 1), LINE(1, 2));          MOVLINE(LINE(1, 1), LINE(1, 2));
591          MOVLINE(LINE(1, 2), LINE(1, 4));          MOVLINE(LINE(1, 2), LINE(1, 4));
592          MOVLINE(LINE(1, 4), LINE(3, 0));          MOVLINE(LINE(1, 4), LINE(3, 0));
593          MOVLINE(LINE(3, 0), tmp);          MOVLINE(LINE(3, 0), tmp);
594    
595          // 3=6, 6=12, 12=9, 9=3          /* 3=6, 6=12, 12=9, 9=3 */
596          MOVLINE(tmp, LINE(1, 3));          MOVLINE(tmp, LINE(1, 3));
597          MOVLINE(LINE(1, 3), LINE(1, 6));          MOVLINE(LINE(1, 3), LINE(1, 6));
598          MOVLINE(LINE(1, 6), LINE(3, 4));          MOVLINE(LINE(1, 6), LINE(3, 4));
599          MOVLINE(LINE(3, 4), LINE(3, 1));          MOVLINE(LINE(3, 4), LINE(3, 1));
600          MOVLINE(LINE(3, 1), tmp);          MOVLINE(LINE(3, 1), tmp);
601    
602          // 5=10, 10=5          /* 5=10, 10=5 */
603          MOVLINE(tmp, LINE(1, 5));          MOVLINE(tmp, LINE(1, 5));
604          MOVLINE(LINE(1, 5), LINE(3, 2));          MOVLINE(LINE(1, 5), LINE(3, 2));
605          MOVLINE(LINE(3, 2), tmp);          MOVLINE(LINE(3, 2), tmp);
606    
607          // 7=14, 14=13, 13=11, 11=7          /* 7=14, 14=13, 13=11, 11=7 */
608          MOVLINE(tmp, LINE(1, 7));          MOVLINE(tmp, LINE(1, 7));
609          MOVLINE(LINE(1, 7), LINE(3, 6));          MOVLINE(LINE(1, 7), LINE(3, 6));
610          MOVLINE(LINE(3, 6), LINE(3, 5));          MOVLINE(LINE(3, 6), LINE(3, 5));
# Line 604  Line 616 
616    
617    
618    
619  /************************************************************************  /*****************************************************************************
620   *               Trellis based R-D optimal quantization                 *   *               Trellis based R-D optimal quantization
621   *                                                                      *   *
622   *   Trellis Quant code (C) 2003 Pascal Massimino skal(at)planet-d.net  *   *   Trellis Quant code (C) 2003 Pascal Massimino skal(at)planet-d.net
623   *                                                                      *   *
624   ************************************************************************/   ****************************************************************************/
625    
626    
627    #if 0
628  static int  static int
629  dct_quantize_trellis_inter_mpeg_c (int16_t *qcoeff, const int16_t *data, int quant)  dct_quantize_trellis_mpeg_c(int16_t *const Out,
630  { return 63; }                                                          const int16_t *const In,
631                                                            int Q,
632                                                            const uint16_t * const Zigzag,
633                                                            int Non_Zero)
634    {
635            return 63;
636    }
637    #endif
638    
639    /*----------------------------------------------------------------------------
640     *
641     *        Trellis-Based quantization
642     *
643     * So far I understand this paper:
644     *
645     *  "Trellis-Based R-D Optimal Quantization in H.263+"
646     *    J.Wen, M.Luttrell, J.Villasenor
647     *    IEEE Transactions on Image Processing, Vol.9, No.8, Aug. 2000.
648     *
649     * we are at stake with a simplified Bellmand-Ford / Dijkstra Single
650     * Source Shorted Path algo. But due to the underlying graph structure
651     * ("Trellis"), it can be turned into a dynamic programming algo,
652     * partially saving the explicit graph's nodes representation. And
653     * without using a heap, since the open frontier of the DAG is always
654     * known, and of fixed sized.
655     *--------------------------------------------------------------------------*/
656    
 //////////////////////////////////////////////////////////  
 //  
 //        Trellis-Based quantization  
 //  
 // So far I understand this paper:  
 //  
 //  "Trellis-Based R-D Optimal Quantization in H.263+"  
 //    J.Wen, M.Luttrell, J.Villasenor  
 //    IEEE Transactions on Image Processing, Vol.9, No.8, Aug. 2000.  
 //  
 // we are at stake with a simplified Bellmand-Ford / Dijkstra Single  
 // Source Shorted Path algo. But due to the underlying graph structure  
 // ("Trellis"), it can be turned into a dynamic programming algo,  
 // partially saving the explicit graph's nodes representation. And  
 // without using a heap, since the open frontier of the DAG is always  
 // known, and of fixed sized.  
 //  
 //////////////////////////////////////////////////////////  
657    
658    
659  //////////////////////////////////////////////////////////  /* Codes lengths for relevant levels. */
 // Codes lengths for relevant levels.  
660    
661    // let's factorize:    /* let's factorize: */
662  static const uint8_t Code_Len0[64] = {  static const uint8_t Code_Len0[64] = {
663    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
664    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 };    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 };
# Line 705  Line 723 
723     3, 4, 5, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9,10,10,10,10,10,10,10,10,12,12,13,13,12,13,14,15,15,     3, 4, 5, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9,10,10,10,10,10,10,10,10,12,12,13,13,12,13,14,15,15,
724    15,16,16,16,16,17,17,17,18,18,19,19,19,19,19,19,19,19,21,21,22,22,30,30,30,30,30,30,30,30,30,30 };    15,16,16,16,16,17,17,17,18,18,19,19,19,19,19,19,19,19,21,21,22,22,30,30,30,30,30,30,30,30,30,30 };
725    
726    // a few more table for LAST table:    /* a few more table for LAST table: */
727  static const uint8_t Code_Len21[64] = {  static const uint8_t Code_Len21[64] = {
728    13,20,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,    13,20,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
729    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30};    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30};
# Line 720  Line 738 
738    12,13,13,13,13,13,13,13,13,14,16,16,16,16,17,17,17,17,18,18,18,18,18,18,18,18,19,19,19,19,19,19};    12,13,13,13,13,13,13,13,13,14,16,16,16,16,17,17,17,17,18,18,18,18,18,18,18,18,19,19,19,19,19,19};
739    
740    
741  static const uint8_t * const B16_17_Code_Len[24] = { // levels [1..24]  static const uint8_t * const B16_17_Code_Len[24] = { /* levels [1..24] */
742    Code_Len20,Code_Len19,Code_Len18,Code_Len17,    Code_Len20,Code_Len19,Code_Len18,Code_Len17,
743    Code_Len16,Code_Len15,Code_Len14,Code_Len13,    Code_Len16,Code_Len15,Code_Len14,Code_Len13,
744    Code_Len12,Code_Len11,Code_Len10,Code_Len9,    Code_Len12,Code_Len11,Code_Len10,Code_Len9,
# Line 729  Line 747 
747    Code_Len2, Code_Len1, Code_Len1, Code_Len1,    Code_Len2, Code_Len1, Code_Len1, Code_Len1,
748  };  };
749    
750  static const uint8_t * const B16_17_Code_Len_Last[6] = { // levels [1..6]  static const uint8_t * const B16_17_Code_Len_Last[6] = { /* levels [1..6] */
751    Code_Len24,Code_Len23,Code_Len22,Code_Len21, Code_Len3, Code_Len1,    Code_Len24,Code_Len23,Code_Len22,Code_Len21, Code_Len3, Code_Len1,
752  };  };
753    
# Line 743  Line 761 
761  };  };
762  #undef TL  #undef TL
763    
764  static inline int Find_Last(const int16_t *C, const uint16_t *Zigzag, int i)  static __inline int Find_Last(const int16_t *C, const uint16_t *Zigzag, int i)
765  {  {
766    while(i>=0)    while(i>=0)
767      if (C[Zigzag[i]])      if (C[Zigzag[i]])
# Line 752  Line 770 
770    return -1;    return -1;
771  }  }
772    
773  //////////////////////////////////////////////////////////  /* this routine has been strippen of all debug code */
774    
775    static int
776    dct_quantize_trellis_h263_c(int16_t *const Out, const int16_t *const In, int Q, const uint16_t * const Zigzag, int Non_Zero)
777    {
778    
779        /*
780             * Note: We should search last non-zero coeffs on *real* DCT input coeffs (In[]),
781             * not quantized one (Out[]). However, it only improves the result *very*
782             * slightly (~0.01dB), whereas speed drops to crawling level :)
783             * Well, actually, taking 1 more coeff past Non_Zero into account sometimes helps.
784             */
785      typedef struct { int16_t Run, Level; } NODE;
786    
787      NODE Nodes[65], Last;
788      uint32_t Run_Costs0[64+1];
789      uint32_t * const Run_Costs = Run_Costs0 + 1;
790      const int Mult = 2*Q;
791      const int Bias = (Q-1) | 1;
792      const int Lev0 = Mult + Bias;
793      const int Lambda = Trellis_Lambda_Tabs[Q-1];    /* it's 1/lambda, actually */
794    
795      int Run_Start = -1;
796      uint32_t Min_Cost = 2<<16;
797    
798      int Last_Node = -1;
799      uint32_t Last_Cost = 0;
800    
801      int i, j;
802      Run_Costs[-1] = 2<<16;                          /* source (w/ CBP penalty) */
803    
804      Non_Zero = Find_Last(Out, Zigzag, Non_Zero);
805      if (Non_Zero<0)
806          return -1;
807    
808      for(i=0; i<=Non_Zero; i++)
809      {
810        const int AC = In[Zigzag[i]];
811        const int Level1 = Out[Zigzag[i]];
812        const int Dist0 = Lambda* AC*AC;
813        uint32_t Best_Cost = 0xf0000000;
814        Last_Cost += Dist0;
815    
816        if ((uint32_t)(Level1+1)<3)                 /* very specialized loop for -1,0,+1 */
817        {
818            int dQ;
819                    int Run;
820          uint32_t Cost0;
821    
822          if (AC<0) {
823            Nodes[i].Level = -1;
824            dQ = Lev0 + AC;
825          } else {
826            Nodes[i].Level = 1;
827            dQ = Lev0 - AC;
828          }
829                    Cost0 = Lambda*dQ*dQ;
830    
831          Nodes[i].Run = 1;
832          Best_Cost = (Code_Len20[0]<<16) + Run_Costs[i-1]+Cost0;
833          for(Run=i-Run_Start; Run>0; --Run)
834          {
835            const uint32_t Cost_Base = Cost0 + Run_Costs[i-Run];
836            const uint32_t Cost = Cost_Base + (Code_Len20[Run-1]<<16);
837            const uint32_t lCost = Cost_Base + (Code_Len24[Run-1]<<16);
838    
839              /*
840                       * TODO: what about tie-breaks? Should we favor short runs or
841                       * long runs? Although the error is the same, it would not be
842                       * spread the same way along high and low frequencies...
843                       */
844    
845                            /* (I'd say: favour short runs => hifreq errors (HVS) -- gruel ) */
846    
847            if (Cost<Best_Cost) {
848              Best_Cost    = Cost;
849              Nodes[i].Run = Run;
850            }
851    
852            if (lCost<Last_Cost) {
853              Last_Cost  = lCost;
854              Last.Run   = Run;
855              Last_Node  = i;
856            }
857          }
858          if (Last_Node==i)
859                            Last.Level = Nodes[i].Level;
860        }
861        else                      /* "big" levels */
862        {
863          const uint8_t *Tbl_L1, *Tbl_L2, *Tbl_L1_Last, *Tbl_L2_Last;
864          int Level2;
865          int dQ1, dQ2;
866          int Run;
867                    uint32_t Dist1,Dist2;
868                    int dDist21;
869    
870              if (Level1>1) {
871            dQ1 = Level1*Mult-AC + Bias;
872            dQ2 = dQ1 - Mult;
873            Level2 = Level1-1;
874            Tbl_L1      = (Level1<=24) ? B16_17_Code_Len[Level1-1]     : Code_Len0;
875            Tbl_L2      = (Level2<=24) ? B16_17_Code_Len[Level2-1]     : Code_Len0;
876            Tbl_L1_Last = (Level1<=6) ? B16_17_Code_Len_Last[Level1-1] : Code_Len0;
877            Tbl_L2_Last = (Level2<=6) ? B16_17_Code_Len_Last[Level2-1] : Code_Len0;
878          } else { /* Level1<-1 */
879            dQ1 = Level1*Mult-AC - Bias;
880            dQ2 = dQ1 + Mult;
881            Level2 = Level1 + 1;
882            Tbl_L1      = (Level1>=-24) ? B16_17_Code_Len[Level1^-1]      : Code_Len0;
883            Tbl_L2      = (Level2>=-24) ? B16_17_Code_Len[Level2^-1]      : Code_Len0;
884            Tbl_L1_Last = (Level1>=- 6) ? B16_17_Code_Len_Last[Level1^-1] : Code_Len0;
885            Tbl_L2_Last = (Level2>=- 6) ? B16_17_Code_Len_Last[Level2^-1] : Code_Len0;
886          }
887          Dist1 = Lambda*dQ1*dQ1;
888          Dist2 = Lambda*dQ2*dQ2;
889          dDist21 = Dist2-Dist1;
890    
891          for(Run=i-Run_Start; Run>0; --Run)
892          {
893            const uint32_t Cost_Base = Dist1 + Run_Costs[i-Run];
894            uint32_t Cost1, Cost2;
895            int bLevel;
896    
897    /*
898     * for sub-optimal (but slightly worth it, speed-wise) search, uncomment the following:
899     *      if (Cost_Base>=Best_Cost) continue;
900     * (? doesn't seem to have any effect -- gruel )
901     */
902    
903            Cost1 = Cost_Base + (Tbl_L1[Run-1]<<16);
904            Cost2 = Cost_Base + (Tbl_L2[Run-1]<<16) + dDist21;
905    
906            if (Cost2<Cost1) {
907                             Cost1 = Cost2;
908                             bLevel = Level2;
909                      } else
910                             bLevel = Level1;
911    
912            if (Cost1<Best_Cost) {
913              Best_Cost = Cost1;
914              Nodes[i].Run   = Run;
915              Nodes[i].Level = bLevel;
916            }
917    
918            Cost1 = Cost_Base + (Tbl_L1_Last[Run-1]<<16);
919            Cost2 = Cost_Base + (Tbl_L2_Last[Run-1]<<16) + dDist21;
920    
921            if (Cost2<Cost1) {
922                             Cost1 = Cost2;
923                             bLevel = Level2;
924                      } else
925                             bLevel = Level1;
926    
927            if (Cost1<Last_Cost) {
928              Last_Cost  = Cost1;
929              Last.Run   = Run;
930              Last.Level = bLevel;
931              Last_Node  = i;
932            }
933          } /* end of "for Run" */
934    
935        }
936    
937        Run_Costs[i] = Best_Cost;
938    
939        if (Best_Cost < Min_Cost + Dist0) {
940          Min_Cost = Best_Cost;
941          Run_Start = i;
942        }
943        else
944        {
945            /*
946                     * as noticed by Michael Niedermayer (michaelni at gmx.at), there's
947                     * a code shorter by 1 bit for a larger run (!), same level. We give
948                     * it a chance by not moving the left barrier too much.
949                     */
950    
951          while( Run_Costs[Run_Start]>Min_Cost+(1<<16) )
952            Run_Start++;
953    
954            /* spread on preceding coeffs the cost incurred by skipping this one */
955          for(j=Run_Start; j<i; ++j) Run_Costs[j] += Dist0;
956          Min_Cost += Dist0;
957        }
958      }
959    
960      if (Last_Node<0)
961        return -1;
962    
963           /* reconstruct optimal sequence backward with surviving paths */
964      memset(Out, 0x00, 64*sizeof(*Out));
965      Out[Zigzag[Last_Node]] = Last.Level;
966      i = Last_Node - Last.Run;
967      while(i>=0) {
968        Out[Zigzag[i]] = Nodes[i].Level;
969        i -= Nodes[i].Run;
970      }
971      return Last_Node;
972    }
973    
974    
975    
976    
977    
978    
979    
980    
981    
982    
983    
984    /* original version including heavy debugging info */
985    
986    #ifdef DBGTRELL
987    
988  #define DBG 0  #define DBG 0
989    
990  static uint32_t Evaluate_Cost(const int16_t *C, int Mult, int Bias,  static __inline uint32_t Evaluate_Cost(const int16_t *C, int Mult, int Bias,
991                                  const uint16_t * Zigzag, int Max, int Lambda)                                  const uint16_t * Zigzag, int Max, int Lambda)
992  {  {
993  #if (DBG>0)  #if (DBG>0)
994    const int16_t * const Ref = C + 6*64;    const int16_t * const Ref = C + 6*64;
995    int Last = Max;    int Last = Max;
   while(Last>=0 && C[Zigzag[Last]]==0) Last--;  
996    int Bits = 0;    int Bits = 0;
997      int Dist = 0;
998      int i;
999      uint32_t Cost;
1000    
1001      while(Last>=0 && C[Zigzag[Last]]==0)
1002            Last--;
1003    
1004    if (Last>=0) {    if (Last>=0) {
     Bits = 2;   // CBP  
1005      int j=0, j0=0;      int j=0, j0=0;
1006      int Run, Level;      int Run, Level;
1007    
1008        Bits = 2;   /* CBP */
1009      while(j<Last) {      while(j<Last) {
1010        while(!C[Zigzag[j]]) j++;        while(!C[Zigzag[j]])
1011        if (j==Last) break;                          j++;
1012          if (j==Last)
1013                            break;
1014        Level=C[Zigzag[j]];        Level=C[Zigzag[j]];
1015        Run = j - j0;        Run = j - j0;
1016        j0 = ++j;        j0 = ++j;
1017        if (Level>=-24 && Level<=24) Bits += B16_17_Code_Len[(Level<0) ? -Level-1 : Level-1][Run];        if (Level>=-24 && Level<=24)
1018        else Bits += 30;                          Bits += B16_17_Code_Len[(Level<0) ? -Level-1 : Level-1][Run];
1019          else
1020                            Bits += 30;
1021      }      }
1022      Level = C[Zigzag[Last]];      Level = C[Zigzag[Last]];
1023      Run = j - j0;      Run = j - j0;
1024      if (Level>=-6 && Level<=6) Bits += B16_17_Code_Len_Last[(Level<0) ? -Level-1 : Level-1][Run];      if (Level>=-6 && Level<=6)
1025      else Bits += 30;                  Bits += B16_17_Code_Len_Last[(Level<0) ? -Level-1 : Level-1][Run];
1026        else
1027                    Bits += 30;
1028    }    }
1029    
   int Dist = 0;  
   int i;  
1030    for(i=0; i<=Last; ++i) {    for(i=0; i<=Last; ++i) {
1031      int V = C[Zigzag[i]]*Mult;      int V = C[Zigzag[i]]*Mult;
1032      if      (V>0) V += Bias;      if (V>0)
1033      else if (V<0) V -= Bias;                  V += Bias;
1034        else
1035                    if (V<0)
1036                            V -= Bias;
1037      V -= Ref[Zigzag[i]];      V -= Ref[Zigzag[i]];
1038      Dist += V*V;      Dist += V*V;
1039    }    }
1040    uint32_t Cost = Lambda*Dist + (Bits<<16);    Cost = Lambda*Dist + (Bits<<16);
1041    if (DBG==1)    if (DBG==1)
1042      printf( " Last:%2d/%2d Cost = [(Bits=%5.0d) + Lambda*(Dist=%6.0d) = %d ] >>12= %d ", Last,Max, Bits, Dist, Cost, Cost>>12 );      printf( " Last:%2d/%2d Cost = [(Bits=%5.0d) + Lambda*(Dist=%6.0d) = %d ] >>12= %d ", Last,Max, Bits, Dist, Cost, Cost>>12 );
1043    return Cost;    return Cost;
# Line 807  Line 1052 
1052  dct_quantize_trellis_h263_c(int16_t *const Out, const int16_t *const In, int Q, const uint16_t * const Zigzag, int Non_Zero)  dct_quantize_trellis_h263_c(int16_t *const Out, const int16_t *const In, int Q, const uint16_t * const Zigzag, int Non_Zero)
1053  {  {
1054    
1055      // Note: We should search last non-zero coeffs on *real* DCT input coeffs (In[]),      /*
1056      // not quantized one (Out[]). However, it only improves the result *very*           * Note: We should search last non-zero coeffs on *real* DCT input coeffs (In[]),
1057      // slightly (~0.01dB), whereas speed drops to crawling level :)           * not quantized one (Out[]). However, it only improves the result *very*
1058      // Well, actually, taking 1 more coeff past Non_Zero into account sometimes helps,           * slightly (~0.01dB), whereas speed drops to crawling level :)
1059             * Well, actually, taking 1 more coeff past Non_Zero into account sometimes helps.
1060             */
1061    typedef struct { int16_t Run, Level; } NODE;    typedef struct { int16_t Run, Level; } NODE;
1062    
1063    NODE Nodes[65], Last;    NODE Nodes[65], Last;
1064    uint32_t Run_Costs0[64+1], * const Run_Costs = Run_Costs0 + 1;    uint32_t Run_Costs0[64+1];
1065      uint32_t * const Run_Costs = Run_Costs0 + 1;
1066    const int Mult = 2*Q;    const int Mult = 2*Q;
1067    const int Bias = (Q-1) | 1;    const int Bias = (Q-1) | 1;
1068    const int Lev0 = Mult + Bias;    const int Lev0 = Mult + Bias;
1069    const int Lambda = Trellis_Lambda_Tabs[Q-1];    // it's 1/lambda, actually    const int Lambda = Trellis_Lambda_Tabs[Q-1];    /* it's 1/lambda, actually */
1070    
1071    int Run_Start = -1;    int Run_Start = -1;
1072    Run_Costs[-1] = 2<<16;                          // source (w/ CBP penalty)    Run_Costs[-1] = 2<<16;                          /* source (w/ CBP penalty) */
1073    uint32_t Min_Cost = 2<<16;    uint32_t Min_Cost = 2<<16;
1074    
1075    int Last_Node = -1;    int Last_Node = -1;
1076    uint32_t Last_Cost = 0;    uint32_t Last_Cost = 0;
1077    
1078      int i, j;
1079    
1080  #if (DBG>0)  #if (DBG>0)
1081    Last.Level = 0; Last.Run = -1; // just initialize to smthg    Last.Level = 0; Last.Run = -1; /* just initialize to smthg */
1082  #endif  #endif
1083    
   int i, j;  
   
1084    Non_Zero = Find_Last(Out, Zigzag, Non_Zero);    Non_Zero = Find_Last(Out, Zigzag, Non_Zero);
1085    if (Non_Zero<0)    if (Non_Zero<0)
1086        return -1;        return -1;
# Line 847  Line 1093 
1093      uint32_t Best_Cost = 0xf0000000;      uint32_t Best_Cost = 0xf0000000;
1094      Last_Cost += Dist0;      Last_Cost += Dist0;
1095    
1096      if ((uint32_t)(Level1+1)<3)                 // very specialized loop for -1,0,+1      if ((uint32_t)(Level1+1)<3)                 /* very specialized loop for -1,0,+1 */
1097      {      {
1098        int dQ;        int dQ;
1099            int Run;            int Run;
1100          uint32_t Cost0;
1101    
1102        if (AC<0) {        if (AC<0) {
1103          Nodes[i].Level = -1;          Nodes[i].Level = -1;
# Line 859  Line 1106 
1106          Nodes[i].Level = 1;          Nodes[i].Level = 1;
1107          dQ = Lev0 - AC;          dQ = Lev0 - AC;
1108        }        }
1109        const uint32_t Cost0 = Lambda*dQ*dQ;                  Cost0 = Lambda*dQ*dQ;
1110    
1111        Nodes[i].Run = 1;        Nodes[i].Run = 1;
1112        Best_Cost = (Code_Len20[0]<<16) + Run_Costs[i-1]+Cost0;        Best_Cost = (Code_Len20[0]<<16) + Run_Costs[i-1]+Cost0;
# Line 867  Line 1114 
1114        {        {
1115          const uint32_t Cost_Base = Cost0 + Run_Costs[i-Run];          const uint32_t Cost_Base = Cost0 + Run_Costs[i-Run];
1116          const uint32_t Cost = Cost_Base + (Code_Len20[Run-1]<<16);          const uint32_t Cost = Cost_Base + (Code_Len20[Run-1]<<16);
1117            // TODO: what about tie-breaks? Should we favor short runs or          const uint32_t lCost = Cost_Base + (Code_Len24[Run-1]<<16);
1118            // long runs? Although the error is the same, it would not be  
1119            // spread the same way along high and low frequencies...            /*
1120          if (Cost<Best_Cost)                     * TODO: what about tie-breaks? Should we favor short runs or
1121          {                     * long runs? Although the error is the same, it would not be
1122                       * spread the same way along high and low frequencies...
1123                       */
1124            if (Cost<Best_Cost) {
1125            Best_Cost    = Cost;            Best_Cost    = Cost;
1126            Nodes[i].Run = Run;            Nodes[i].Run = Run;
1127          }          }
1128          const uint32_t lCost = Cost_Base + (Code_Len24[Run-1]<<16);  
1129          if (lCost<Last_Cost)          if (lCost<Last_Cost) {
         {  
1130            Last_Cost  = lCost;            Last_Cost  = lCost;
1131            Last.Run   = Run;            Last.Run   = Run;
1132            Last_Node  = i;            Last_Node  = i;
1133          }          }
1134        }        }
1135        if (Last_Node==i) Last.Level = Nodes[i].Level;        if (Last_Node==i)
1136                            Last.Level = Nodes[i].Level;
1137    
1138        if (DBG==1) {        if (DBG==1) {
1139          Run_Costs[i] = Best_Cost;          Run_Costs[i] = Best_Cost;
# Line 901  Line 1150 
1150          printf( "\n" );          printf( "\n" );
1151        }        }
1152      }      }
1153      else                      // "big" levels      else                      /* "big" levels */
1154      {      {
1155        const uint8_t *Tbl_L1, *Tbl_L2, *Tbl_L1_Last, *Tbl_L2_Last;        const uint8_t *Tbl_L1, *Tbl_L2, *Tbl_L1_Last, *Tbl_L2_Last;
1156        int Level2;        int Level2;
1157        int dQ1, dQ2;        int dQ1, dQ2;
1158        int Run;        int Run;
1159                    uint32_t Dist1,Dist2;
1160                    int dDist21;
1161    
1162            if (Level1>1) {            if (Level1>1) {
1163          dQ1 = Level1*Mult-AC + Bias;          dQ1 = Level1*Mult-AC + Bias;
# Line 916  Line 1167 
1167          Tbl_L2      = (Level2<=24) ? B16_17_Code_Len[Level2-1]     : Code_Len0;          Tbl_L2      = (Level2<=24) ? B16_17_Code_Len[Level2-1]     : Code_Len0;
1168          Tbl_L1_Last = (Level1<=6) ? B16_17_Code_Len_Last[Level1-1] : Code_Len0;          Tbl_L1_Last = (Level1<=6) ? B16_17_Code_Len_Last[Level1-1] : Code_Len0;
1169          Tbl_L2_Last = (Level2<=6) ? B16_17_Code_Len_Last[Level2-1] : Code_Len0;          Tbl_L2_Last = (Level2<=6) ? B16_17_Code_Len_Last[Level2-1] : Code_Len0;
1170        }        } else { /* Level1<-1 */
       else { // Level1<-1  
1171          dQ1 = Level1*Mult-AC - Bias;          dQ1 = Level1*Mult-AC - Bias;
1172          dQ2 = dQ1 + Mult;          dQ2 = dQ1 + Mult;
1173          Level2 = Level1 + 1;          Level2 = Level1 + 1;
# Line 926  Line 1176 
1176          Tbl_L1_Last = (Level1>=- 6) ? B16_17_Code_Len_Last[Level1^-1] : Code_Len0;          Tbl_L1_Last = (Level1>=- 6) ? B16_17_Code_Len_Last[Level1^-1] : Code_Len0;
1177          Tbl_L2_Last = (Level2>=- 6) ? B16_17_Code_Len_Last[Level2^-1] : Code_Len0;          Tbl_L2_Last = (Level2>=- 6) ? B16_17_Code_Len_Last[Level2^-1] : Code_Len0;
1178        }        }
1179        const uint32_t Dist1 = Lambda*dQ1*dQ1;        Dist1 = Lambda*dQ1*dQ1;
1180        const uint32_t Dist2 = Lambda*dQ2*dQ2;        Dist2 = Lambda*dQ2*dQ2;
1181        const int dDist21 = Dist2-Dist1;        dDist21 = Dist2-Dist1;
1182    
1183        for(Run=i-Run_Start; Run>0; --Run)        for(Run=i-Run_Start; Run>0; --Run)
1184        {        {
1185          const uint32_t Cost_Base = Dist1 + Run_Costs[i-Run];          const uint32_t Cost_Base = Dist1 + Run_Costs[i-Run];
   
 // for sub-optimal (but slightly worth it, speed-wise) search, uncomment the following:  
 //        if (Cost_Base>=Best_Cost) continue;  
   
1186          uint32_t Cost1, Cost2;          uint32_t Cost1, Cost2;
1187          int bLevel;          int bLevel;
1188    
1189    /*
1190     * for sub-optimal (but slightly worth it, speed-wise) search, uncomment the following:
1191     *        if (Cost_Base>=Best_Cost) continue;
1192     */
1193          Cost1 = Cost_Base + (Tbl_L1[Run-1]<<16);          Cost1 = Cost_Base + (Tbl_L1[Run-1]<<16);
1194          Cost2 = Cost_Base + (Tbl_L2[Run-1]<<16) + dDist21;          Cost2 = Cost_Base + (Tbl_L2[Run-1]<<16) + dDist21;
1195    
1196          if (Cost2<Cost1) { Cost1 = Cost2; bLevel = Level2; }          if (Cost2<Cost1) {
1197          else bLevel = Level1;                           Cost1 = Cost2;
1198                             bLevel = Level2;
1199                      } else
1200                             bLevel = Level1;
1201    
1202          if (Cost1<Best_Cost)          if (Cost1<Best_Cost) {
         {  
1203            Best_Cost = Cost1;            Best_Cost = Cost1;
1204            Nodes[i].Run   = Run;            Nodes[i].Run   = Run;
1205            Nodes[i].Level = bLevel;            Nodes[i].Level = bLevel;
# Line 956  Line 1208 
1208          Cost1 = Cost_Base + (Tbl_L1_Last[Run-1]<<16);          Cost1 = Cost_Base + (Tbl_L1_Last[Run-1]<<16);
1209          Cost2 = Cost_Base + (Tbl_L2_Last[Run-1]<<16) + dDist21;          Cost2 = Cost_Base + (Tbl_L2_Last[Run-1]<<16) + dDist21;
1210    
1211          if (Cost2<Cost1) { Cost1 = Cost2; bLevel = Level2; }          if (Cost2<Cost1) {
1212          else bLevel = Level1;                           Cost1 = Cost2;
1213          if (Cost1<Last_Cost)                           bLevel = Level2;
1214          {                    } else
1215                             bLevel = Level1;
1216    
1217            if (Cost1<Last_Cost) {
1218            Last_Cost  = Cost1;            Last_Cost  = Cost1;
1219            Last.Run   = Run;            Last.Run   = Run;
1220            Last.Level = bLevel;            Last.Level = bLevel;
1221            Last_Node  = i;            Last_Node  = i;
1222          }          }
1223        }        } /* end of "for Run" */
1224    
1225        if (DBG==1) {        if (DBG==1) {
1226          Run_Costs[i] = Best_Cost;          Run_Costs[i] = Best_Cost;
# Line 991  Line 1246 
1246      }      }
1247      else      else
1248      {      {
1249          // as noticed by Michael Niedermayer (michaelni at gmx.at), there's          /*
1250          // a code shorter by 1 bit for a larger run (!), same level. We give                   * as noticed by Michael Niedermayer (michaelni at gmx.at), there's
1251          // it a chance by not moving the left barrier too much.                   * a code shorter by 1 bit for a larger run (!), same level. We give
1252                     * it a chance by not moving the left barrier too much.
1253                     */
1254    
1255        while( Run_Costs[Run_Start]>Min_Cost+(1<<16) )        while( Run_Costs[Run_Start]>Min_Cost+(1<<16) )
1256          Run_Start++;          Run_Start++;
1257    
1258          // spread on preceding coeffs the cost incurred by skipping this one          /* spread on preceding coeffs the cost incurred by skipping this one */
1259        for(j=Run_Start; j<i; ++j) Run_Costs[j] += Dist0;        for(j=Run_Start; j<i; ++j) Run_Costs[j] += Dist0;
1260        Min_Cost += Dist0;        Min_Cost += Dist0;
1261      }      }
# Line 1015  Line 1273 
1273    if (Last_Node<0)    if (Last_Node<0)
1274      return -1;      return -1;
1275    
1276         // reconstruct optimal sequence backward with surviving paths         /* reconstruct optimal sequence backward with surviving paths */
1277    bzero(Out, 64*sizeof(*Out));    memset(Out, 0x00, 64*sizeof(*Out));
1278    Out[Zigzag[Last_Node]] = Last.Level;    Out[Zigzag[Last_Node]] = Last.Level;
1279    i = Last_Node - Last.Run;    i = Last_Node - Last.Run;
1280    while(i>=0) {    while(i>=0) {
# Line 1037  Line 1295 
1295  }  }
1296    
1297  #undef DBG  #undef DBG
1298    
1299    #endif

Legend:
Removed from v.1011  
changed lines
  Added in v.1053

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4