VBR for ffmpeg mpegts, user mount for udf images, widget fixes
[goodguy/history.git] / cinelerra-5.1 / cinelerra / bdcreate.C
index de8042b3e9b6d772b89eb6775ecdaf646ab16aa2..02386bd05ca28da2950689d2af8c78b999fca0a5 100644 (file)
@@ -46,14 +46,14 @@ static struct bd_format {
        { "1920x1080 24p",      1920,1080, 24.,    1, ILACE_MODE_NOTINTERLACED },
        { "1920x1080 25i",      1920,1080, 25.,    1, ILACE_MODE_TOP_FIRST },
        { "1920x1080 23.976p",  1920,1080, 23.976, 1, ILACE_MODE_NOTINTERLACED },
-       { "1440x1080 29.97i",   1440,1080, 29.97,  0, ILACE_MODE_TOP_FIRST },
-       { "1440x1080 25i",      1440,1080, 25.,    0, ILACE_MODE_TOP_FIRST },
-       { "1440x1080 24p",      1440,1080, 24.,    0, ILACE_MODE_NOTINTERLACED },
-       { "1440x1080 23.976p",  1440,1080, 23.976, 0, ILACE_MODE_NOTINTERLACED },
+       { "1440x1080 29.97i",   1440,1080, 29.97, -1, ILACE_MODE_TOP_FIRST },
+       { "1440x1080 25i",      1440,1080, 25.,   -1, ILACE_MODE_TOP_FIRST },
+       { "1440x1080 24p",      1440,1080, 24.,   -1, ILACE_MODE_NOTINTERLACED },
+       { "1440x1080 23.976p",  1440,1080, 23.976,-1, ILACE_MODE_NOTINTERLACED },
        { "1280x720  59.94p",   1280,720,  59.94,  1, ILACE_MODE_NOTINTERLACED },
        { "1280x720  50p",      1280,720,  50.,    1, ILACE_MODE_NOTINTERLACED },
-       { "1280x720  23.976p",  1280,720,  23.976, 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 },
@@ -70,11 +70,11 @@ const double CreateBD_Thread::BD_ASPECT_WIDTH = 4.;
 const double CreateBD_Thread::BD_ASPECT_HEIGHT = 3.;
 const double CreateBD_Thread::BD_FRAMERATE = 24000. / 1001.;
 //const int CreateBD_Thread::BD_MAX_BITRATE = 40000000;
-const int CreateBD_Thread::BD_MAX_BITRATE = 8000000;
+const int CreateBD_Thread::BD_MAX_BITRATE = 10000000;
 const int CreateBD_Thread::BD_CHANNELS = 2;
 const int CreateBD_Thread::BD_WIDE_CHANNELS = 6;
 const double CreateBD_Thread::BD_SAMPLERATE = 48000;
-const double CreateBD_Thread::BD_KAUDIO_RATE = 224;
+const double CreateBD_Thread::BD_KAUDIO_RATE = 192;
 const int CreateBD_Thread::BD_INTERLACE_MODE = ILACE_MODE_NOTINTERLACED;
 
 CreateBD_MenuItem::CreateBD_MenuItem(MWindow *mwindow)
@@ -121,6 +121,49 @@ CreateBD_Thread::~CreateBD_Thread()
        close_window();
 }
 
+void CreateBD_Thread::get_udfs_mount(char *udfs, char *mopts, char *mntpt)
+{
+// 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;
+       FILE *fp = fopen("/etc/fstab","r");
+       if( !fp ) return;
+       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);
+                       break;
+               }
+       }
+       fclose(fp);
+}
+
 int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char *asset_dir)
 {
        EDL *edl = mwindow->edl;
@@ -174,19 +217,22 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
                MainError::show_error(msg);
                return 1;
        }
+       char udfs[BCTEXTLEN], mopts[BCTEXTLEN], mntpt[BCTEXTLEN];
+       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);
        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,"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,"\n");
        fclose(fp);
 
@@ -334,6 +380,7 @@ void CreateBD_Thread::handle_close_event(int result)
                                        edit->startproject, edit->length,
                                        PLUGIN_STANDALONE, 0, &keyframe, 0);
                        }
+                       vtrk->optimize();
                }
        }
        if( use_resize_tracks )
@@ -803,6 +850,7 @@ insert_video_plugin(const char *title, KeyFrame *default_keyframe)
                                edit->startproject, edit->length,
                                PLUGIN_STANDALONE, 0, default_keyframe, 0);
                }
+               vtrk->optimize();
        }
        return 0;
 }
@@ -838,10 +886,11 @@ option_presets()
        bd_width = bd_formats[use_standard].w;
        bd_height = bd_formats[use_standard].h;
        bd_framerate = bd_formats[use_standard].framerate;
-       bd_aspect_width = bd_formats[use_standard].wide ?
-               BD_WIDE_ASPECT_WIDTH : BD_ASPECT_WIDTH;
-       bd_aspect_height = bd_formats[use_standard].wide ?
-               BD_WIDE_ASPECT_HEIGHT : BD_ASPECT_HEIGHT;
+       int wide = bd_formats[use_standard].wide;
+       bd_aspect_width  = wide < 0 ? 1. :
+               wide > 0 ? BD_WIDE_ASPECT_WIDTH  : BD_ASPECT_WIDTH;
+       bd_aspect_height = wide < 0 ? 1. :
+               wide > 0 ? BD_WIDE_ASPECT_HEIGHT : BD_ASPECT_HEIGHT;
        bd_interlace_mode = bd_formats[use_standard].interlaced;
        double bd_aspect = bd_aspect_width / bd_aspect_height;
 
@@ -865,7 +914,8 @@ option_presets()
                                float aw, ah;
                                MWindow::create_aspect_ratio(aw, ah, w, h);
                                double aspect = ah > 0 ? aw / ah : 1;
-                               if( !EQUIV(aspect, bd_aspect) ) use_scale = Rescale::scaled;
+                               if( wide >= 0 && !EQUIV(aspect, bd_aspect) )
+                                       use_scale = Rescale::scaled;
                        }
                        for( int i=0; i<trk->plugin_set.size(); ++i ) {
                                for(Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;