Fix Overlay for 8 bit YV12

Author: Pinterf

avs_core/filters/overlay/444convert.cpp

@@ -550,8 +550,6 @@ static void convert_yv24_chroma_to_yv12_c(BYTE *dstp8, const BYTE *srcp8, int ds
 
 void Convert444ToYV12(PVideoFrame &src, PVideoFrame &dst, int pixelsize, int bits_per_pixel, IScriptEnvironment* env)
 {
-//  env->MakeWritable(&dst); already writeable
-
   env->BitBlt(dst->GetWritePtr(PLANAR_Y), dst->GetPitch(PLANAR_Y),
     src->GetReadPtr(PLANAR_Y), src->GetPitch(), dst->GetRowSize(PLANAR_Y), dst->GetHeight());
 

avs_core/filters/overlay/overlay.cpp

@@ -521,18 +521,6 @@ PVideoFrame __stdcall Overlay::GetFrame(int n, IScriptEnvironment *env) {
 #endif
 #endif
   }
-  
-  // here img->frame is 444
-  // apply fast conversion
-  if((pixelsize==1) && outputVi->Is420())
-  {
-    PVideoFrame outputFrame = env->NewVideoFrame(*outputVi);
-    Convert444ToYV12(frame, outputFrame, pixelsize, bits_per_pixel, env);
-  } else if(outputVi->IsYUY2()) {
-    PVideoFrame outputFrame = env->NewVideoFrame(*outputVi);
-    Convert444ToYUY2(frame, outputFrame, pixelsize, bits_per_pixel, env);
-  }
-  // all other cases return 4:4:4
 
   // Cleanup
   if (mask) {
@@ -548,6 +536,20 @@ PVideoFrame __stdcall Overlay::GetFrame(int n, IScriptEnvironment *env) {
     img->free_all();
     delete img;
   }
+
+  // here img->frame is 444
+  // apply fast conversion
+  if((pixelsize==1) && outputVi->Is420())
+  {
+    PVideoFrame outputFrame = env->NewVideoFrame(*outputVi);
+    Convert444ToYV12(frame, outputFrame, pixelsize, bits_per_pixel, env);
+    return outputFrame;
+  } else if(outputVi->IsYUY2()) {
+    PVideoFrame outputFrame = env->NewVideoFrame(*outputVi);
+    Convert444ToYUY2(frame, outputFrame, pixelsize, bits_per_pixel, env);
+    return outputFrame;
+  }
+  // all other cases return 4:4:4
 #ifndef USE_ORIG_FRAME
   return frameOutput;
 #else