X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=99fa71193af683c2df5194f7f67911ccf2bfeea9;hb=a985e771ecfb00f01c6405c7aa4fb958a780e558;hp=23e391df2b4c417c1a2ca4cf33efaa49c6ff9759;hpb=2f28632d8209ef735de1698a596bc94fa9613497;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 23e391df..99fa7119 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -10,12 +10,14 @@
 #include "asset.h"
 #include "bcwindowbase.h"
 #include "bitspopup.h"
+#include "ctype.h"
 #include "ffmpeg.h"
 #include "filebase.h"
 #include "file.h"
 #include "fileffmpeg.h"
 #include "filesystem.h"
 #include "indexfile.h"
+#include "language.h"
 #include "mainerror.h"
 #include "mainprogress.h"
 #include "mutex.h"
@@ -38,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;
@@ -57,9 +58,23 @@ void FFMpegConfigNum::create_objects()
 	BC_TumbleTextBox::create_objects();
 }
 
+int FFMpegConfigNum::update_param(const char *param, const char *opts)
+{
+	char value[BCTEXTLEN];
+	if( !FileFFMPEG::get_ff_option(param, opts, value) ) {
+		if( (*output = atoi(value)) < 0 ) {
+			disable(1);
+			return 0;
+		}
+	}
+	BC_TumbleTextBox::update((int64_t)*output);
+	enable();
+	return 1;
+}
+
 int FFMpegConfigNum::handle_event()
 {
-	*output = atol(get_text());
+	*output = atoi(get_text());
 	return 1;
 }
 
@@ -85,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;
 }
@@ -96,13 +111,21 @@ 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;
 }
 
+void FileFFMPEG::set_parameters(char *cp, int len, const char *bp)
+{
+	char *ep = cp + len-2, ch = 0;
+	while( cp < ep && *bp != 0 ) { ch = *bp++; *cp++ = ch; }
+	if( ch != '\n' ) *cp++ = '\n';
+	*cp = 0;
+}
+
 void FileFFMPEG::get_parameters(BC_WindowBase *parent_window,
 		Asset *asset, BC_WindowBase *&format_window,
 		int audio_options, int video_options)
@@ -111,14 +134,18 @@ void FileFFMPEG::get_parameters(BC_WindowBase *parent_window,
 		FFMPEGConfigAudio *window = new FFMPEGConfigAudio(parent_window, asset);
 		format_window = window;
 		window->create_objects();
-		window->run_window();
+		if( !window->run_window() )
+			set_parameters(asset->ff_audio_options, sizeof(asset->ff_audio_options),
+				 window->audio_options->get_text());
 		delete window;
 	}
 	else if(video_options) {
 		FFMPEGConfigVideo *window = new FFMPEGConfigVideo(parent_window, asset);
 		format_window = window;
 		window->create_objects();
-		window->run_window();
+		if( !window->run_window() )
+			set_parameters(asset->ff_video_options, sizeof(asset->ff_video_options),
+				 window->video_options->get_text());
 		delete window;
 	}
 }
@@ -183,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);
@@ -214,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 ) {
@@ -227,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);
@@ -310,10 +338,67 @@ int FileFFMPEG::colormodel_supported(int colormodel)
 int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
 {
 	switch(driver) {
-	case PLAYBACK_X11:	return BC_RGB888;
-	case PLAYBACK_X11_GL:	return BC_YUV888;
+	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;
 	}
-	return BC_YUV420P;
+
+	return BC_RGB888;
+}
+
+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)
+{
+	for( const char *cp=options; *cp!=0; ) {
+		char line[BCTEXTLEN], *bp = line, *ep = bp+sizeof(line)-1;
+		while( bp < ep && *cp && *cp!='\n' ) *bp++ = *cp++;
+		if( *cp ) ++cp;
+		*bp = 0;
+		if( !line[0] || line[0] == '#' || line[0] == ';' ) continue;
+		char key[BCSTRLEN], val[BCTEXTLEN];
+		if( FFMPEG::scan_option_line(line, key, val) ) continue;
+		if( !strcmp(key, nm) ) {
+			strcpy(value, val);
+			return 0;
+		}
+	}
+	return 1;
 }
 
 //======
@@ -380,6 +465,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:"));
@@ -395,27 +481,25 @@ void FFMPEGConfigAudio::create_objects()
 		FFMPEG::load_options(option_path, asset->ff_audio_options,
 			 sizeof(asset->ff_audio_options));
 	}
