X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbdcreate.C;h=3ed07e48d70f96671535c9856f0362425b06c808;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=b784d0ed218c7689ad5e8fca8282144219e58cfe;hpb=27d1d08d9125dc46f252073aaf1fead7518ee4c8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index b784d0ed..3ed07e48 100644
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -54,10 +54,10 @@ static struct bd_format {
 	{ "1280x720  50p",	1280,720,  50.,    1, ILACE_MODE_NOTINTERLACED },
 	{ "1280x720  24p",	1280,720,  24.,    1, ILACE_MODE_NOTINTERLACED },
 	{ "1280x720  23.976p",	1280,720,  23.976, 1, ILACE_MODE_NOTINTERLACED },
-	{ "720x576   25p*",	 720,576,  25.,    0, ILACE_MODE_NOTINTERLACED },
 	{ "720x576   25i",	 720,576,  25.,    0, ILACE_MODE_BOTTOM_FIRST },
-	{ "720x480   29.97p*",	 720,480,  29.97,  0, ILACE_MODE_NOTINTERLACED },
+	{ "720x576   25p*",	 720,576,  25.,    0, ILACE_MODE_NOTINTERLACED },
 	{ "720x480   29.97i",	 720,480,  29.97,  0, ILACE_MODE_BOTTOM_FIRST },
+	{ "720x480   29.97p*",	 720,480,  29.97,  0, ILACE_MODE_NOTINTERLACED },
 };
 
 const int64_t CreateBD_Thread::BD_SIZE = 25000000000;
@@ -121,6 +121,52 @@ CreateBD_Thread::~CreateBD_Thread()
 	close_window();
 }
 
+int CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
+{
+	int ret = 0;
+// default: mount -t udf -o loop $1/bd.udfs $1/udfs
+	strcpy(udfs,"$1/bd.udfs");
+	strcpy(mopts,"-t udf -o loop $1/bd.udfs ");
+	strcpy(mntpt,"$1/udfs");
+	const char *home = getenv("HOME");
+	if( !home ) return ret;
+	FILE *fp = fopen("/etc/fstab","r");
+	if( !fp ) return ret;
+	int len = strlen(home);
+	char line[BCTEXTLEN], typ[BCTEXTLEN], file[BCTEXTLEN];
+	char mpnt[BCTEXTLEN], opts[BCTEXTLEN];
+	while( fgets(line,sizeof(line),fp) ) {
+// search "/etc/fstab" for: $HOME/img_file $HOME/bluray udf noauto,loop,rw,user
+		if( line[0] == '#' || line[0] == ';' ) continue;
+		if( sscanf(line,"%s %s %s %s ", &file[0], &mpnt[0], &typ[0], &opts[0]) != 4 )
+			continue;
+		if( strcmp("udf", typ) ) continue;
+		if( strncmp(home, file, len) || file[len] != '/' ) continue;
+		if( strncmp(home, mpnt, len) ) continue;
+		if( strcmp(&mpnt[len], "/bluray") ) continue;
+		int loop = 0, user = 0, rw = 0, noauto = 0;
+		char *op = opts, *ep = op + sizeof(opts)-1;
+		while( op < ep && *op ) {
+			char opt[BCTEXTLEN], *cp = opt;
+			while( op < ep && *op && (*cp=*op++)!=',' ) ++cp;
+			*cp = 0;
+			if( !strcmp("loop", opt) ) loop = 1;
+			else if( !strcmp("user", opt) ) user = 1;
+			else if( !strcmp("noauto", opt) ) noauto = 1;
+			else if( !strcmp("rw", opt) ) rw = 1;
+		}
+		if( loop && user && rw && noauto ) {
+			strcpy(udfs, file);
+			strcpy(mopts, "");
+			strcpy(mntpt, mpnt);
+			ret = 1;
+			break;
+		}
+	}
+	fclose(fp);
+	return ret;
+}
+
 int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char *asset_dir)
 {
 	EDL *edl = mwindow->edl;
@@ -174,19 +220,25 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
 		MainError::show_error(msg);
 		return 1;
 	}
+	char udfs[BCTEXTLEN], mopts[BCTEXTLEN], mntpt[BCTEXTLEN];
+	int is_usr_mnt = get_udfs_mount(udfs, mopts, mntpt);
 	const char *exec_path = File::get_cinlib_path();
 	fprintf(fp,"#!/bin/bash -ex\n");
 	fprintf(fp,"PATH=$PATH:%s\n",exec_path);
 	fprintf(fp,"mkdir -p $1/udfs\n");
 	fprintf(fp,"sz=`du -sb $1/bd.m2ts | sed -e 's/[ \t].*//'`\n");
 	fprintf(fp,"blks=$((sz/2048 + 4096))\n");
-	fprintf(fp,"mkudffs $1/bd.udfs $blks\n");
-	fprintf(fp,"mount -o loop $1/bd.udfs $1/udfs\n");
-	fprintf(fp,"bdwrite $1/udfs $1/bd.m2ts\n");
-	fprintf(fp,"umount $1/udfs\n");
+	fprintf(fp,"rm -f %s\n", udfs);
+	fprintf(fp,"mkudffs %s $blks\n", udfs);
+	fprintf(fp,"mount %s%s\n", mopts, mntpt);
+	fprintf(fp,"bdwrite %s $1/bd.m2ts\n",mntpt);
+	fprintf(fp,"umount %s\n",mntpt);
+	if( is_usr_mnt )
+		fprintf(fp,"mv -f %s $1/bd.udfs\n", udfs);
 	fprintf(fp,"echo To burn bluray, load writable media and run:\n");
 	fprintf(fp,"echo for WORM: growisofs -dvd-compat -Z /dev/bd=$1/bd.udfs\n");
 	fprintf(fp,"echo for RW:   dd if=$1/bd.udfs of=/dev/bd bs=2048000\n");
+	fprintf(fp,"kill $$\n");
 	fprintf(fp,"\n");
 	fclose(fp);
 
@@ -211,6 +263,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
 
 	double new_samplerate = session->sample_rate;
 	double new_framerate = session->frame_rate;
+	edl->retrack();
 	edl->rechannel();
 	edl->resample(old_samplerate, new_samplerate, TRACK_AUDIO);
 	edl->resample(old_framerate, new_framerate, TRACK_VIDEO);
@@ -275,7 +328,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
 		strncpy(cp, opts, sizeof(asset->ff_video_options)-len);
 	}
 	asset->ff_video_bitrate = vid_bitrate;
-	asset->ff_video_quality = 0;
+	asset->ff_video_quality = -1;
 
 	job = new BatchRenderJob(mwindow->preferences);
 	jobs->append(job);
@@ -363,8 +416,8 @@ void CreateBD_Thread::handle_close_event(int result)
 	}
 
 	char asset_dir[BCTEXTLEN], jobs_path[BCTEXTLEN];
-	sprintf(asset_dir, "%s/%s", tmp_path, asset_title);
-	sprintf(jobs_path, "%s/bd.jobs", asset_dir);
+	snprintf(asset_dir, sizeof(asset_dir), "%s/%s", tmp_path, asset_title);
+	snprintf(jobs_path, sizeof(jobs_path), "%s/bd.jobs", asset_dir);
 	mwindow->batch_render->reset(jobs_path);
 	int ret = create_bd_jobs(&mwindow->batch_render->jobs, asset_dir);
 	mwindow->undo->update_undo_after(_("create bd"), LOAD_ALL);