X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fconvert.C;h=c6ecb0438ad271d89869f82a0357d75a3499164b;hb=13a039ef755e81e65c9479b4b615fd89bfe3e038;hp=d42bac496d7485a43036d99ba70d00a10932636d;hpb=120f82197b4bdfdad9a5a666d773b45a8064d049;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/convert.C b/cinelerra-5.1/cinelerra/convert.C
index d42bac49..c6ecb043 100644
--- a/cinelerra-5.1/cinelerra/convert.C
+++ b/cinelerra-5.1/cinelerra/convert.C
@@ -52,14 +52,14 @@
 
 
 #define WIDTH xS(400)
-#define HEIGHT yS(320)
+#define HEIGHT yS(360)
 #define MAX_SCALE 16
 
-ConvertRender::ConvertRender(MWindow *mwindow, const char *suffix)
+ConvertRender::ConvertRender(MWindow *mwindow)
  : Thread(1, 0, 0)
 {
 	this->mwindow = mwindow;
-	this->suffix = cstrdup(suffix);
+	suffix = 0;
 	format_asset = 0;
 	progress = 0;
 	progress_timer = new Timer;
@@ -70,11 +70,12 @@ ConvertRender::ConvertRender(MWindow *mwindow, const char *suffix)
 	failed = 0;  canceled = 0;
 	result = 0;
 	beep = 0;
+	to_proxy = 0;
 }
 
 ConvertRender::~ConvertRender()
 {
-	delete suffix;
+	delete [] suffix;
 	delete progress;
 	delete counter_lock;
 	delete progress_timer;
@@ -102,7 +103,16 @@ void ConvertRender::reset()
 
 void ConvertRender::to_convert_path(char *new_path, Indexable *idxbl)
 {
-	strcpy(new_path, idxbl->path);
+	if( to_proxy ) {
+		char *bp = idxbl->path, *cp = strrchr(bp, '/');
+		if( cp ) bp = cp+1;
+		char filename[BCTEXTLEN], proxy_path[BCTEXTLEN];
+		strcpy(filename, bp);
+		File::getenv_path(proxy_path, mwindow->preferences->nested_proxy_path);
+		sprintf(new_path, "%s/%s", proxy_path, filename);
+	}
+	else
+		strcpy(new_path, idxbl->path);
 	int n = strlen(suffix);
 	char *ep = new_path + strlen(new_path);
 	char *sfx = strrchr(new_path, '.');
@@ -154,6 +164,35 @@ int ConvertRender::from_convert_path(char *path, Indexable *idxbl)
 	return 0;
 }
 
+double ConvertRender::get_video_length(Indexable *idxbl)
+{
+	int64_t video_frames = idxbl->get_video_frames();
+	double frame_rate = idxbl->get_frame_rate();
+	if( video_frames < 0 && mwindow->edl->session->si_useduration )
+		video_frames = mwindow->edl->session->si_duration * frame_rate;
+	if( video_frames < 0 ) video_frames = 1;
+	return !video_frames ? 0 : video_frames / frame_rate;
+}
+
+double ConvertRender::get_audio_length(Indexable *idxbl)
+{
+	int64_t audio_samples = idxbl->get_audio_samples();
+	return !audio_samples ? 0 :
+		(double)audio_samples / idxbl->get_sample_rate();
+}
+
+double ConvertRender::get_length(Indexable *idxbl)
+{
+	return bmax(get_video_length(idxbl), get_audio_length(idxbl));
+}
+
+int ConvertRender::match_format(Asset *asset)
+{
+// close enough
+	return format_asset->audio_data == asset->audio_data &&
+		format_asset->video_data == asset->video_data ? 1 : 0;
+}
+
 EDL *ConvertRender::convert_edl(EDL *edl, Indexable *idxbl)
 {
 	Asset *copy_asset = edl->assets->get_asset(idxbl->path);
@@ -167,24 +206,24 @@ EDL *ConvertRender::convert_edl(EDL *edl, Indexable *idxbl)
 	FileSystem fs;  fs.extract_name(path, copy_asset->path);
 	strcpy(copy_edl->local_session->clip_title, path);
 	strcpy(copy_edl->local_session->clip_notes, _("Transcode clip"));
-	int64_t video_frames = idxbl->get_video_frames();
-	double frame_rate = idxbl->get_frame_rate();
-	double video_length = video_frames / frame_rate;
-	int64_t audio_samples = idxbl->get_audio_samples();
-	int sample_rate = idxbl->get_sample_rate();
-	double audio_length = (double)audio_samples / sample_rate;
+
+	double video_length = get_video_length(idxbl);
+	double audio_length = get_audio_length(idxbl);
 	copy_edl->session->video_tracks =
-		 video_frames > 0 ? 1 : 0;
+		 video_length > 0 ? 1 : 0;
 	copy_edl->session->audio_tracks =
-		 audio_samples > 0 ? copy_asset->channels : 0;
+		 audio_length > 0 ? copy_asset->channels : 0;
+
 	copy_edl->create_default_tracks();
-	Track *current = copy_edl->tracks->first;
+	Track *current = copy_edl->session->video_tracks ?
+		copy_edl->tracks->first : 0;
 	for( int vtrack=0; current; current=NEXT ) {
 		if( current->data_type != TRACK_VIDEO ) continue;
 		current->insert_asset(copy_asset, 0, video_length, 0, vtrack);
 		break;
 	}
-	current = copy_edl->tracks->first;
+	current = copy_edl->session->audio_tracks ?
+		copy_edl->tracks->first : 0;
 	for( int atrack=0; current; current=NEXT ) {
 		if( current->data_type != TRACK_AUDIO ) continue;
 		current->insert_asset(copy_asset, 0, audio_length, 0, atrack);
@@ -229,36 +268,49 @@ int ConvertRender::add_original(EDL *edl, Indexable *idxbl)
 				int ret = file.open_file(mwindow->preferences, convert, 1, 0);
 // render not needed if can use copy
 				if( ret == FILE_OK ) {
-					mwindow->mainindexes->add_next_asset(0, convert);
-					mwindow->mainindexes->start_build();
-					needed = 0;
+					if( match_format(file.asset) ) {
+						mwindow->mainindexes->add_indexable(convert);
+						mwindow->mainindexes->start_build();
+						needed = 0;
+					}
+					else
+						needed = -1;
 				}
 			}
 		}
 	}
