Revision f66e4f5f libavcodec/motion_est.c

View differences:

libavcodec/motion_est.c
1798 1798 
    c->pred_x=0;
1799 1799 
    c->pred_y=0;
1800 1800 

  		




  1801
  
  
    
    P_LEFT[0]        = clip(mv_table[mot_xy - 1][0], xmin<<shift, xmax<<shift);


  		




  1802
  
  
    
    P_LEFT[1]        = clip(mv_table[mot_xy - 1][1], ymin<<shift, ymax<<shift);


  		




  
  1801
  
    
    P_LEFT[0]        = av_clip(mv_table[mot_xy - 1][0], xmin<<shift, xmax<<shift);


  		




  
  1802
  
    
    P_LEFT[1]        = av_clip(mv_table[mot_xy - 1][1], ymin<<shift, ymax<<shift);


  		




  1803
  1803
  
    

  		




  1804
  1804
  
    
    /* special case for first line */


  		




  1805
  1805
  
    
    if (!s->first_slice_line) { //FIXME maybe allow this over thread boundary as its clipped


  		




  1806
  
  
    
        P_TOP[0]      = clip(mv_table[mot_xy - mot_stride             ][0], xmin<<shift, xmax<<shift);


  		




  1807
  
  
    
        P_TOP[1]      = clip(mv_table[mot_xy - mot_stride             ][1], ymin<<shift, ymax<<shift);


  		




  1808
  
  
    
        P_TOPRIGHT[0] = clip(mv_table[mot_xy - mot_stride + 1         ][0], xmin<<shift, xmax<<shift);


  		




  1809
  
  
    
        P_TOPRIGHT[1] = clip(mv_table[mot_xy - mot_stride + 1         ][1], ymin<<shift, ymax<<shift);


  		




  
  1806
  
    
        P_TOP[0]      = av_clip(mv_table[mot_xy - mot_stride             ][0], xmin<<shift, xmax<<shift);


  		




  
  1807
  
    
        P_TOP[1]      = av_clip(mv_table[mot_xy - mot_stride             ][1], ymin<<shift, ymax<<shift);


  		




  
  1808
  
    
        P_TOPRIGHT[0] = av_clip(mv_table[mot_xy - mot_stride + 1         ][0], xmin<<shift, xmax<<shift);


  		




  
  1809
  
    
        P_TOPRIGHT[1] = av_clip(mv_table[mot_xy - mot_stride + 1         ][1], ymin<<shift, ymax<<shift);


  		




  1810
  1810
  
    

  		




  1811
  1811
  
    
        P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);


  		




  1812
  1812
  
    
        P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);


  		












Also available in:  Unified diff