Credit Andrew for DVD BFF interlace+ mods and Andrea for bld_appimage fix

diff --git a/cinelerra-5.1/bld_appimage.sh b/cinelerra-5.1/bld_appimage.sh
index 1fcdd70e7ecc06e6d33e3f7403210884d36225cc..fb7a5cb9e5ae2c345442c871de4cdad04dc17341 100755 (executable)
--- a/cinelerra-5.1/bld_appimage.sh
+++ b/cinelerra-5.1/bld_appimage.sh
@@ -20,7 +20,7 @@ CONFIG_OPTIONS="--with-single-user --with-booby --enable-static-build"
 if [ $target = "aarch64" ] ; then
 CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-dav1d"
 elif [ $target = "armv7l" ] ; then
-CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-dav1d --disable-libaom --disable libwebp --without-nv"
+CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-dav1d --disable-libaom --disable-libwebp --without-nv"
 fi
 echo configure script options are $CONFIG_OPTIONS
 

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index 527228414c9a18adc43b6eed254c36e30ce91161..ac9f5fdde6faaedb1c93eb50536572a7e50ff103 100644 (file)
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -28,6 +28,7 @@
 #include "edlsession.h"
 #include "file.h"
 #include "filexml.h"
+#include "interlacemodes.h"
 #include "keyframe.h"
 #include "labels.h"
 #include "mainerror.h"
@@ -466,12 +467,17 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
                asset->vmpeg_bitrate = vid_bitrate;
                asset->vmpeg_quantization = 15;
                asset->vmpeg_iframe_distance = 15;
-               asset->vmpeg_progressive = 0;
+               if(session->interlace_mode == ILACE_MODE_NOTINTERLACED || use_deinterlace)
+               { asset->vmpeg_progressive = 1; } else {
+               asset->vmpeg_progressive = 0; }
                asset->vmpeg_denoise = 0;
                asset->vmpeg_seq_codes = 0;
                asset->vmpeg_derivative = 2;
                asset->vmpeg_preset = 8;
                asset->vmpeg_field_order = 0;
+               if(session->interlace_mode == ILACE_MODE_BOTTOM_FIRST && !use_deinterlace)
+               { asset->vmpeg_field_order = 1; } else {
+               asset->vmpeg_field_order = 0; }
                asset->vmpeg_pframe_distance = 0;
                use_farmed = job->farmed;
                job = new BatchRenderJob(mwindow->preferences, 0, 0);

diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C
index c728036ae52604364c7093dde59c763b4ba2e833..49dfedeac79d720c5b5d7c84011aa656e3dfb4d6 100644 (file)
--- a/cinelerra-5.1/cinelerra/filempeg.C
+++ b/cinelerra-5.1/cinelerra/filempeg.C
@@ -632,6 +632,28 @@ int FileMPEG::open_file(int rd, int wr)
                                sprintf(string, " -V 500");
                                strncat(mjpeg_command, string, sizeof(mjpeg_command));
                        }
+                       
+                       if(asset->vmpeg_preset == 13) /* set high profile for 1080 */
+                       {
+                       sprintf(string, " -l high");
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+                       }
+                       
+                       if(asset->vmpeg_preset == 6) /* set -T for vcd */
+                       {
+                       sprintf(string, " -T 35");
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+                       }
+                       
+                       if(asset->vmpeg_preset == 7) /* set -T for svcd */
+                       {
+                       sprintf(string, " -T 120");
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+                       }
+                       
+                       sprintf(string, " -c"); /* set closed gop */
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+               
 
                        strncat(mjpeg_command,
                                asset->vmpeg_progressive ? " -I 0" : " -I 1",

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index bf7794b37f6816a5eb7d4809bb285b8663718cbf..af97ee55e5ecd5fba4287ce314d23e72458dcdd7 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,11 +3,8 @@ For usage help, refer to the following:
   https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
 .
-<<<<<<< HEAD
 2023 April changes of note:
   X264 has been upgraded to r3106 stable release. 
-=======
->>>>>>> 3a4fc0d9ea25818f9de852a0a7e3eab22ceaaebd
 2023 March changes of note:
   Flac has been upgraded to 1.4.2
   Tiff has been upgraded to 4.5.0