Ticket #4513: patch_yadif_greedy_fix.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -873 +873 @@
 
 void NuppelVideoPlayer::AutoDeint(VideoFrame *frame)
 {
-    if (!frame || m_scan_locked)
+    if (!frame)
         return;
+    if (m_scan_locked)
+    {
+        frame->interlaced_frame = m_scan != kScan_Progressive?1:0;
+        frame->top_field_first = m_scan == kScan_Intr2ndField?1:0;
+        return;
+    }
 
     if (frame->interlaced_frame) 
     {

filters/yadif/filter_yadif.c

@@ -500 +500 @@
     }
 
     /* filter all frames, even if frame->interlaced_frame is not set */
+    if (frame->interlaced_frame) 
     filter_func(
         filter, frame->buf, frame->offsets, frame->pitches,
         frame->width, frame->height, second_field, frame->top_field_first);

filters/greedyhdeint/filter_greedyhdeint.c

@@ -229 +229 @@
     if (!filter->got_frames[last_frame])
         last_frame = cur_frame;
 
+    if(frame->interlaced_frame)
+    {
 #ifdef MMX
-    /* SSE Version has best quality. 3DNOW and MMX a litte bit impure */
-    if (filter->mm_flags & MM_SSE) 
-    {
-        greedyh_filter_sse(
-            filter->deint_frame, 2 * frame->width,
-            filter->frames[cur_frame], filter->frames[last_frame],
-            bottom_field, second_field, frame->width, frame->height);
-    }
-    else if (filter->mm_flags & MM_3DNOW)
-    {
-        greedyh_filter_3dnow(
-            filter->deint_frame, 2 * frame->width,
-            filter->frames[cur_frame], filter->frames[last_frame],
-            bottom_field, second_field, frame->width, frame->height);
-    }
-    else if (filter->mm_flags & MM_MMX) 
-    {
-        greedyh_filter_mmx(
-            filter->deint_frame, 2 * frame->width,
-            filter->frames[cur_frame], filter->frames[last_frame],
-            bottom_field, second_field, frame->width, frame->height);
-    }
-    else
+        /* SSE Version has best quality. 3DNOW and MMX a litte bit impure */
+        if (filter->mm_flags & MM_SSE) 
+        {
+          greedyh_filter_sse(
+              filter->deint_frame, 2 * frame->width,
+              filter->frames[cur_frame], filter->frames[last_frame],
+              bottom_field, second_field, frame->width, frame->height);
+        }
+        else if (filter->mm_flags & MM_3DNOW)
+        {
+          greedyh_filter_3dnow(
+              filter->deint_frame, 2 * frame->width,
+              filter->frames[cur_frame], filter->frames[last_frame],
+              bottom_field, second_field, frame->width, frame->height);
+        }
+        else if (filter->mm_flags & MM_MMX) 
+        {
+          greedyh_filter_mmx(
+              filter->deint_frame, 2 * frame->width,
+              filter->frames[cur_frame], filter->frames[last_frame],
+              bottom_field, second_field, frame->width, frame->height);
+        }
+        else
 #endif
-    {
-        /* TODO plain old C implementation */
-    }
+        {
+          /* TODO plain old C implementation */
+        }
 
 #if 0
-      apply_chroma_filter(filter->deint_frame, frame->width * 2,
-                          frame->width, frame->height );
+        apply_chroma_filter(filter->deint_frame, frame->width * 2,
+            frame->width, frame->height );
 #endif
 
-    /* convert back to yv12, cause myth only works with this format */
-    yuy2_to_yv12(
-        filter->deint_frame, 2 * frame->width,
-        frame->buf + frame->offsets[0], frame->pitches[0],
-        frame->buf + frame->offsets[1], frame->pitches[1],
-        frame->buf + frame->offsets[2], frame->pitches[2],
-        frame->width, frame->height);
-
+        /* convert back to yv12, cause myth only works with this format */
+        yuy2_to_yv12(
+            filter->deint_frame, 2 * frame->width,
+            frame->buf + frame->offsets[0], frame->pitches[0],
+            frame->buf + frame->offsets[1], frame->pitches[1],
+            frame->buf + frame->offsets[2], frame->pitches[2],
+            frame->width, frame->height);
+    }
     filter->last_framenr = frame->frameNumber;
 
     return 0;