From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 6 Jun 2017 23:23:59 +0000 (-0600)
Subject: fixes for filelist read_frame
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=9adc10ce6a9e5d28b7132552024b37f7ee9bb283;p=goodguy%2Fhistory.git

fixes for filelist read_frame
---

diff --git a/cinelerra-5.1/cinelerra/filelist.C b/cinelerra-5.1/cinelerra/filelist.C
index 9f24e67a..8f79da07 100644
--- a/cinelerra-5.1/cinelerra/filelist.C
+++ b/cinelerra-5.1/cinelerra/filelist.C
@@ -400,38 +400,9 @@ int FileList::read_frame(VFrame *frame)
 
 		if(!temp) return result;
 
-// printf("FileList::read_frame frame=%d temp=%d\n",
-// frame->get_color_model(),
-// temp->get_color_model());
-		if(frame->get_color_model() == temp->get_color_model())
-		{
-			frame->copy_from(temp);
-		}
-		else
-		{
-// Never happens
-			BC_CModels::transfer(frame->get_rows(), /* Leave NULL if non existent */
-				temp->get_rows(),
-				frame->get_y(), /* Leave NULL if non existent */
-				frame->get_u(),
-				frame->get_v(),
-				temp->get_y(), /* Leave NULL if non existent */
-				temp->get_u(),
-				temp->get_v(),
-				0,        /* Dimensions to capture from input frame */
-				0,
-				asset->width,
-				asset->height,
-				0,       /* Dimensions to project on output frame */
-				0,
-				asset->width,
-				asset->height,
-				temp->get_color_model(),
-				frame->get_color_model(),
-				0,         /* When transfering BC_RGBA8888 to non-alpha this is the background color in 0xRRGGBB hex */
-				temp->get_w(),       /* For planar use the luma rowspan */
-				frame->get_w());
-		}
+//printf("FileList::read_frame frame=%d temp=%d\n",
+// frame->get_color_model(), // temp->get_color_model());
+		frame->transfer_from(temp);
 	}
 
 
diff --git a/cinelerra-5.1/guicast/vframe.C b/cinelerra-5.1/guicast/vframe.C
index aadd6a72..70618582 100644
--- a/cinelerra-5.1/guicast/vframe.C
+++ b/cinelerra-5.1/guicast/vframe.C
@@ -1080,6 +1080,7 @@ int VFrame::copy_from(VFrame *frame)
 			break;
 	}
 
+	params->copy_from(frame->params);
 	return 0;
 }
 
@@ -1131,6 +1132,7 @@ int VFrame::transfer_from(VFrame *that, int bg_color, int in_x, int in_y, int in
 			that->get_bytes_per_line(),
 		bg_color);
 #endif
+	params->copy_from(that->params);
 	return 0;
 }