[xiph-commits] r16115 - in branches/theora-thusnelda/lib/dec: . x86

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2009-06-13 23:35:17 -0700 (Sat, 13 Jun 2009)
New Revision: 16115

Modified:
   branches/theora-thusnelda/lib/dec/state.c
   branches/theora-thusnelda/lib/dec/x86/mmxstate.c
Log:
Merge changes between oc_state_frag_recon_mmx() and oc_state_frag_recon_c().


Modified: branches/theora-thusnelda/lib/dec/state.c
===================================================================
--- branches/theora-thusnelda/lib/dec/state.c	2009-06-14 06:16:14 UTC (rev 16114)
+++ branches/theora-thusnelda/lib/dec/state.c	2009-06-14 06:35:17 UTC (rev 16115)
@@ -883,8 +883,8 @@
     ref=
      _state->ref_frame_data[_state->ref_frame_idx[OC_FRAME_FOR_MODE[mb_mode]]]
      +frag_buf_off;
-    if(oc_state_get_mv_offsets(_state,mvoffsets,
-     _state->frag_mvs[_fragi][0],_state->frag_mvs[_fragi][1],_pli)>1){
+    if(oc_state_get_mv_offsets(_state,mvoffsets,_pli,
+     _state->frag_mvs[_fragi][0],_state->frag_mvs[_fragi][1])>1){
       oc_frag_recon_inter2(_state,
        dst,ref+mvoffsets[0],ref+mvoffsets[1],ystride,res_buf);
     }

Modified: branches/theora-thusnelda/lib/dec/x86/mmxstate.c
===================================================================
--- branches/theora-thusnelda/lib/dec/x86/mmxstate.c	2009-06-14 06:16:14 UTC (rev 16114)
+++ branches/theora-thusnelda/lib/dec/x86/mmxstate.c	2009-06-14 06:35:17 UTC (rev 16115)
@@ -38,7 +38,7 @@
   /*Fill in the target buffer.*/
   frag_buf_off=_state->frag_buf_offs[_fragi];
   mb_mode=_state->frags[_fragi].mb_mode;
-  ystride=_state->ref_frame_bufs[0][_pli].stride;
+  ystride=_state->ref_ystride[_pli];
   dst=_state->ref_frame_data[_state->ref_frame_idx[OC_FRAME_SELF]]+frag_buf_off;
   if(mb_mode==OC_MODE_INTRA)oc_frag_recon_intra_mmx(dst,ystride,res_buf);
   else{