compress/encoder encmain.cpp,1.53,1.54

Update of /cvsroot/dirac/compress/encoder
In directory
sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv1441/encoder

Modified Files:
	encmain.cpp 
Log Message:
Corrected name of DD9_3 filter to DD9_5. Changed weights for
(13,5) to 
correspond to analysis rather than synthesis filter. This
seems to give
slightly better results even with perceptual weighting. 


Index: encmain.cpp
============================================================
=======
RCS file: /cvsroot/dirac/compress/encoder/encmain.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** encmain.cpp	11 Apr 2007 08:08:48 -0000	1.53
--- encmain.cpp	18 Jun 2007 15:24:25 -0000	1.54
***************
*** 97,102 ****
  	cout << "ntargetrate        ulong   0UL      
    Target Bit Rate in Kbps";
      cout << "nlossless          bool    false 
       Lossless coding (overrides qf)";
!     cout << "niwlt_filter       string  DD9_3 
       Intra frame Transform Filter (DD9_3 LEGALL5_3 DD13_5
HAAR0 HAAR1 HAAR2 FIDELITY DAUB9_7)";
!     cout << "nrwlt_filter       string 
LEGALL5_3     Inter frame Transform Filter (DD9_3 LEGALL5_3
DD13_5 HAAR0 HAAR1 HAAR2 FIDELITY DAUB9_7)";
      cout << "nwlt_depth         ulong   4     
       Transform Depth";
      cout << "nmulti_quants      bool    false 
       Use multiple quantisers";
--- 97,102 ----
  	cout << "ntargetrate        ulong   0UL      
    Target Bit Rate in Kbps";
      cout << "nlossless          bool    false 
       Lossless coding (overrides qf)";
!     cout << "niwlt_filter       string  DD9_5 
       Intra frame Transform Filter (DD9_5 LEGALL5_3 DD13_5
HAAR0 HAAR1 HAAR2 FIDELITY DAUB9_7)";
!     cout << "nrwlt_filter       string 
LEGALL5_3     Inter frame Transform Filter (DD9_5 LEGALL5_3
DD13_5 HAAR0 HAAR1 HAAR2 FIDELITY DAUB9_7)";
      cout << "nwlt_depth         ulong   4     
       Transform Depth";
      cout << "nmulti_quants      bool    false 
       Use multiple quantisers";
***************
*** 413,418 ****
      switch (wf)
      {
!     case DD9_3:
!         return string("DD9_3");
      case LEGALL5_3:
          return string("LEGALL5_3");
--- 413,418 ----
      switch (wf)
      {
!     case DD9_5:
!         return string("DD9_5");
      case LEGALL5_3:
          return string("LEGALL5_3");
***************
*** 436,441 ****
  WltFilter StringToTransformFilter (string wf)
  {
!     if( wf=="DD9_3" )
!         return DD9_3;
      else if( wf=="LEGALL5_3" )
          return LEGALL5_3;
--- 436,441 ----
  WltFilter StringToTransformFilter (string wf)
  {
!     if( wf=="DD9_5" )
!         return DD9_5;
      else if( wf=="LEGALL5_3" )
          return LEGALL5_3;


------------------------------------------------------------
-------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and
take
control of your XML. No limits. Just data. Click to get it
now.
http://sourcefor
ge.net/powerbar/db2/
_______________________________________________
Dirac-commits mailing list
Dirac-commitslists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dirac-com
mits