X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=82a810d61794dad65817b130262023ed5d40ea91;hb=af44bff549c39ac8bb6e42a791e7a211e1013526;hp=6c360da35bd2e8bd0ba50852c96660c24ede04a9;hpb=dafc18d66d48cd981a012d2e73a3b3db5351c538;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 6c360da3..82a810d6 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -40,8 +40,7 @@ FileFFMPEG::~FileFFMPEG()
 
 FFMpegConfigNum::FFMpegConfigNum(BC_Window *window,
 		int x, int y, char *title_text, int *output)
- : BC_TumbleTextBox(window, (int64_t)*output,
-	(int64_t)-1, (int64_t)25000000, 100, y, 100)
+ : BC_TumbleTextBox(window, *output, -1, INT_MAX, 100, y, 100)
 {
 	this->window = window;
 	this->x = x;  this->y = y;
@@ -63,19 +62,19 @@ int FFMpegConfigNum::update_param(const char *param, const char *opts)
 {
 	char value[BCTEXTLEN];
 	if( !FileFFMPEG::get_ff_option(param, opts, value) ) {
-		if( (*output = atol(value)) < 0 ) {
+		if( (*output = atoi(value)) < 0 ) {
 			disable(1);
 			return 0;
 		}
-		BC_TumbleTextBox::update(value);
 	}
+	BC_TumbleTextBox::update((int64_t)*output);
 	enable();
 	return 1;
 }
 
 int FFMpegConfigNum::handle_event()
 {
-	*output = atol(get_text());
+	*output = atoi(get_text());
 	return 1;
 }
 
@@ -101,9 +100,9 @@ int FFMpegVideoBitrate::handle_event()
 {
 	int ret = FFMpegVideoNum::handle_event();
 	Asset *asset = window()->asset;
-	if( asset->ff_video_bitrate )
+	if( asset->ff_video_bitrate > 0 )
 		window()->quality->disable();
-	else
+	else if( !window()->quality->get_textbox()->is_hidden() )
 		window()->quality->enable();
 	return ret;
 }
@@ -112,9 +111,9 @@ int FFMpegVideoQuality::handle_event()
 {
 	int ret = FFMpegVideoNum::handle_event();
 	Asset *asset = window()->asset;
-	if( asset->ff_video_quality )
+	if( asset->ff_video_quality >= 0 )
 		window()->bitrate->disable();
-	else
+	else if( !window()->bitrate->get_textbox()->is_hidden() )
 		window()->bitrate->enable();
 	return ret;
 }
@@ -211,7 +210,6 @@ int FileFFMPEG::select_video_stream(Asset *asset, int vstream)
 	if( !ff || !asset->video_data ) return 1;
 	asset->width = ff->ff_video_width(vstream);
 	asset->height = ff->ff_video_height(vstream);
-	asset->video_length = ff->ff_video_frames(vstream);
 	if( (asset->video_length = ff->ff_video_frames(vstream)) < 2 )
 		asset->video_length = asset->video_length < 0 ? 0 : -1;
 	asset->frame_rate = ff->ff_frame_rate(vstream);
@@ -242,6 +240,7 @@ int FileFFMPEG::open_file(int rd, int wr)
 				asset->channels = audio_channels;
 				asset->sample_rate = ff->ff_sample_rate(0);
 		        	asset->audio_length = ff->ff_audio_samples(0);
+				strcpy(asset->acodec, ff->ff_audio_format(0));
 			}
 			int video_layers = ff->ff_total_video_layers();
 			if( video_layers > 0 ) {
@@ -255,6 +254,7 @@ int FileFFMPEG::open_file(int rd, int wr)
 				    (asset->video_length = ff->ff_video_frames(0)) < 2 )
 					asset->video_length = asset->video_length < 0 ? 0 : -1;
 				if( !asset->frame_rate ) asset->frame_rate = ff->ff_frame_rate(0);
+				strcpy(asset->vcodec, ff->ff_video_format(0));
 			}
 			IndexState *index_state = asset->index_state;
 			index_state->read_markers(file->preferences->index_directory, asset->path);
@@ -335,38 +335,48 @@ int FileFFMPEG::colormodel_supported(int colormodel)
 	return colormodel;
 }
 
-int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
+
+int FileFFMPEG::get_best_colormodel(int driver, int vstream)
 {
+	if( vstream < 0 ) vstream = 0;
+	int is_mpeg = !ff ? 0 : ff->ff_video_mpeg_color_range(vstream);
+
 	switch(driver) {
 	case PLAYBACK_X11:
-		return BC_RGB888;
-	case PLAYBACK_X11_XV:
-	case PLAYBACK_ASYNCHRONOUS:
-		return BC_YUV888;
-	case PLAYBACK_X11_GL:
-		return BC_YUV888;
-	case PLAYBACK_DV1394:
-	case PLAYBACK_FIREWIRE:
-		return BC_YUV422P;
-	case VIDEO4LINUX2:
-		return BC_RGB888;
-	case VIDEO4LINUX2JPEG:
-		return BC_COMPRESSED;
-	case CAPTURE_DVB:
-	case VIDEO4LINUX2MPEG:
-		return BC_YUV422P;
-	case CAPTURE_JPEG_WEBCAM:
-		return BC_COMPRESSED;
-	case CAPTURE_YUYV_WEBCAM:
-		return BC_YUV422;
-	case CAPTURE_FIREWIRE:
-	case CAPTURE_IEC61883:
-		return BC_YUV422P;
+	case PLAYBACK_X11_GL: return is_mpeg ? BC_YUV888 : BC_RGB888;
+	case PLAYBACK_X11_XV: return BC_YUV420P;
 	}
 
 	return BC_RGB888;
 }
 
