Credit Andrew - add new render formats for dvd_pcm.dvd and mp2; fix location of HiLo...

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index 9bdf847f3f58cd7373d2e4d05cf45ab9ef09026d..18dde8ff527c6d53d73ce79e5da736e8289c80ce 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -412,11 +412,11 @@ void AssetEditWindow::create_objects()
                        {
                                x = x2;
 
-                               add_subwindow(lohi = new AssetEditByteOrderLOHI(this,
-                                       asset->byte_order, x, y));
-                               x += xS(70);
                                add_subwindow(hilo = new AssetEditByteOrderHILO(this,
                                        !asset->byte_order, x, y));
+                               x += xS(70);
+                               add_subwindow(lohi = new AssetEditByteOrderLOHI(this,
+                                       asset->byte_order, x, y));
                                y += vmargin;
                        }
                        else {

diff --git a/cinelerra-5.1/cinelerra/fileformat.C b/cinelerra-5.1/cinelerra/fileformat.C
index c87edf2cfe3d3fcabf02a76cc1e92e09f9ba69fe..a5cbbe012417f2058e4409798326d8da309e5bb0 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileformat.C
+++ b/cinelerra-5.1/cinelerra/fileformat.C
@@ -101,8 +101,8 @@ void FileFormat::create_objects_(char *string2)
 
 //printf("FileFormat::create_objects_ 1 %d\n", asset->byte_order);
        add_subwindow(new BC_Title(x, y, _("Byte order:")));
-       add_subwindow(lohi = new FileFormatByteOrderLOHI(x2, y, this, asset->byte_order));
-       add_subwindow(hilo = new FileFormatByteOrderHILO(x2 + 70, y, this, !asset->byte_order));
+       add_subwindow(hilo = new FileFormatByteOrderHILO(x2, y, this, !asset->byte_order));
+       add_subwindow(lohi = new FileFormatByteOrderLOHI(x2 + 70, y, this, asset->byte_order));
 
        y += ys30;
        add_subwindow(signed_button = new FileFormatSigned(x, y, this, asset->signed_));

diff --git a/cinelerra-5.1/ffmpeg/audio/dvd_pcm.dvd b/cinelerra-5.1/ffmpeg/audio/dvd_pcm.dvd
new file mode 100644 (file)
index 0000000..4b20212
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/dvd_pcm.dvd
@@ -0,0 +1,2 @@
+dvd pcm_dvd
+# works with 32, 44.1, 48 or 96Khz

diff --git a/cinelerra-5.1/ffmpeg/audio/mp2.dfl b/cinelerra-5.1/ffmpeg/audio/mp2.dfl
new file mode 100644 (file)
index 0000000..4315a97
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/mp2.dfl
@@ -0,0 +1 @@
+mp2.mp2

diff --git a/cinelerra-5.1/ffmpeg/audio/mp2.mp2 b/cinelerra-5.1/ffmpeg/audio/mp2.mp2
new file mode 100644 (file)
index 0000000..8c3ee28
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/mp2.mp2
@@ -0,0 +1,2 @@
+mp2 mp2
+b=384000

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 650027bc4f5cbcd44c727c837a170ef570c1e716..72a4bb4dc2a107242bf94c5a8d4243debdb53962 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,6 +3,13 @@ For usage help, refer to the following:
   https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
 .
+2024 January changes of note:
+  X265 library has been updated to snapshot of 17-12-2023.
+  Libsndfile is now at version 1.2.2.
+  Libaom is updated to 3.8.0 but does not work on older O/S.
+  The Resources window info/details now shows sar/dar values.
+  Libsvtav1 is a buildable option for newer distros.
+  Color3way / Histogram now allow for greater than 1 values.
 2023 November changes of note:
   New build farm for Ubuntu, Debian, Suse, and Fedora at:
    https://github.com/einhander/cin-gg-packages/releases

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.patchD b/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.patchD
new file mode 100644 (file)
index 0000000..874fc2a
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.patchD
@@ -0,0 +1,26 @@
+--- a/libavcodec/pcm-dvdenc.c
++++ b/libavcodec/pcm-dvdenc.c
+@@ -38,6 +38,12 @@ static av_cold int pcm_dvd_encode_init(AVCodecContext *avctx)
+     int quant, freq, frame_size;
+
+     switch (avctx->sample_rate) {
++    case 32000:
++       freq = 3;
++       break;
++    case 44100:
++       freq = 2;
++       break;
+     case 48000:
+         freq = 0;
+         break;
+@@ -181,7 +187,7 @@ const FFCodec ff_pcm_dvd_encoder = {
+     .priv_data_size = sizeof(PCMDVDContext),
+     .init           = pcm_dvd_encode_init,
+     FF_CODEC_ENCODE_CB(pcm_dvd_encode_frame),
+-    .p.supported_samplerates = (const int[]) { 48000, 96000, 0},
++    .p.supported_samplerates = (const int[]) { 32000, 44100, 48000, 96000, 0},
+     CODEC_OLD_CHANNEL_LAYOUTS(AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO,
+                               AV_CH_LAYOUT_5POINT1, AV_CH_LAYOUT_7POINT1)
+     .p.ch_layouts   = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO,
+--
+2.43.0

diff --git a/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch8 b/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch8
new file mode 100644 (file)
index 0000000..610f94e
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch8
@@ -0,0 +1,34 @@
+Index: mplex/lpcmstrm_in.cpp
+===================================================================
+--- ./mplex/lpcmstrm_in.cpp    (revision 3507)
++++ ./mplex/lpcmstrm_in.cpp    (working copy)
+@@ -306,7 +306,15 @@
+     default : bps_code = 3; break;
+     }
+     dst[4] = starting_frame_index;
+-    unsigned int bsf_code = (samples_per_second == 48000) ? 0 : 1;
++    unsigned int bsf_code;
++    switch(samples_per_second)
++    {
++    case 48000: bsf_code = 0; break;
++    case 96000: bsf_code = 1; break;
++    case 44100: bsf_code = 2; break;
++    case 32000: bsf_code = 3; break;
++    }
++    //unsigned int bsf_code = (samples_per_second == 48000) ? 0 : 1;
+     unsigned int channels_code = channels - 1;
+     dst[5] = (bps_code << 6) | (bsf_code << 4) | channels_code;
+     dst[6] = dynamic_range_code;
+Index: mplex/stream_params.cpp
+===================================================================
+--- ./mplex/stream_params.cpp  (revision 3507)
++++ ./mplex/stream_params.cpp  (working copy)
+@@ -46,7 +46,7 @@
+                                                               unsigned int chans, 
+                                                               unsigned int bits )
+ {
+-    if( samples != 48000 && samples != 96000 )
++    if( samples != 48000 && samples != 96000  && samples != 44100 && samples != 32000 )
+         return 0;
+     if( chans < 1 || chans > 7 )
+         return 0;