-	else {
+	else if( match_format(convert) ) {
 // dont render if copy already an assets
 		convert->add_user();
 		needed = 0;
 	}
+	else
+		needed = -1;
+	if( needed < 0 ) {
+		eprintf(_("transcode target file exists but is incorrect format:\n%s\n"
+			  "remove file from disk before transcode to new format.\n"), new_path);
+		return -1;
+	}
 	orig_copies.append(convert);
 	if( needed ) {
 		convert->copy_format(format_asset, 0);
 // new compression parameters
-		int64_t video_frames = idxbl->get_video_frames();
-		if( video_frames > 1 ) convert->video_data = 1;
-		int64_t audio_samples = idxbl->get_audio_samples();
-		if( audio_samples > 0 ) convert->audio_data = 1;
+		convert->video_data = format_asset->video_data;
+		if( convert->video_data ) {
+			convert->layers = 1;
+			convert->width = idxbl->get_w();
+			if( convert->width & 1 ) ++convert->width;
+			convert->actual_width = convert->width;
+			convert->height = idxbl->get_h();
+			if( convert->height & 1 ) ++convert->height;
+			convert->actual_height = convert->height;
+			convert->frame_rate = mwindow->edl->session->frame_rate;
+		}
+		convert->audio_data = format_asset->audio_data;
+		if( convert->audio_data ) {
+			convert->sample_rate = mwindow->edl->session->sample_rate;
+		}
 		convert->folder_no = AW_MEDIA_FOLDER;
-		convert->layers = 1;
-		convert->width = idxbl->get_w();
-		if( convert->width & 1 ) ++convert->width;
-		convert->actual_width = convert->width;
-		convert->height = idxbl->get_h();
-		if( convert->height & 1 ) ++convert->height;
-		convert->actual_height = convert->height;
-		convert->frame_rate = mwindow->edl->session->frame_rate;
-		convert->sample_rate = mwindow->edl->session->sample_rate;
 		add_needed(idxbl, convert);
 	}
 	return 1;
@@ -284,17 +336,21 @@ int ConvertRender::find_convertable_assets(EDL *edl)
 	Asset *orig_asset = edl->assets->first;
 	int count = 0;
 	for( ; orig_asset; orig_asset=orig_asset->next ) {
-		if( add_original(edl, orig_asset) )
-			++count;
+		int ret = add_original(edl, orig_asset);
+		if( ret < 0 ) return -1;
+		if( ret ) ++count;
 	}
 	return count;
 }
 
