X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilejpeg.C;h=42dd2189d73fbf68d966b501b8b435a6ccdf0767;hb=9a75aafbc51be29b49351a51e9084bb34d255c0d;hp=d35e9bd49ba30512511f7a1d26f8028f8e6f5abd;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/filejpeg.C b/cinelerra-5.1/cinelerra/filejpeg.C
index d35e9bd4..42dd2189 100644
--- a/cinelerra-5.1/cinelerra/filejpeg.C
+++ b/cinelerra-5.1/cinelerra/filejpeg.C
@@ -279,38 +279,22 @@ int FileJPEG::read_header(FILE *fp, int &w, int &h)
 
 int FileJPEG::read_frame(VFrame *output, VFrame *input)
 {
-	if(input->get_compressed_size() < 2 ||
-		input->get_data()[0] != 0xff ||
-		input->get_data()[1] != 0xd8)
+	if( input->get_compressed_size() < 2 ||
+	    input->get_data()[0] != 0xff ||
+	    input->get_data()[1] != 0xd8 )
 		return 1;
 
-	if(!decompressor) decompressor = mjpeg_new(asset->width,
-		asset->height,
-		1);
-// printf("FileJPEG::read_frame %d %p %d %d %d %p %p %p %p %d\n",
-// __LINE__,
-// input->get_data(),
-// input->get_compressed_size(),
-// output->get_w(),
-// output->get_h(),
-// output->get_rows(),
-// output->get_y(),
-// output->get_u(),
-// output->get_v(),
+	if( !decompressor )
+		decompressor = mjpeg_new(asset->width, asset->height, 1);
+// printf("FileJPEG::read_frame %d %p %d %d %d %p %p %p %p %d\n", __LINE__,
+// input->get_data(), input->get_compressed_size(), output->get_w(), output->get_h(),
+// output->get_rows(), output->get_y(), output->get_u(), output->get_v(),
 // output->get_color_model());
-	mjpeg_decompress((mjpeg_t*)decompressor,
-		input->get_data(),
-		input->get_compressed_size(),
-		0,
-		output->get_rows(),
-		output->get_y(),
-		output->get_u(),
-		output->get_v(),
-		output->get_color_model(),
-		1);
-//	PRINT_TRACE
-
+	mjpeg_decompress((mjpeg_t*)decompressor, input->get_data(), input->get_compressed_size(), 0,
+		output->get_rows(), output->get_y(), output->get_u(), output->get_v(),
+		output->get_color_model(), 1);
 //printf("FileJPEG::read_frame %d\n", __LINE__);
+//
 	return 0;
 }
 
@@ -345,7 +329,7 @@ JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
  	parent_window->get_abs_cursor_x(1),
  	parent_window->get_abs_cursor_y(1),
-	400, 200)
+	xS(400), yS(200))
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -357,14 +341,15 @@ JPEGConfigVideo::~JPEGConfigVideo()
 
 void JPEGConfigVideo::create_objects()
 {
-	int x = 10, y = 10;
+	int xs10 = xS(10), ys10 = yS(10);
+	int x = xs10, y = ys10;
 	lock_window("JPEGConfigVideo::create_objects");
 	add_subwindow(new BC_Title(x, y, _("Quality:")));
 	BC_ISlider *slider;
-	add_subwindow(slider = new BC_ISlider(x + 80, y,
-		0, 200, 200, 0, 100, asset->jpeg_quality, 0, 0,
+	add_subwindow(slider = new BC_ISlider(x + xS(80), y,
+		0, xS(200), xS(200), 0, xS(100), asset->jpeg_quality, 0, 0,
 		&asset->jpeg_quality));
-	y += slider->get_h() + 10;
+	y += slider->get_h() + ys10;
 	add_subwindow(new BC_CheckBox(x, y, 
 		&asset->jpeg_sphere, _("Tag for spherical playback")));