add bluray dv, misc fixes

diff --git a/cinelerra-5.1/bld_scripts/bld_prepare.sh b/cinelerra-5.1/bld_scripts/bld_prepare.sh
index 82774d750d5db332071727f0d2052ea0c71bccc3..5c0d01fac14b9c257b7d7fb22005011b82fcbe7a 100755 (executable)
--- a/cinelerra-5.1/bld_scripts/bld_prepare.sh
+++ b/cinelerra-5.1/bld_scripts/bld_prepare.sh
@@ -33,7 +33,7 @@ case "$dir" in
     rm -f /tmp/$yasm
   ;;
 "fedora")
-  dnf -y -best --allowerasing \
+  dnf -y --best --allowerasing \
     install nasm yasm libavc1394-devel libusb-devel flac-devel \
     libjpeg-devel libdv-devel libdvdnav-devel libdvdread-devel \
     libtheora-devel libiec61883-devel esound-devel uuid-devel \
@@ -46,7 +46,7 @@ case "$dir" in
     flac-devel libsndfile-devel libtheora-devel linux-firmware \
     ivtv-firmware libvorbis-devel texinfo xz-devel lzma-devel cmake git \
     ctags patch gcc-c++ perl-XML-XPath libtiff-devel python dvdauthor \
-    gettext-devel inkscape udftools autoconf automake
+    gettext-devel inkscape udftools autoconf automake numactl-devel
   ;;
 "suse" | "leap")
   zypper -n install nasm gcc gcc-c++ zlib-devel texinfo libpng16-devel \

diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index 799796ff94eab561b3ab324cb2b345144be96b79..62ef2955b2a6b48ffb2acda58d5548e380cf7c4b 100644 (file)
--- a/cinelerra-5.1/cinelerra/batchrender.C
+++ b/cinelerra-5.1/cinelerra/batchrender.C
@@ -1206,6 +1206,8 @@ void BatchRenderLoadList::run()
                thread->mwindow->defaults->update("DEFAULT_BATCHLOADPATH", thread->batch_path);
                thread->load_jobs(thread->batch_path, thread->mwindow->preferences);
                thread->gui->create_list(1);
+               thread->current_job = 0;
+               thread->gui->change_job();
        }
 
        thread->gui->flush();

diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index cc0fbc8cf51375dc2c57bb8535840e0f4d2adacf..37d2762539c24a8d8558dd6f50c2d689f2b71cf1 100644 (file)
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -55,7 +55,7 @@ static struct bd_format {
        { "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 },
+       { "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 },
 };
@@ -233,6 +233,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
        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,"kill $$\n");
        fprintf(fp,"\n");
        fclose(fp);
 

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index 9828165941db009393dd0cbe195077ac8716fedd..055b4ca57421254a3d7ec1158afc8f7e1983b3d5 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,"kill $$\n");
        fprintf(fp,"\n");
        fclose(fp);
 

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 69b8a9dd86bb4801c5929069f07a3f2d4e023c61..4239bc5d203329bb8a852fb24445871d78b85449 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1884,6 +1884,9 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
                if( fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER )
                        st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
+               av_dict_set(&sopts, "cin_bitrate", 0, 0);
+               av_dict_set(&sopts, "cin_quality", 0, 0);
+
                ret = avcodec_open2(st->codec, codec, &sopts);
                if( ret < 0 ) {
                        ff_err(ret,"FFMPEG::open_encoder");

diff --git a/cinelerra-5.1/ffmpeg/video/bluray_dv_ntsc.mt2s b/cinelerra-5.1/ffmpeg/video/bluray_dv_ntsc.mt2s
new file mode 100644 (file)
index 0000000..bd4d932
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/bluray_dv_ntsc.mt2s
@@ -0,0 +1,17 @@
+bluray libx264
+bluray-compat=1
+cin_bitrate=15000000
+id=0x1011
+level=41
+profile=high
+preset=veryslow
+tune=film
+sar=8:9
+refs=25
+bf=2
+flags=-cgop
+color_primaries=bt470bg
+color_trc=gamma28
+colorspace=bt470bg
+# must be last for bdcreate.C
+x264opts cabac=1:keyint=25:min-keyint=4:qpmin=3:qpmax=33:qp_step=4:merange=8:bff

diff --git a/cinelerra-5.1/ffmpeg/video/bluray_dv_pal.mt2s b/cinelerra-5.1/ffmpeg/video/bluray_dv_pal.mt2s
new file mode 100644 (file)
index 0000000..8fd4e8a
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/bluray_dv_pal.mt2s
@@ -0,0 +1,17 @@
+bluray libx264
+bluray-compat=1
+cin_bitrate=15000000
+id=0x1011
+level=41
+profile=high
+preset=veryslow
+tune=film
+sar=16:15
+refs=25
+bf=2
+flags=-cgop
+color_primaries=bt470bg
+color_trc=gamma28
+colorspace=bt470bg
+# must be last for bdcreate.C
+x264opts cabac=1:keyint=25:min-keyint=4:qpmin=3:qpmax=33:qp_step=4:merange=8:tff