compress/libdirac_encoder dirac_encoder.cpp, 1.25, 1.26 dirac_encoder.h, 1.12, 1.13

Update of /cvsroot/dirac/compress/libdirac_encoder
In directory
sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15739/libdirac_enc
oder

Modified Files:
	dirac_encoder.cpp dirac_encoder.h 
Log Message:
Added support for full-search block matching. This is
controlled by
using the flag

-full_search [xr] [yr]

to do an initial pixel-accurate search in the range
[-xr,xr]x[-yr,yr]. 
Sub-pixel refinement is unaffected. 

Mode decision and the standard hierachical block match have
been slightly
changed to improve performance.


Index: dirac_encoder.h
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_encoder/dirac_encoder.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dirac_encoder.h	21 Mar 2007 11:05:43 -0000	1.12
--- dirac_encoder.h	20 Jun 2007 14:42:05 -0000	1.13
***************
*** 165,172 ****
  typedef struct 
  {
!     /*! Quality factor */
      int lossless;
      /*! Quality factor */
      float qf;
      /*! The separation between L1 frames */
      int L1_sep;
--- 165,178 ----
  typedef struct 
  {
!     /*! Lossless coding */
      int lossless;
      /*! Quality factor */
      float qf;
+     /*! Full-search motion estimation */
+     int full_search;
+     /*! x-range for full search ME */
+     int x_range_me;
+     /*! y-range for full search ME */
+     int y_range_me;
      /*! The separation between L1 frames */
      int L1_sep;

Index: dirac_encoder.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_encoder/dirac_encoder.cpp,v

retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** dirac_encoder.cpp	3 May 2007 14:42:59 -0000	1.25
--- dirac_encoder.cpp	20 Jun 2007 14:42:05 -0000	1.26
***************
*** 488,493 ****
  
      m_encparams.SetLocalDecode(enc_ctx->decode_flag);
      m_encparams.SetQf(enc_ctx->enc_params.qf);
!       
m_encparams.SetTargetRate(enc_ctx->enc_params.trate);
     
m_encparams.SetLossless(enc_ctx->enc_params.lossless);
      m_encparams.SetL1Sep(enc_ctx->enc_params.L1_sep);
--- 488,496 ----
  
      m_encparams.SetLocalDecode(enc_ctx->decode_flag);
+    
m_encparams.SetFullSearch(enc_ctx->enc_params.full_search
);
+    
m_encparams.SetXRangeME(enc_ctx->enc_params.x_range_me);
+    
m_encparams.SetYRangeME(enc_ctx->enc_params.y_range_me);
      m_encparams.SetQf(enc_ctx->enc_params.qf);
!    
m_encparams.SetTargetRate(enc_ctx->enc_params.trate);
     
m_encparams.SetLossless(enc_ctx->enc_params.lossless);
      m_encparams.SetL1Sep(enc_ctx->enc_params.L1_sep);
***************
*** 877,880 ****
--- 880,888 ----
      encparams.mv_precision =
default_enc_params.MVPrecision();
  
+     // by default, use hierarchical, not full search
+     encparams.full_search = 0;
+     encparams.x_range_me = 32;
+     encparams.y_range_me = 32;
+ 
      // set default transform parameters
      WltFilter wf;


------------------------------------------------------------
-------------
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