-void ConvertRender::set_format(Asset *asset)
+void ConvertRender::set_format(Asset *asset, const char *suffix, int to_proxy)
 {
+	delete [] this->suffix;
+	this->suffix = cstrdup(suffix);
 	if( !format_asset )
 		format_asset = new Asset();
 	format_asset->copy_from(asset, 0);
+	this->to_proxy = to_proxy;
 }
 
 void ConvertRender::start_convert(float beep, int remove_originals)
@@ -360,13 +416,7 @@ void ConvertRender::start_progress()
 	double total_len= 0;
 	for( int i = 0; i < needed_idxbls.size(); i++ ) {
 		Indexable *orig_idxbl = needed_idxbls[i];
-		int64_t video_frames = orig_idxbl->get_video_frames();
-		double frame_rate = orig_idxbl->get_frame_rate();
-		double video_length = video_frames / frame_rate;
-		int64_t audio_samples = orig_idxbl->get_audio_samples();
-		int sample_rate = orig_idxbl->get_sample_rate();
-		double audio_length = (double)audio_samples / sample_rate;
-		double length = bmax(video_length, audio_length);
+		double length = get_length(orig_idxbl);
 		total_len += length;
 	}
 	int64_t total_samples = total_len * format_asset->sample_rate;
@@ -380,9 +430,8 @@ void ConvertRender::start_progress()
 
 void ConvertRender::stop_progress(const char *msg)
 {
+	delete convert_progress;  convert_progress = 0;
 	mwindow->gui->lock_window("ConvertRender::stop_progress");
-	delete convert_progress;
-	convert_progress = 0;
 	progress->update(0);
 	mwindow->mainprogress->end_progress(progress);
 	progress = 0;
@@ -464,14 +513,8 @@ void ConvertRender::create_copy(int i)
 {
 	Indexable *orig_idxbl = needed_idxbls[i];
 	Asset *needed_copy = needed_copies[i];
-	int64_t video_frames = orig_idxbl->get_video_frames();
-	double frame_rate = orig_idxbl->get_frame_rate();
-	double video_length = video_frames / frame_rate;
-	int64_t audio_samples = orig_idxbl->get_audio_samples();
-	int sample_rate = orig_idxbl->get_sample_rate();
-	double audio_length = (double)audio_samples / sample_rate;
-	double length = bmax(video_length, audio_length);
 	EDL *edl = convert_edl(mwindow->edl, orig_idxbl);
+	double length = get_length(orig_idxbl);
 	ConvertPackageRenderer renderer(this);
 	renderer.initialize(mwindow, edl, mwindow->preferences, needed_copy);
 	PackageDispatcher dispatcher;
@@ -480,7 +523,7 @@ void ConvertRender::create_copy(int i)
 	RenderPackage *package = dispatcher.get_package(0);
 	if( !renderer.render_package(package) ) {
 		Asset *asset = mwindow->edl->assets->update(needed_copy);
-		mwindow->mainindexes->add_next_asset(0, asset);
+		mwindow->mainindexes->add_indexable(asset);
 		mwindow->mainindexes->start_build();
 	}
 	else
@@ -536,6 +579,8 @@ void ConvertWindow::create_objects()
 	add_subwindow(remove_originals = new ConvertRemoveOriginals(this, x, y));
 	x = lmargin;
 	y += remove_originals->get_h() + margin;
+	add_subwindow(to_proxy_path = new ConvertToProxyPath(this, x, y));
+	y += to_proxy_path->get_h() + margin;
 
 	add_subwindow(beep_on_done = new ConvertBeepOnDone(this, x, y));
 	x += beep_on_done->get_w() + margin + xS(10);
@@ -622,6 +667,7 @@ ConvertDialog::ConvertDialog(MWindow *mwindow)
 	asset->audio_data = 1;
 	remove_originals = 1;
 	beep = 0;
+	to_proxy = 0;
 }
 
 ConvertDialog::~ConvertDialog()
@@ -638,6 +684,7 @@ BC_Window* ConvertDialog::new_gui()
 	asset->load_defaults(mwindow->defaults, "CONVERT_", 1, 1, 0, 1, 0);
 	remove_originals = mwindow->defaults->get("CONVERT_REMOVE_ORIGINALS", remove_originals);
 	beep = mwindow->defaults->get("CONVERT_BEEP", beep);
+	to_proxy = mwindow->defaults->get("CONVERT_TO_PROXY", to_proxy);
 	mwindow->defaults->get("CONVERT_SUFFIX", suffix);
 	mwindow->gui->lock_window("ConvertDialog::new_gui");
 	int cx, cy;
@@ -654,8 +701,9 @@ void ConvertDialog::handle_close_event(int result)
 	mwindow->defaults->update("CONVERT_SUFFIX", suffix);
 	mwindow->defaults->update("CONVERT_REMOVE_ORIGINALS", remove_originals);
 	mwindow->defaults->update("CONVERT_BEEP", beep);
+	mwindow->defaults->update("CONVERT_TO_PROXY", to_proxy);
 	asset->save_defaults(mwindow->defaults, "CONVERT_", 1, 1, 0, 1, 0);
-	mwindow->start_convert(asset, suffix, beep, remove_originals);
+	mwindow->start_convert(asset, suffix, beep, to_proxy, remove_originals);
 }
 
 
