Credit Andrew - add Details of color transfers/primaries, + update x264 from r3106...

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 9b8832dd718c94dd8b815edc7eb5c9d732953dd6..7521c0bab567ada4ef9243084f6e291d9bf53174 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -2558,6 +2558,14 @@ int FFMPEG::info(char *text, int len)
                const char *rg = av_color_range_name(range);
                report("/ range:%s\n", rg ? rg : unkn);
 
+               enum AVColorPrimaries primaries = st->codecpar->color_primaries;
+               const char *pr = av_color_primaries_name(primaries);
+               report("    color primaries:%s", pr ? pr : unkn);
+               enum AVColorTransferCharacteristic trc = st->codecpar->color_trc;
+               const char *transfer = av_color_transfer_name(trc);
+               report("/ transfer characteristics:%s\n", transfer ? transfer : unkn);
+
+
                AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, st, NULL);
                AVRational display_aspect_ratio;
                if(sar.num) {

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 72d4f050dd20e2421f187df7271268c3c4f7e062..5d7007a30efe39796a4fbba0912dcb571061f673 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -418,7 +418,7 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-stable],
+  [x264-stableR3191],
   [ libx264.a ],
   [ . ])
 

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index bf6676cd6ffee670f36c687c42cb4fd1c0a1c1ed..0aea07f87599f583683e7c2ac1558d51ab2d4d82 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -35,7 +35,7 @@ https://repology.org/project/a52dec/information
 https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.100
 https://download.osgeo.org/libtiff/tiff-4.6.0t.tar.xz
 https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
-https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz (Jan. 2023 version r3106)
+https://www.videolan.org/developers/x264.html (May 2024 version r3191)
 https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz (snapshot 17122023)
 https://ffmpeg.org/releases/ffmpeg-7.0.tar.xz
 https://github.com/webmproject/libvpx/archive/v1.13.1.tar.gz

diff --git a/cinelerra-5.1/thirdparty/src/x264-stableR3191.patch1 b/cinelerra-5.1/thirdparty/src/x264-stableR3191.patch1
new file mode 100644 (file)
index 0000000..08026a9
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/x264-stableR3191.patch1
@@ -0,0 +1,18 @@
+--- a/encoder/encoder.c        2023-04-01 19:08:58.420132123 -0600
++++ b/encoder/encoder.c        2023-04-01 18:52:48.148808059 -0600
+@@ -667,6 +667,7 @@
+         return -1;
+     }
+ 
++#if 0
+     /* Detect default ffmpeg settings and terminate with an error. */
+     if( b_open )
+     {
+@@ -690,6 +691,7 @@
+             return -1;
+         }
+     }
++#endif
+ 
+     if( h->param.rc.i_rc_method < 0 || h->param.rc.i_rc_method > 2 )
+     {

diff --git a/cinelerra-5.1/thirdparty/src/x264-stableR3191.tar.xz b/cinelerra-5.1/thirdparty/src/x264-stableR3191.tar.xz
new file mode 100644 (file)
index 0000000..15adb4f
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x264-stableR3191.tar.xz differ