{ "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 25i", 720,576, 25., 0, ILACE_MODE_BOTTOM_FIRST },
{ "720x576 25p*", 720,576, 25., 0, ILACE_MODE_NOTINTERLACED },
- { "720x576 25i", 720,576, 25., 0, ILACE_MODE_TOP_FIRST },
- { "720x480 29.97p*", 720,480, 29.97, 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;
close_window();
}
-void CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
+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;
+ if( !home ) return ret;
FILE *fp = fopen("/etc/fstab","r");
- if( !fp ) return;
+ if( !fp ) return ret;
int len = strlen(home);
char line[BCTEXTLEN], typ[BCTEXTLEN], file[BCTEXTLEN];
char mpnt[BCTEXTLEN], opts[BCTEXTLEN];
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)
return 1;
}
char udfs[BCTEXTLEN], mopts[BCTEXTLEN], mntpt[BCTEXTLEN];
- get_udfs_mount(udfs, mopts, mntpt);
+ 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,"sz=`du -cb $1/bd.m2ts* | tail -1 | sed -e 's/[ \t].*//'`\n");
fprintf(fp,"blks=$((sz/2048 + 4096))\n");
fprintf(fp,"rm -f %s\n", udfs);
- fprintf(fp,"mkudffs %s $blks\n", udfs);
+ fprintf(fp,"mkudffs -b 2048 %s $blks\n", udfs);
fprintf(fp,"mount %s%s\n", mopts, mntpt);
- fprintf(fp,"bdwrite %s $1/bd.m2ts\n",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=%s\n", udfs);
- fprintf(fp,"echo for RW: dd if=%s of=/dev/bd bs=2048000\n",udfs);
+ 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);
- if( use_wide_audio ) {
- session->audio_channels = session->audio_tracks = BD_WIDE_CHANNELS;
- session->achannel_positions[0] = 90;
- session->achannel_positions[1] = 150;
- session->achannel_positions[2] = 30;
- session->achannel_positions[3] = 210;
- session->achannel_positions[4] = 330;
- session->achannel_positions[5] = 270;
- if( edl->tracks->recordable_audio_tracks() == BD_WIDE_CHANNELS )
- mwindow->remap_audio(MWindow::AUDIO_1_TO_1);
- }
- else {
- session->audio_channels = session->audio_tracks = BD_CHANNELS;
- session->achannel_positions[0] = 180;
- session->achannel_positions[1] = 0;
- if( edl->tracks->recordable_audio_tracks() == BD_WIDE_CHANNELS )
- mwindow->remap_audio(MWindow::AUDIO_5_1_TO_2);
- }
+ session->audio_channels = session->audio_tracks =
+ !use_wide_audio ? BD_CHANNELS : BD_WIDE_CHANNELS;
+ for( int i=0; i<MAX_CHANNELS; ++i )
+ session->achannel_positions[i] = default_audio_channel_position(i, session->audio_channels);
+ int audio_mapping = edl->tracks->recordable_audio_tracks() == BD_WIDE_CHANNELS &&
+ !use_wide_audio ? MWindow::AUDIO_5_1_TO_2 : MWindow::AUDIO_1_TO_1;
+ mwindow->remap_audio(audio_mapping);
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);
char xml_filename[BCTEXTLEN];
sprintf(xml_filename, "%s/bd.xml", asset_dir);
FileXML xml_file;
- edl->save_xml(&xml_file, xml_filename, 0, 0);
+ edl->save_xml(&xml_file, xml_filename);
xml_file.terminate_string();
if( xml_file.write_to_file(xml_filename) ) {
char msg[BCTEXTLEN];
return 1;
}
- BatchRenderJob *job = new BatchRenderJob(mwindow->preferences);
+ BatchRenderJob *job = new BatchRenderJob(mwindow->preferences, use_label_chapters);
jobs->append(job);
strcpy(&job->edl_path[0], xml_filename);
Asset *asset = job->asset;
asset->ff_video_bitrate = vid_bitrate;
asset->ff_video_quality = -1;
- job = new BatchRenderJob(mwindow->preferences);
+ job = new BatchRenderJob(mwindow->preferences, 0, 0);
jobs->append(job);
job->edl_path[0] = '@';
strcpy(&job->edl_path[1], script_filename);
}
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);
use_scale = Rescale::scaled;
}
for( int i=0; i<trk->plugin_set.size(); ++i ) {
- for(Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
- plugin;
- plugin = (Plugin*)plugin->next) {
- if( !strcmp(plugin->title, _("Deinterlace")) )
+ for( Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
+ plugin; plugin=(Plugin*)plugin->next ) {
+ if( !strcmp(plugin->title, "Deinterlace") )
has_deinterlace = 1;
- if( !strcmp(plugin->title, _("Auto Scale")) ||
- !strcmp(plugin->title, _("Scale Ratio")) ||
- !strcmp(plugin->title, _("Scale")) )
+ if( !strcmp(plugin->title, "Auto Scale") ||
+ !strcmp(plugin->title, "Scale Ratio") ||
+ !strcmp(plugin->title, "Scale") )
has_scale = 1;
}
}
projects / goodguy / history.git / blobdiff