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

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

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

revision 1912, Sat Dec 18 10:17:35 2010 UTC revision 1913, Sat Dec 18 16:02:08 2010 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: motion_comp.c,v 1.23 2004-12-05 13:01:27 syskin Exp $   * $Id: motion_comp.c,v 1.24 2010-12-18 16:02:00 Isibaar Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 170  Line 170 
170                                          const uint32_t height,                                          const uint32_t height,
171                                          const uint32_t edged_width,                                          const uint32_t edged_width,
172                                          const int32_t quarterpel,                                          const int32_t quarterpel,
173                                          const int32_t rounding)                                          const int32_t rounding,
174                                            const uint8_t * const tmp)
175  {  {
176          int32_t dx;          int32_t dx;
177          int32_t dy;          int32_t dy;
178    
         uint8_t * const tmp = refv->u;  
   
179          if (mb->mode == MODE_NOT_CODED) {       /* quick copy for early SKIP */          if (mb->mode == MODE_NOT_CODED) {       /* quick copy for early SKIP */
180  /* early SKIP is only activated in P-VOPs, not in S-VOPs, so mcsel can never be 1 */  /* early SKIP is only activated in P-VOPs, not in S-VOPs, so mcsel can never be 1 */
181    
# Line 269  Line 268 
268                                                  const IMAGE * const b_refh,                                                  const IMAGE * const b_refh,
269                                                  const IMAGE * const b_refv,                                                  const IMAGE * const b_refv,
270                                                  const IMAGE * const b_refhv,                                                  const IMAGE * const b_refhv,
271                                                  int16_t * dct_codes)                                                  int16_t * dct_codes,
272                                                    const uint8_t * const tmp)
273  {  {
274          const uint32_t edged_width = pParam->edged_width;          const uint32_t edged_width = pParam->edged_width;
275          int32_t dx, dy, b_dx, b_dy, sumx, sumy, b_sumx, b_sumy;          int32_t dx, dy, b_dx, b_dy, sumx, sumy, b_sumx, b_sumy;
276          int k;          int k;
277          const int quarterpel = pParam->vol_flags & XVID_VOL_QUARTERPEL;          const int quarterpel = pParam->vol_flags & XVID_VOL_QUARTERPEL;
278          const uint8_t * ptr1, * ptr2;          const uint8_t * ptr1, * ptr2;
         uint8_t * const tmp = f_refv->u;  
279          const VECTOR * const fmvs = (quarterpel ? mb->qmvs : mb->mvs);          const VECTOR * const fmvs = (quarterpel ? mb->qmvs : mb->mvs);
280          const VECTOR * const bmvs = (quarterpel ? mb->b_qmvs : mb->b_mvs);          const VECTOR * const bmvs = (quarterpel ? mb->b_qmvs : mb->b_mvs);
281    

Legend:
Removed from v.1912  
changed lines
  Added in v.1913

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