Make the PAFF detection more robust (#74)

HomeOfAviSynthPlusEvolution · Feb 8, 2025 · b0907c0 · b0907c0
1 parent fa6f983
commit b0907c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/common/lwindex.c b/common/lwindex.c
@@ -985,7 +985,16 @@ static void create_video_frame_order_list
     int             enable_repeat   = 0;
     int             complete_frame  = 1;
     int             repeat_field    = 1;
+    int             consistent_filed_order = 1;
     lw_field_info_t next_field_info = info[1].field_info;
+    for (uint32_t i = 2; i <= frame_count; ++i)
+    {
+        if (info[i].field_info != next_field_info)
+        {
+            consistent_filed_order = 0;
+            break;
+        }
+    }
     for( uint32_t i = 1; i <= frame_count; i++, order_count++ )
     {
         int             repeat_pict = info[i].repeat_pict;
@@ -1033,7 +1042,7 @@ static void create_video_frame_order_list
                 default :
                     break;
             }
-        if( repeat_pict == 0 && !(info[i].flags & (LW_VFRAME_FLAG_CORRUPT | LW_VFRAME_FLAG_COUNTERPART_MISSING)) )
+        if( consistent_filed_order == 0 && repeat_pict == 0 && !(info[i].flags & (LW_VFRAME_FLAG_CORRUPT | LW_VFRAME_FLAG_COUNTERPART_MISSING)) )
         {
             /* PAFF field coded picture */
             complete_frame ^= 1;

diff --git a/vcxcompat.props b/vcxcompat.props