projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy bug fixes, add moveobj, sams icons, ladspa fixes, pot sigfpe
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
dvdcreate.C
diff --git
a/cinelerra-5.1/cinelerra/dvdcreate.C
b/cinelerra-5.1/cinelerra/dvdcreate.C
index 155f17fbd1d2d5d8184cc241c3ea397c2301bb20..e7eb1db2c127da9f68d52896610b4cd1da1c16b3 100644
(file)
--- a/
cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/
cinelerra-5.1/cinelerra/dvdcreate.C
@@
-237,6
+237,7
@@
int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
fprintf(fp,"\n");
fprintf(fp,"echo To burn dvd, load blank media and run:\n");
fprintf(fp,"echo growisofs -dvd-compat -Z /dev/dvd -dvd-video $1/iso\n");
fprintf(fp,"\n");
fprintf(fp,"echo To burn dvd, load blank media and run:\n");
fprintf(fp,"echo growisofs -dvd-compat -Z /dev/dvd -dvd-video $1/iso\n");
+ fprintf(fp,"kill $$\n");
fprintf(fp,"\n");
fclose(fp);
fprintf(fp,"\n");
fclose(fp);
@@
-261,6
+262,7
@@
int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
double new_samplerate = session->sample_rate;
double new_framerate = session->frame_rate;
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);
edl->rechannel();
edl->resample(old_samplerate, new_samplerate, TRACK_AUDIO);
edl->resample(old_framerate, new_framerate, TRACK_VIDEO);
@@
-314,7
+316,7
@@
int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
FFMPEG::load_options(option_path, asset->ff_video_options,
sizeof(asset->ff_video_options));
asset->ff_video_bitrate = vid_bitrate;
FFMPEG::load_options(option_path, asset->ff_video_options,
sizeof(asset->ff_video_options));
asset->ff_video_bitrate = vid_bitrate;
- asset->ff_video_quality =
0
;
+ asset->ff_video_quality =
-1
;
}
else {
sprintf(&asset->path[0],"%s/dvd.m2v", asset_dir);
}
else {
sprintf(&asset->path[0],"%s/dvd.m2v", asset_dir);
@@
-407,6
+409,7
@@
void CreateDVD_Thread::handle_close_event(int result)
edit->startproject, edit->length,
PLUGIN_STANDALONE, 0, &keyframe, 0);
}
edit->startproject, edit->length,
PLUGIN_STANDALONE, 0, &keyframe, 0);
}
+ vtrk->optimize();
}
}
}
}
@@
-435,8
+438,8
@@
void CreateDVD_Thread::handle_close_event(int result)
insert_video_plugin("Histogram", &keyframe);
}
char asset_dir[BCTEXTLEN], jobs_path[BCTEXTLEN];
insert_video_plugin("Histogram", &keyframe);
}
char asset_dir[BCTEXTLEN], jobs_path[BCTEXTLEN];
- s
printf(asset_dir
, "%s/%s", tmp_path, asset_title);
- s
printf(jobs_path
, "%s/dvd.jobs", asset_dir);
+ s
nprintf(asset_dir, sizeof(asset_dir)
, "%s/%s", tmp_path, asset_title);
+ s
nprintf(jobs_path, sizeof(jobs_path)
, "%s/dvd.jobs", asset_dir);
mwindow->batch_render->reset(jobs_path);
int ret = create_dvd_jobs(&mwindow->batch_render->jobs, asset_dir);
mwindow->undo->update_undo_after(_("create dvd"), LOAD_ALL);
mwindow->batch_render->reset(jobs_path);
int ret = create_dvd_jobs(&mwindow->batch_render->jobs, asset_dir);
mwindow->undo->update_undo_after(_("create dvd"), LOAD_ALL);
@@
-898,6
+901,7
@@
insert_video_plugin(const char *title, KeyFrame *default_keyframe)
edit->startproject, edit->length,
PLUGIN_STANDALONE, 0, default_keyframe, 0);
}
edit->startproject, edit->length,
PLUGIN_STANDALONE, 0, default_keyframe, 0);
}
+ vtrk->optimize();
}
return 0;
}
}
return 0;
}