+int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
+{
+	switch(driver) {
+// the direct X11 color model requires scaling in the codec
+	case PLAYBACK_X11:
+	case PLAYBACK_X11_GL: return BC_RGB888;
+	case PLAYBACK_X11_XV: return BC_YUV420P;
+	}
+
+	return BC_YUV420P;
+}
+
+int FileFFMPEG::can_render(const char *fformat, const char *type)
+{
+	FileSystem fs;
+	char option_path[BCTEXTLEN];
+	FFMPEG::set_option_path(option_path, type);
+	fs.update(option_path);
+	int total_files = fs.total_files();
+	for( int i=0; i<total_files; ++i ) {
+		const char *name = fs.get_entry(i)->get_name();
+		const char *ext = strrchr(name,'.');
+		if( !ext ) continue;
+		if( !strcmp(fformat, ++ext) ) return 1;
+	}
+	return 0;
+}
 
 int FileFFMPEG::get_ff_option(const char *nm, const char *options, char *value)
 {
@@ -450,6 +460,7 @@ void FFMPEGConfigAudio::create_objects()
 	bitrate = new FFMpegAudioBitrate(this, x, y, _("Bitrate:"), &asset->ff_audio_bitrate);
 	bitrate->create_objects();
 	bitrate->set_increment(1000);
+	bitrate->set_boundaries((int64_t)0, (int64_t)INT_MAX);
 
 	y += bitrate->get_h() + 10;
 	BC_Title *title = new BC_Title(x, y, _("Audio Options:"));
@@ -471,11 +482,10 @@ void FFMPEGConfigAudio::create_objects()
 	audio_options->create_objects();
 	add_subwindow(new BC_OKButton(this));
 	add_subwindow(new BC_CancelButton(this));
+	show_window(1);
 
 	bitrate->update_param("cin_bitrate", asset->ff_audio_options);
 
-	show_window(1);
-	bitrate->handle_event();
 	unlock_window();
 }
 
@@ -503,6 +513,7 @@ int FFMPEGConfigAudioPopup::handle_event()
 {
 	strcpy(popup->asset->acodec, get_text());
 	Asset *asset = popup->asset;
+	asset->ff_audio_bitrate = 0;
 	char option_path[BCTEXTLEN];
 	FFMPEG::set_option_path(option_path, "audio/%s", asset->acodec);
 	FFMPEG::load_options(option_path, asset->ff_audio_options,
@@ -589,20 +600,20 @@ void FFMPEGConfigVideo::create_objects()
 	preset_popup = new FFMPEGConfigVideoPopup(this, x, y);
 	preset_popup->create_objects();
 
-	if( asset->ff_video_bitrate && asset->ff_video_quality ) {
-		asset->ff_video_bitrate = 0;
-		asset->ff_video_quality = 0;
+	if( asset->ff_video_bitrate > 0 && asset->ff_video_quality >= 0 ) {
+		asset->ff_video_bitrate = 0;  asset->ff_video_quality = -1;
 	}
 
 	y += 50;
 	bitrate = new FFMpegVideoBitrate(this, x, y, _("Bitrate:"), &asset->ff_video_bitrate);
 	bitrate->create_objects();
 	bitrate->set_increment(100000);
+	bitrate->set_boundaries((int64_t)0, (int64_t)INT_MAX);
 	y += bitrate->get_h() + 5;
 	quality = new FFMpegVideoQuality(this, x, y, _("Quality:"), &asset->ff_video_quality);
 	quality->create_objects();
 	quality->set_increment(1);
-	quality->set_boundaries((int64_t)0, (int64_t)31);
+	quality->set_boundaries((int64_t)-1, (int64_t)51);
 
 	y += quality->get_h() + 10;
 	BC_Title *title = new BC_Title(x, y, _("Video Options:"));
@@ -624,15 +635,13 @@ void FFMPEGConfigVideo::create_objects()
 	video_options->create_objects();
 	add_subwindow(new BC_OKButton(this));
 	add_subwindow(new BC_CancelButton(this));
+	show_window(1);
 
 	bitrate->update_param("cin_bitrate", asset->ff_video_options);
 	quality->update_param("cin_quality", asset->ff_video_options);
 
-	show_window(1);
-	if( asset->ff_video_bitrate )
-		quality->disable();
-	if( asset->ff_video_quality )
-		bitrate->disable();
+	if( asset->ff_video_bitrate > 0 ) quality->disable();
+	else if( asset->ff_video_quality >= 0 ) bitrate->disable();
 	unlock_window();
 }
 
@@ -661,6 +670,7 @@ int FFMPEGConfigVideoPopup::handle_event()
 	strcpy(popup->asset->vcodec, get_text());
 	Asset *asset = popup->asset;
 	char option_path[BCTEXTLEN];
+	asset->ff_video_bitrate = 0;  asset->ff_video_quality = -1;
 	FFMPEG::set_option_path(option_path, "video/%s", asset->vcodec);
 	FFMPEG::load_options(option_path, asset->ff_video_options,
 			 sizeof(asset->ff_video_options));
@@ -1065,6 +1075,9 @@ void FFOptions::initialize(FFOptionsWindow *win, int kind)
 			if( dupl ) continue;
 			FFOptions_Opt *fopt = new FFOptions_Opt(this, opt, opt->name);
 			append(fopt);
+			AVDictionaryEntry *elem = av_dict_get(win->dialog->ff_opts,
+					opt->name, 0, AV_DICT_IGNORE_SUFFIX);
+			if( elem && elem->value ) fopt->set(elem->value);
 			char val[BCTEXTLEN], *vp = fopt->get(val, sizeof(val));
 			fopt->item_value->update(vp);
 		}