+
 	audio_options = new FFAudioOptions(this, x, y, get_w()-x-20, 10,
 		 sizeof(asset->ff_audio_options)-1, asset->ff_audio_options);
 	audio_options->create_objects();
 	add_subwindow(new BC_OKButton(this));
-	
+	add_subwindow(new BC_CancelButton(this));
 	show_window(1);
-	bitrate->handle_event();
+
+	bitrate->update_param("cin_bitrate", asset->ff_audio_options);
+
 	unlock_window();
 }
 
 int FFMPEGConfigAudio::close_event()
 {
-	set_done(0);
+	set_done(1);
 	return 1;
 }
 
-void FFMPEGConfigAudio::update_options()
-{
-	audio_options->update(asset->ff_audio_options);
-}
-
 FFAudioOptions::FFAudioOptions(FFMPEGConfigAudio *audio_popup,
 	int x, int y, int w, int rows, int size, char *text)
  : BC_ScrollTextBox(audio_popup, x, y, w, rows, text, size)
@@ -423,12 +507,6 @@ FFAudioOptions::FFAudioOptions(FFMPEGConfigAudio *audio_popup,
 	this->audio_popup = audio_popup;
 }
 
-int FFAudioOptions::handle_event()
-{
-	strcpy(audio_popup->asset->ff_audio_options, get_text());
-	return 1;
-}
-
 
 FFMPEGConfigAudioPopup::FFMPEGConfigAudioPopup(FFMPEGConfigAudio *popup, int x, int y)
  : BC_PopupTextBox(popup, &popup->presets, popup->asset->acodec, x, y, 300, 300)
@@ -440,11 +518,15 @@ 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,
 			 sizeof(asset->ff_audio_options));
 	popup->audio_options->update(asset->ff_audio_options);
+	popup->audio_options->set_text_row(0);
+
+	popup->bitrate->update_param("cin_bitrate", asset->ff_audio_options);
 	return 1;
 }
 
@@ -481,6 +563,7 @@ FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
 
 FFMPEGConfigVideo::~FFMPEGConfigVideo()
 {
+	delete ff_options_dialog;
 	lock_window("FFMPEGConfigVideo::~FFMPEGConfigVideo");
 	if(preset_popup) delete preset_popup;
 	presets.remove_all_objects();
@@ -522,20 +605,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:"));
@@ -555,27 +638,24 @@ void FFMPEGConfigVideo::create_objects()
 	video_options = new FFVideoOptions(this, x, y, get_w()-x-20, 10,
 		 sizeof(asset->ff_video_options)-1, asset->ff_video_options);
 	video_options->create_objects();
-
 	add_subwindow(new BC_OKButton(this));
+	add_subwindow(new BC_CancelButton(this));
 	show_window(1);
-	if( asset->ff_video_bitrate )
-		quality->disable();
-	if( asset->ff_video_quality )
-		bitrate->disable();
+
+	bitrate->update_param("cin_bitrate", asset->ff_video_options);
+	quality->update_param("cin_quality", asset->ff_video_options);
+
+	if( asset->ff_video_bitrate > 0 ) quality->disable();
+	else if( asset->ff_video_quality >= 0 ) bitrate->disable();
 	unlock_window();
 }
 
 int FFMPEGConfigVideo::close_event()
 {
-	set_done(0);
+	set_done(1);
 	return 1;
 }
 
-void FFMPEGConfigVideo::update_options()
-{
-	video_options->update(asset->ff_video_options);
-}
-
 FFVideoOptions::FFVideoOptions(FFMPEGConfigVideo *video_popup,
 	int x, int y, int w, int rows, int size, char *text)
  : BC_ScrollTextBox(video_popup, x, y, w, rows, text, size)
@@ -583,12 +663,6 @@ FFVideoOptions::FFVideoOptions(FFMPEGConfigVideo *video_popup,
 	this->video_popup = video_popup;
 }
 
-int FFVideoOptions::handle_event()
-{
-	strcpy(video_popup->asset->ff_video_options, get_text());
-	return 1;
-}
-
 
 FFMPEGConfigVideoPopup::FFMPEGConfigVideoPopup(FFMPEGConfigVideo *popup, int x, int y)
  : BC_PopupTextBox(popup, &popup->presets, popup->asset->vcodec, x, y, 300, 300)
