[svn] / branches / dev-api-4 / xvidcore / src / motion / estimation_bvop.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/motion/estimation_bvop.c

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

revision 1160, Tue Sep 30 18:20:31 2003 UTC revision 1212, Sun Nov 16 15:32:38 2003 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_bvop.c,v 1.1.2.2 2003-09-30 18:20:31 edgomez Exp $   * $Id: estimation_bvop.c,v 1.1.2.4 2003-11-16 15:32:37 edgomez Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 291  Line 291 
291  ChoosePred(const MACROBLOCK * const pMB, const uint32_t mode)  ChoosePred(const MACROBLOCK * const pMB, const uint32_t mode)
292  {  {
293  /* the stupidiest function ever */  /* the stupidiest function ever */
294          return (mode == MODE_FORWARD ? pMB->mvs[0] : pMB->b_mvs[0]);          return (mode == MODE_FORWARD) ? pMB->mvs[0] : pMB->b_mvs[0];
295  }  }
296    
297  static void __inline  static void __inline
# Line 468  Line 468 
468          if (sum < MAX_CHROMA_SAD_FOR_SKIP * (int)Data->iQuant) {          if (sum < MAX_CHROMA_SAD_FOR_SKIP * (int)Data->iQuant) {
469                  pMB->mode = MODE_DIRECT_NONE_MV; /* skipped */                  pMB->mode = MODE_DIRECT_NONE_MV; /* skipped */
470                  for (k = 0; k < 4; k++) {                  for (k = 0; k < 4; k++) {
471                          pMB->qmvs[k] = pMB->mvs[k];                          pMB->qmvs[k] = pMB->mvs[k] = Data->directmvF[k];
472                          pMB->b_qmvs[k] = pMB->b_mvs[k];                          pMB->b_qmvs[k] = pMB->b_mvs[k] =  Data->directmvB[k];
473                  }                  }
474          }          }
475  }  }
# Line 800  Line 800 
800                          if (b_reference->coding_type != S_VOP)                          if (b_reference->coding_type != S_VOP)
801                                  if (b_mb->mode == MODE_NOT_CODED) {                                  if (b_mb->mode == MODE_NOT_CODED) {
802                                          pMB->mode = MODE_NOT_CODED;                                          pMB->mode = MODE_NOT_CODED;
803                                            pMB->mvs[0] = zeroMV;
804                                            pMB->b_mvs[0] = zeroMV;
805                                          continue;                                          continue;
806                                  }                                  }
807    
Legend:
Removed from v.1160  
changed lines
  Added in v.1212
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4