[svn] / trunk / xvidcore / src / motion / estimation_pvop.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/motion/estimation_pvop.c

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

revision 1927, Tue Dec 28 16:34:55 2010 UTC revision 1928, Tue Dec 28 19:19:57 2010 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: estimation_pvop.c,v 1.24 2010-12-18 16:02:00 Isibaar Exp $   * $Id: estimation_pvop.c,v 1.25 2010-12-28 19:19:43 Isibaar Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 908  Line 908 
908          const uint32_t mb_height = pParam->mb_height;          const uint32_t mb_height = pParam->mb_height;
909          const uint32_t iEdgedWidth = pParam->edged_width;          const uint32_t iEdgedWidth = pParam->edged_width;
910          const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->vop_flags, current->vol_flags);          const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->vop_flags, current->vol_flags);
         int stat_thresh = 0;  
911          int bound = 0;          int bound = 0;
912          int MVmax = 0, mvSum = 0, mvCount = 0;          int MVmax = 0, mvSum = 0, mvCount = 0;
913    
914          uint32_t x, y;          uint32_t x, y;
915          int sad00;          int sad00;
         int skip_thresh = INITIAL_SKIP_THRESH * \  
                 (current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1);  
916          int block = 0;          int block = 0;
917    
918          /* some pre-initialized thingies for SearchP */          /* some pre-initialized thingies for SearchP */
# Line 1015  Line 1012 
1012          const int mb_width = pParam->mb_width;          const int mb_width = pParam->mb_width;
1013          const int mb_height = pParam->mb_height;          const int mb_height = pParam->mb_height;
1014          const uint32_t iEdgedWidth = pParam->edged_width;          const uint32_t iEdgedWidth = pParam->edged_width;
         int stat_thresh = 0;  
1015          int bound = 0;          int bound = 0;
1016          int num_slices = pEnc->num_slices;          int num_slices = pEnc->num_slices;
1017          int y_step = h->y_step;          int y_step = h->y_step;
# Line 1026  Line 1022 
1022    
1023          int x, y;          int x, y;
1024          int sad00;          int sad00;
         int skip_thresh = INITIAL_SKIP_THRESH * \  
                 (current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1);  
1025          int block = (start_y+y_row)*mb_width;          int block = (start_y+y_row)*mb_width;
1026          int * complete_count_self = h->complete_count_self;          int * complete_count_self = h->complete_count_self;
1027          const volatile int * complete_count_above = h->complete_count_above;          const volatile int * complete_count_above = h->complete_count_above;

Legend:
Removed from v.1927  
changed lines
  Added in v.1928

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