X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvframe.C;h=7aeb079a22a7fff3c7e6a822f171d5090d44e3f3;hb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;hp=1eec314bb0c7757468a98cdb23f65953cd10934e;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/vframe.C b/cinelerra-5.1/guicast/vframe.C
index 1eec314b..7aeb079a 100644
--- a/cinelerra-5.1/guicast/vframe.C
+++ b/cinelerra-5.1/guicast/vframe.C
@@ -311,6 +311,7 @@ int VFrame::clear_objects(int do_opengl)
 		case BC_YUV410P:
 		case BC_YUV411P:
 		case BC_YUV420P:
+		case BC_YUV420PI:
 		case BC_YUV422P:
 		case BC_YUV444P:
 		case BC_RGB_FLOATP:
@@ -386,6 +387,7 @@ void VFrame::create_row_pointers()
 		break;
 
 	case BC_YUV420P:
+	case BC_YUV420PI:
 	case BC_YUV411P:
 		if( this->v_offset ) break;
 		this->y_offset = 0;
@@ -480,6 +482,7 @@ int VFrame::allocate_data(unsigned char *data, int shmid,
 		}
 		else {
 // Have to use malloc for libpng
+//printf("==vframe %d from %p\n", size, __builtin_return_address(0));
 			this->data = (unsigned char *)malloc(size);
 		}
 
@@ -536,7 +539,7 @@ void VFrame::set_memory(BC_Bitmap *bitmap)
 {
 	int shmid = 0;
 	unsigned char *data = 0;
-	if( bitmap->is_shared() )
+	if( bitmap->is_shared() && !bitmap->is_zombie() )
 		shmid = bitmap->get_shmid();
 	else
 		data = bitmap->get_data();
@@ -790,6 +793,11 @@ int VFrame::write_png(const char *path)
 			png_cmodel = PNG_COLOR_TYPE_RGB;
 			break;
 
+		case BC_RGBA8888:
+		case BC_YUVA8888:
+			png_cmodel = PNG_COLOR_TYPE_RGB_ALPHA;
+			break;
+
 		case BC_A8:
 			png_cmodel = PNG_COLOR_TYPE_GRAY;
 			break;
@@ -846,6 +854,7 @@ int VFrame::clear_frame()
 
 	case BC_YUV411P:
 	case BC_YUV420P:
+	case BC_YUV420PI:
 		bzero(get_y(), sz);
 		bzero(get_u(), sz / 4);
 		bzero(get_v(), sz / 4);
@@ -1009,6 +1018,7 @@ int VFrame::copy_from(VFrame *frame)
 			break;
 
 		case BC_YUV420P:
+		case BC_YUV420PI:
 		case BC_YUV411P:
 //printf("%d %d %p %p %p %p %p %p\n", w, h, get_y(), get_u(), get_v(), frame->get_y(), frame->get_u(), frame->get_v());
 			memcpy(get_y(), frame->get_y(), w * h);
@@ -1042,10 +1052,11 @@ int VFrame::copy_from(VFrame *frame)
 	return 0;
 }
 
-int VFrame::transfer_from(VFrame *that, int bg_color)
+int VFrame::transfer_from(VFrame *that, int bg_color, int in_x, int in_y, int in_w, int in_h)
 {
 	if( this->get_color_model() == that->get_color_model() &&
-	    this->get_w() == that->get_w() && this->get_h() == that->get_h() )
+	    this->get_w() == that->get_w() && this->get_h() == that->get_h() &&
+	    this->get_bytes_per_line() == that->get_bytes_per_line() )
 		return this->copy_from(that);
 
 	timestamp = that->timestamp;
@@ -1058,7 +1069,8 @@ int VFrame::transfer_from(VFrame *that, int bg_color)
 		0, 0, this->get_w(), this->get_h(),
 		that->get_color_model(), this->get_color_model(), // Color models in/out
 		bg_color,				     // alpha blend bg_color
-		that->get_w(), this->get_w()); 		     // rowspans (of luma for YUV)
+		that->get_bytes_per_line(),
+		this->get_bytes_per_line()); 		     // rowspans (of luma for YUV)
 #else
 	unsigned char *in_ptrs[4], *out_ptrs[4];
 	unsigned char **inp, **outp;
@@ -1081,9 +1093,11 @@ int VFrame::transfer_from(VFrame *that, int bg_color)
 	else
 		outp = this->get_rows();	
 	BC_CModels::transfer(outp, this->get_color_model(),
-			0, 0, this->get_w(), this->get_h(), this->get_w(),
+			0, 0, this->get_w(), this->get_h(),
+			this->get_bytes_per_line(),
 		inp, that->get_color_model(),
-			0, 0, that->get_w(), that->get_h(), that->get_w(),
+			in_x, in_y, in_w, in_h,
+			that->get_bytes_per_line(),
 		bg_color);
 #endif
 	return 0;