@@ -601,10 +675,15 @@ 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));
 	popup->video_options->update(asset->ff_video_options);
+	popup->video_options->set_text_row(0);
+
+	popup->bitrate->update_param("cin_bitrate", asset->ff_video_options);
+	popup->quality->update_param("cin_quality", asset->ff_video_options);
 	return 1;
 }
 
@@ -720,7 +799,7 @@ FFOptions_OptPanel::
 
 void FFOptions_OptPanel::create_objects()
 {
-	const char *cols[] = { "option", "value", };
+	const char *cols[] = { _("option"), _("value"), };
 	const int col1_w = 150;
 	int wids[] = { col1_w, get_w()-col1_w };
 	BC_ListBox::update(&items[0], &cols[0], &wids[0], sizeof(items)/sizeof(items[0]));
@@ -792,7 +871,7 @@ FFOptions_Opt::~FFOptions_Opt()
 
 char *FFOptions_Opt::get(char *vp, int sz)
 {
-	char *cp = vp, *ep = vp+sz-1;
+	char *cp = vp;
 	*cp = 0;
 	if( !opt ) return cp;
 
@@ -808,10 +887,8 @@ char *FFOptions_Opt::get(char *vp, int sz)
                 cp = sz >= 0 ? strncpy(vp,val,sz) : strcpy(vp, val);
                 if( sz > 0 ) vp[sz-1] = 0;
                 av_freep(&bp);
-		return cp;
         }
 
-	*vp = 0;
 	return cp;
 }
 
@@ -874,7 +951,7 @@ int FFOptionsKind::handle_event()
 void FFOptionsKind::set(int k)
 {
 	this->kind = k;
-	set_text(kinds[k]);
+	set_text(_(kinds[k]));
 }
 
 FFOptionsText::
@@ -1003,6 +1080,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);
 		}
@@ -1088,6 +1168,50 @@ void FFOptionsWindow::update(FFOptions_Opt *opt)
 	panel->update();
 }
 
+void FFOptions_OptPanel::show_tip(const char *tip)
+{
+	if( !tip ) return;
+	int len = strlen(tip);
+	if( len > (int)sizeof(tip_text)-1 ) len = sizeof(tip_text)-1;
+	strncpy(tip_text,tip,len);
+	tip_text[len] = 0;
+	int line_limit = 60;
+	int limit2 = line_limit/2;
+	int limit4 = line_limit/4-2;
+	char *cp = tip_text, *dp = cp+len;
+	int n;  char *bp, *ep, *pp, *sp;
+	while( cp < dp ) {
+		for( ep=cp; ep<dp && *ep!='\n'; ++ep );
+		// target about half remaining line, constrain line_limit
+		if( (n=(ep-1-cp)/2) < limit2 || n > line_limit )
+			n = line_limit;
+		// search for last punct, last space before line_limit
+		for( bp=cp, pp=sp=0; --n>=0 && cp<ep; ++cp ) {
+			if( ispunct(*cp) && isspace(*(cp+1)) ) pp = cp;
+			else if( isspace(*cp) ) sp = cp;
+		}
+		// line not empty
+		if( cp < ep ) {
+			// first, after punctuation
+			if( pp && pp-bp >= limit4 )
+				cp = pp+1;
+			// then, on spaces
+			else if( sp ) {
+				cp = sp;
+			}
+			// last, on next space
+			else {
+				while( cp<dp && !isspace(*cp) ) ++cp;
+			}
+			// add new line
+			if( !*cp ) break;
+			*cp++ = '\n';
+		}
+	}
+	fwin->panel->set_tooltip(tip_text);
+	fwin->panel->show_tooltip();
+}
+
 int FFOptions_OptPanel::selection_changed()
 {
 	FFOptions_Opt *opt = 0;
@@ -1097,8 +1221,7 @@ int FFOptions_OptPanel::selection_changed()
 		opt = opt_name->opt;
 	}
 	fwin->update(opt);
-	fwin->panel->set_tooltip(!opt ? 0 : opt->tip());
-	fwin->panel->show_tooltip();
+	if( opt ) show_tip(opt->tip());
 	return 1;
 }
 