@@ -675,96 +723,31 @@ int ConvertRemoveOriginals::handle_event()
 	return 1;
 }
 
-ConvertBeepOnDone::ConvertBeepOnDone(ConvertWindow *gui, int x, int y)
- : BC_FPot(x, y, gui->dialog->beep*100.f, 0.f, 100.f)
+ConvertToProxyPath::ConvertToProxyPath(ConvertWindow *gui, int x, int y)
+ : BC_CheckBox(x, y, gui->dialog->to_proxy, _("Into Nested Proxy directory"))
 {
 	this->gui = gui;
 }
 
-int ConvertBeepOnDone::handle_event()
+ConvertToProxyPath::~ConvertToProxyPath()
 {
-	gui->dialog->beep = get_value()/100.f;
-	return 1;
 }
 
-ConvertBeep::ConvertBeep(MWindow *mwindow)
- : Thread(1, 0, 0)
+int ConvertToProxyPath::handle_event()
 {
-	this->mwindow = mwindow;
-	audio = new AudioDevice(mwindow);
-	playing_audio = 0;
-	interrupted = -1;
-}
-
-ConvertBeep::~ConvertBeep()
-{
-	stop(0);
-	delete audio;
-}
-
-void ConvertBeep::run()
-{
-	int channels = 2;
-	int64_t bfrsz = BEEP_SAMPLE_RATE;
-	EDL *edl = mwindow->edl;
-	EDLSession *session = edl->session;
-	AudioOutConfig *aconfig = session->playback_config->aconfig;
-	audio->open_output(aconfig, BEEP_SAMPLE_RATE, bfrsz, channels, 0);
-	audio->start_playback();
-
-	double out0[bfrsz], out1[bfrsz], *out[2] = { out0, out1 };
-	const double two_pi = 2*M_PI;
-	int64_t audio_len = BEEP_SAMPLE_RATE * secs;
-	const double dt = two_pi * freq/BEEP_SAMPLE_RATE;
-	double th = 0;
-
-	audio_pos = 0;
-	playing_audio = 1;
-	while( !interrupted ) {
-		int len = audio_len - audio_pos;
-		if( len <= 0 ) break;
-		if( len > bfrsz ) len = bfrsz;
-		int k = audio_pos;
-		for( int i=0; i<len; ++i,++k,th+=dt ) {
-			double t = th - two_pi;
-			if( t >= 0 ) th = t;
-			out0[i] = out1[i] = sin(th) * gain;
-		}
-		audio->write_buffer(out, channels, len);
-		audio_pos = k;
-	}
-
-	if( !interrupted )
-		audio->set_last_buffer();
-	audio->stop_audio(interrupted ? 0 : 1);
-	playing_audio = 0;
-
-	audio->close_all();
-}
-
-void ConvertBeep::start()
-{
-	if( running() ) return;
-	audio_pos = -1;
-	interrupted = 0;
-	Thread::start();
+	gui->dialog->to_proxy = get_value();
+	return 1;
 }
 
-void ConvertBeep::stop(int wait)
+ConvertBeepOnDone::ConvertBeepOnDone(ConvertWindow *gui, int x, int y)
+ : BC_FPot(x, y, gui->dialog->beep*100.f, 0.f, 100.f)
 {
-	if( running() && !interrupted ) {
-		interrupted = 1;
-		audio->stop_audio(wait);
-	}
-	Thread::join();
+	this->gui = gui;
 }
 
-void ConvertBeep::tone(double freq, double secs, double gain)
+int ConvertBeepOnDone::handle_event()
 {
-	stop(0);
-	this->freq = freq;
-	this->secs = secs;
-	this->gain = gain;
-	start();
+	gui->dialog->beep = get_value()/100.f;
+	return 1;
 }