Mercurial > libavcodec.hg

changeset 11144:0f7dcfca7b2e libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dont calculate any surrounding MVs for temporal MBs
author michael
date Sat, 13 Feb 2010 15:30:27 +0000
parents 8bfe0dae50b2
children 8805efb4c3fd
files h264.h
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/h264.h	Sat Feb 13 13:28:04 2010 +0000
+++ b/h264.h	Sat Feb 13 15:30:27 2010 +0000
@@ -947,7 +947,7 @@
     }
 
 #if 1
-    if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
+    if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){
         int list;
         for(list=0; list<h->list_count; list++){
             if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type)){
@@ -958,6 +958,8 @@
                 }*/
                 continue;
             }
+            assert(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred));
+
             h->mv_cache_clean[list]= 0;
 
             if(USES_LIST(top_type, list)){
@@ -990,9 +992,6 @@
                 }
             }
 
-            if((IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred))
-                continue;
-
             if(USES_LIST(topleft_type, list)){
                 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + h->b_stride + (topleft_partition & 2*h->b_stride);
                 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + (topleft_partition & h->b8_stride);