@@ -1107,25 +1230,25 @@ int FFOptions_Opt::types(char *rp)
 {
 	const char *cp = "";
 	if( opt ) switch (opt->type) {
-	case AV_OPT_TYPE_FLAGS: cp = "<flags>";  break;
-	case AV_OPT_TYPE_INT: cp = "<int>"; break;
-	case AV_OPT_TYPE_INT64: cp = "<int64>"; break;
-	case AV_OPT_TYPE_DOUBLE: cp = "<double>"; break;
-	case AV_OPT_TYPE_FLOAT: cp = "<float>"; break;
-	case AV_OPT_TYPE_STRING: cp = "<string>"; break;
-	case AV_OPT_TYPE_RATIONAL: cp = "<rational>"; break;
-	case AV_OPT_TYPE_BINARY: cp = "<binary>"; break;
-	case AV_OPT_TYPE_IMAGE_SIZE: cp = "<image_size>"; break;
-	case AV_OPT_TYPE_VIDEO_RATE: cp = "<video_rate>"; break;
-	case AV_OPT_TYPE_PIXEL_FMT: cp = "<pix_fmt>"; break;
-	case AV_OPT_TYPE_SAMPLE_FMT: cp = "<sample_fmt>"; break;
-	case AV_OPT_TYPE_DURATION: cp = "<duration>"; break;
-	case AV_OPT_TYPE_COLOR: cp = "<color>"; break;
-	case AV_OPT_TYPE_CHANNEL_LAYOUT: cp = "<channel_layout>";  break;
-	case AV_OPT_TYPE_BOOL: cp = "<bool>";  break;
-	default: cp = "<undef>";  break;
+	case AV_OPT_TYPE_FLAGS: cp = N_("<flags>");  break;
+	case AV_OPT_TYPE_INT: cp = N_("<int>"); break;
+	case AV_OPT_TYPE_INT64: cp = N_("<int64>"); break;
+	case AV_OPT_TYPE_DOUBLE: cp = N_("<double>"); break;
+	case AV_OPT_TYPE_FLOAT: cp = N_("<float>"); break;
+	case AV_OPT_TYPE_STRING: cp = N_("<string>"); break;
+	case AV_OPT_TYPE_RATIONAL: cp = N_("<rational>"); break;
+	case AV_OPT_TYPE_BINARY: cp = N_("<binary>"); break;
+	case AV_OPT_TYPE_IMAGE_SIZE: cp = N_("<image_size>"); break;
+	case AV_OPT_TYPE_VIDEO_RATE: cp = N_("<video_rate>"); break;
+	case AV_OPT_TYPE_PIXEL_FMT: cp = N_("<pix_fmt>"); break;
+	case AV_OPT_TYPE_SAMPLE_FMT: cp = N_("<sample_fmt>"); break;
+	case AV_OPT_TYPE_DURATION: cp = N_("<duration>"); break;
+	case AV_OPT_TYPE_COLOR: cp = N_("<color>"); break;
+	case AV_OPT_TYPE_CHANNEL_LAYOUT: cp = N_("<channel_layout>");  break;
+	case AV_OPT_TYPE_BOOL: cp = N_("<bool>");  break;
+	default: cp = N_("<undef>");  break;
 	}
-	return sprintf(rp, "%s", cp);
+	return sprintf(rp, "%s", _(cp));
 }
 int FFOptions_Opt::scalar(double d, char *rp)
 {
@@ -1243,7 +1366,7 @@ const char *FFOptions_Opt::tip()
 
 
 FFOptionsWindow::FFOptionsWindow(FFOptionsDialog *dialog)
- : BC_Window(PROGRAM_NAME ": Options", 60, 30, 640, 400)
+ : BC_Window(_(PROGRAM_NAME ": Options"), 60, 30, 640, 400)
 {
 	this->dialog = dialog;
 	this->selected = 0;
@@ -1256,23 +1379,30 @@ FFOptionsWindow::~FFOptionsWindow()
 void FFOptionsWindow::create_objects()
 {
 	BC_Title *title;
-	int x = 10, y = 10;
-	add_subwindow(title = new BC_Title(x, y, dialog->codec_name));
-	y += title->get_h() + 10;
-	int x0 = x, y0 = y;
-	add_subwindow(title = new BC_Title(x0, y0, _("Type: ")));
-	x0 += title->get_w() + 8;
-	add_subwindow(type = new BC_Title(x0, y0, (char *)""));
-	x0 = x + 150;
-	add_subwindow(title = new BC_Title(x0, y0, _("Range: ")));
-	x0 += title->get_w() + 8;
-	add_subwindow(range = new BC_Title(x0, y0, (char *)""));
-	x0 = x;
-	y += title->get_h() + 10;
-	add_subwindow(units = new FFOptionsUnits(this, x0, y, 120));
-	x0 += units->get_w() + 8;
+	int x0 = 10, y0 = 10;
+	int x = x0, y = y0;
+	add_subwindow(title = new BC_Title(x, y, _("Format: ")));
+	x += title->get_w();
+	add_subwindow(new BC_Title(x, y, dialog->format_name));
+	x = x0 + 150;
+	add_subwindow(title = new BC_Title(x, y, _("Codec: ")));
+	x += title->get_w();
+	add_subwindow(new BC_Title(x, y, dialog->codec_name));
+
+	x = x0;  y += title->get_h() + 10;  y0 = y;
+	add_subwindow(title = new BC_Title(x, y, _("Type: ")));
+	x += title->get_w() + 8;
+	add_subwindow(type = new BC_Title(x, y, (char *)""));
+	x = x0 + 150;
+	add_subwindow(title = new BC_Title(x, y, _("Range: ")));
+	x += title->get_w() + 8;
+	add_subwindow(range = new BC_Title(x, y, (char *)""));
+
+	x = x0;  y += title->get_h() + 10;
+	add_subwindow(units = new FFOptionsUnits(this, x, y, 120));
+	x += units->get_w() + 8;
 	int x1 = get_w() - BC_GenericButton::calculate_w(this, _("Apply")) - 8;
-	add_subwindow(text = new FFOptionsText(this, x0, y, x1-x0 - 8));
+	add_subwindow(text = new FFOptionsText(this, x, y, x1-x - 8));
 	add_subwindow(apply = new FFOptionsApply(this, x1, y));
 	y += units->get_h() + 10;
 	add_subwindow(kind = new FFOptionsKind(this, x1, y0, apply->get_w()));
@@ -1280,8 +1410,9 @@ void FFOptionsWindow::create_objects()
 	const char *kind_text = _("Kind:");
 	x1 -= BC_Title::calculate_w(this, kind_text) + 8;
 	add_subwindow(kind_title = new BC_Title(x1, y0, kind_text));
+	y0 = y;
 
-	panel_x = x;  panel_y = y;
+	panel_x = x0;  panel_y = y0;
 	panel_w = get_w()-10 - panel_x;
 	panel_h = get_h()-10 - panel_y - BC_OKButton::calculate_h();
 	panel = new FFOptions_OptPanel(this, panel_x, panel_y, panel_w, panel_h);
@@ -1324,9 +1455,8 @@ FFOptionsDialog::FFOptionsDialog()
 	this->options_window = 0;
 	this->codec_name = 0;
 	this->codec = 0;
-	this->ff_options = 0;
-	this->ff_len = 0;
 	this->ff_opts = 0;
+	this->ff_len = 0;
 }
 
 FFOptionsDialog::~FFOptionsDialog()
@@ -1335,11 +1465,11 @@ FFOptionsDialog::~FFOptionsDialog()
 	delete [] codec_name;
 }
 
-void FFOptionsDialog::load_options()
+void FFOptionsDialog::load_options(const char *bp, int len)
 {
 	char line[BCTEXTLEN];
 	char key[BCSTRLEN], val[BCTEXTLEN];
-	char *bp = ff_options, *dp = bp + ff_len-1;
+	const char *dp = bp + len-1;
 	int no = 0;
 	while( bp < dp && *bp != 0 ) {
 		++no;
@@ -1357,9 +1487,9 @@ void FFOptionsDialog::load_options()
 	}
 }
 
-void FFOptionsDialog::store_options()
+void FFOptionsDialog::store_options(char *cp, int len)
 {
-	char *cp = ff_options, *ep = cp + ff_len-1;
+	char *ep = cp + len-1;
 	AVDictionaryEntry *elem = 0;
 	while( (elem=av_dict_get(ff_opts, "", elem, AV_DICT_IGNORE_SUFFIX)) != 0 ) {
 		if( elem->key[0] == '#' ) {
@@ -1371,7 +1501,8 @@ void FFOptionsDialog::store_options()
 	*cp = 0;
 }
 
-void FFOptionsDialog::start(const char *codec_name, AVCodec *codec, char *options, int len)
+void FFOptionsDialog::start(const char *format_name, const char *codec_name,
+	AVCodec *codec, const char *options, int len)
 {
 	if( options_window ) {
 		options_window->lock_window("FFOptionsDialog::start");
@@ -1380,12 +1511,12 @@ void FFOptionsDialog::start(const char *codec_name, AVCodec *codec, char *option
 		return;
 	}
 
+	this->format_name = cstrdup(format_name);
 	this->codec_name = cstrdup(codec_name);
 	this->codec = codec;
 	this->ff_opts = 0;
-	this->ff_options = options;
 	this->ff_len = len;
-	load_options();
+	load_options(options, len);
 
 	BC_DialogThread::start();
 }
@@ -1400,10 +1531,12 @@ BC_Window* FFOptionsDialog::new_gui()
 void FFOptionsDialog::handle_done_event(int result)
 {
 	if( !result ) {
-		store_options();
-		update_options();
+		char options[ff_len];
+		store_options(options, ff_len);
+		update_options(options);
 	}
 	options_window = 0;
+	delete [] format_name; format_name = 0;
 	delete [] codec_name;  codec_name = 0;
 	av_dict_free(&ff_opts);
 }
@@ -1415,11 +1548,12 @@ FFOptionsAudioDialog::FFOptionsAudioDialog(FFMPEGConfigAudio *aud_config)
 
 FFOptionsAudioDialog::~FFOptionsAudioDialog()
 {
+	close_window();
 }
 
-void FFOptionsAudioDialog::update_options()
+void FFOptionsAudioDialog::update_options(const char *options)
 {
-	aud_config->update_options();
+	aud_config->audio_options->update(options);
 }
 
 FFOptionsVideoDialog::FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config)
@@ -1429,11 +1563,12 @@ FFOptionsVideoDialog::FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config)
 
 FFOptionsVideoDialog::~FFOptionsVideoDialog()
 {
+	close_window();
 }
 
-void FFOptionsVideoDialog::update_options()
+void FFOptionsVideoDialog::update_options(const char *options)
 {
-	vid_config->update_options();
+	vid_config->video_options->update(options);
 }
 
 
@@ -1449,18 +1584,20 @@ FFOptionsViewAudio::~FFOptionsViewAudio()
 
 int FFOptionsViewAudio::handle_event()
 {
-	AVCodec *codec = 0;
+	char audio_format[BCSTRLEN]; audio_format[0] = 0;
 	char audio_codec[BCSTRLEN]; audio_codec[0] = 0;
+	AVCodec *codec = 0;
 	Asset *asset = aud_config->asset;
 	const char *name = asset->acodec;
-	if( !FFMPEG::get_codec(audio_codec, "audio", name) )
+	if( !FFMPEG::get_format(audio_format, "audio", name) &&
+	    !FFMPEG::get_codec(audio_codec, "audio", name) )
 		codec = avcodec_find_encoder_by_name(audio_codec);
 	if( !codec ) {
 		eprintf(_("no codec named: %s: %s"), name, audio_codec);
 		return 1;
 	}
-	aud_config->ff_options_dialog->start(audio_codec, codec,
-		 asset->ff_audio_options, sizeof(asset->ff_audio_options));
+	aud_config->ff_options_dialog->start(audio_format, audio_codec, codec,
+		asset->ff_audio_options, sizeof(asset->ff_audio_options));
 	return 1;
 }
 
@@ -1476,18 +1613,20 @@ FFOptionsViewVideo::~FFOptionsViewVideo()
 
 int FFOptionsViewVideo::handle_event()
 {
-	AVCodec *codec = 0;
+	char video_format[BCSTRLEN]; video_format[0] = 0;
 	char video_codec[BCSTRLEN]; video_codec[0] = 0;
+	AVCodec *codec = 0;
 	Asset *asset = vid_config->asset;
 	const char *name = asset->vcodec;
-	if( !FFMPEG::get_codec(video_codec, "video", name) )
+	if( !FFMPEG::get_format(video_format, "video", name) &&
+	    !FFMPEG::get_codec(video_codec, "video", name) )
 		codec = avcodec_find_encoder_by_name(video_codec);
 	if( !codec ) {
 		eprintf(_("no codec named: %s: %s"), name, video_codec);
 		return 1;
 	}
-	vid_config->ff_options_dialog->start(video_codec, codec,
-		 asset->ff_video_options, sizeof(asset->ff_video_options));
+	vid_config->ff_options_dialog->start(video_format, video_codec, codec,
+		asset->ff_video_options, sizeof(asset->ff_video_options));
 	return 1;
 }