sirf · sirf · Nov 26, 2021 · Mar 1, 2022 · Mar 9, 2022 · Mar 16, 2022
diff --git a/.gitignore b/.gitignore
@@ -63,4 +63,9 @@ src/modules/glaxnimate/mltglaxnimate-qt6_autogen/
 out
 src/swig/ruby/markdown/
 CMakeLists.txt.user
+mlt.kdev4
+src/melt/JitControl.pb-c.c
+src/melt/JitControl.pb-c.h
+src/melt/JitStatus.pb-c.c
+src/melt/JitStatus.pb-c.h
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,14 +1,14 @@
-ubuntu-latest:
-    image: ubuntu:latest
+ubuntu-24.04:
+    image: ubuntu:24.04
     script:
-        - sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list"
+        - "sed -i 's/^Types: deb/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources"
         - DEBIAN_FRONTEND=noninteractive apt-get -qq update
         - DEBIAN_FRONTEND=noninteractive apt-get -yqq build-dep mlt
         - DEBIAN_FRONTEND=noninteractive apt-get -yqq install cmake
         - cmake -DCMAKE_BUILD_TYPE=Debug . && make -j -f Makefile install
 
-ubuntu-lts:
-    image: ubuntu:20.04
+ubuntu-22.04:
+    image: ubuntu:22.04
     script:
         - sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list"
         - DEBIAN_FRONTEND=noninteractive apt-get -qq update
@@ -38,37 +38,29 @@ debian-stable:
     image: debian:stable
     script:
         - echo -e 'deb-src http://deb.debian.org/debian stable main\ndeb-src http://deb.debian.org/debian stable-updates main' >> /etc/apt/sources.list
-        - echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
+        - echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list
         - apt-get -qq update
         - apt-get -yqq build-dep mlt
         - apt-get -yqq install cmake
         - cmake -DCMAKE_BUILD_TYPE=Debug . && make -j -f Makefile install
 
-fedora-38:
-    image: fedora:38
+fedora-39:
+    image: fedora:39
     script:
         - yum --assumeyes groupinstall "Development Tools"
         - yum --assumeyes install yasm gavl-devel libsamplerate-devel libxml2-devel ladspa-devel jack-audio-connection-kit-devel sox-devel SDL-devel gtk2-devel qt-devel libexif-devel libtheora-devel libvorbis-devel libvdpau-devel libsoup-devel liboil-devel python-devel alsa-lib pulseaudio-libs-devel gcc-c++ cmake
             # unclear why `gcc-c++` isn't in `Development Tools`
         - cmake -DCMAKE_BUILD_TYPE=Debug . && make -j -f Makefile install
 
-fedora-36:
-    image: fedora:36
-    script:
-        - yum --assumeyes groupinstall "Development Tools"
-        - yum --assumeyes install yasm gavl-devel libsamplerate-devel libxml2-devel ladspa-devel jack-audio-connection-kit-devel sox-devel SDL-devel gtk2-devel qt-devel libexif-devel libtheora-devel libvorbis-devel libvdpau-devel libsoup-devel liboil-devel python-devel alsa-lib pulseaudio-libs-devel gcc-c++ cmake
-            # unclear why `gcc-c++` isn't in `Development Tools`
-        - cmake -DCMAKE_BUILD_TYPE=Debug . && make -j -f Makefile install
-
-fedora-34:
-    image: fedora:34
+fedora-38:
+    image: fedora:38
     script:
         - yum --assumeyes groupinstall "Development Tools"
         - yum --assumeyes install yasm gavl-devel libsamplerate-devel libxml2-devel ladspa-devel jack-audio-connection-kit-devel sox-devel SDL-devel gtk2-devel qt-devel libexif-devel libtheora-devel libvorbis-devel libvdpau-devel libsoup-devel liboil-devel python-devel alsa-lib pulseaudio-libs-devel gcc-c++ cmake
             # unclear why `gcc-c++` isn't in `Development Tools`
         - cmake -DCMAKE_BUILD_TYPE=Debug . && make -j -f Makefile install
 
-fedora-30:
+fedora-32:
     image: fedora:32
     script:
         - yum --assumeyes groupinstall "Development Tools"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
 project(MLT
-  VERSION 7.23.0
+  VERSION 7.25.0
   DESCRIPTION "Multimedia Framework"
   HOMEPAGE_URL "https://www.mltframework.org"
   LANGUAGES C CXX
@@ -150,6 +150,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(GCC_FLAGS "-Wall -Werror -Wno-deprecated-declarations")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_FLAGS} -Wno-class-memaccess -Wno-array-compare -Wno-unused-result -Wno-maybe-uninitialized")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_FLAGS} -Wno-discarded-qualifiers")
+  # The following showed up in GCC 14, which I am using via msys2 on Windows.
+  # Remove the following when Glaxnimate is fixed.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++20-compat -Wno-dangling-reference")
 endif ()
 
 if(MSVC)

diff --git a/Doxyfile b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = MLT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER = 7.22.0
+PROJECT_NUMBER = 7.24.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/NEWS b/NEWS
@@ -1,6 +1,42 @@
 MLT Release Notes
 -----------------
 
+Version 7.24.0
+
+Framework
+  * Fixed a small memory leak in `mlt_repository`.
+  * Fixed a small memory leak in `MltPushConsumer` C++ class.
+  * Block connecting a null producer to a service.
+  * Include `locale.h` on any GNU libc platform.
+
+Modules
+  * Added a new `spatialaudio` module with filters:
+    - `ambisonic-decoder`
+    - `ambisonic-encoder`
+  * Fixed building with FFmpeg 7.
+  * Fixed text keywords do not work with non-ASCII filenames on Windows:
+    - `pixbuf` producer
+    - `opencv_tracker` filter
+    - `dynamictext` filter
+    - `qimage` producer
+  * Added "meta.media.aspect_ratio" property to the `avformat` producer.
+  * Fixed `distort` property not working in `movit.rect` filter.
+  * Fixed frames dropping or repeating in the `multi` consumer.
+  * Fixed the `dynamic_loudness` filter maximizing audio gain.
+  * Fixed distortion in the `mono` filter.
+  * Also check for `WAYLAND_DISPLAY` to detect a graphical session in the `qt`
+    and `glaxnimate` modules.
+  * Fixed the `wave` filter distorts if `wave` = 1 with preview scaling.
+  * Added the read-only `meta.media.%u.codec.layout` property to `avformat` producer.
+  * Set the `channel_layout` property on the frame for the `noise` and `tone`
+    audio producers.
+  * Fixed `outline` maximum for the `text` and `dynamictext` filters.
+
+Other
+  * Fixed crash when using `-chain` from `melt`.
+  * Fixed a small memory leak on Windows `fopen()`.
+
+
 Version 7.22.0
 
 Framework

diff --git a/docs/melt.1 b/docs/melt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.4.
-.TH MELT "1" "November 2023" "melt 7.22.0" "User Commands"
+.TH MELT "1" "April 2024" "melt 7.24.0" "User Commands"
 .SH NAME
 melt \- author, play, and encode multitrack audio/video compositions
 .SH SYNOPSIS
@@ -149,7 +149,7 @@ Add a video\-only track
 .PP
 For more help: <https://www.mltframework.org/>
 .SH COPYRIGHT
-Copyright \(co 2002\-2023 Meltytech, LLC
+Copyright \(co 2002\-2024 Meltytech, LLC
 <https://www.mltframework.org/>
 .br
 This is free software; see the source for copying conditions.  There is NO

diff --git a/presets/consumer/avformat/AV1 b/presets/consumer/avformat/AV1
@@ -16,3 +16,4 @@ strict=experimental
 meta.preset.name=AV1 WebM
 meta.preset.extension=webm
 meta.preset.note=AV1 video with Opus audio in Matroska container: Just say no to patents
+meta.preset.hidden=1
diff --git a/presets/consumer/avformat/SVT-AV1 b/presets/consumer/avformat/SVT-AV1
@@ -0,0 +1,16 @@
+f=webm
+
+acodec=libopus
+ar=48000
+ab=192k
+vbr=off
+
+vcodec=libsvtav1
+crf=32
+bf=1
+svtav1-params=preset=5:tile-columns=1:fast-decode=0:tune=0:film-grain=0:film-grain-denoise=0:enable-overlays=1:enable-variance-boost=1:variance-boost-strength=1:variance-octile=7:enable-qm=1:qm-min=0
+progressive=1
+
+meta.preset.name=AV1 WebM
+meta.preset.extension=webm
+meta.preset.note=AV1 video with Opus audio in WebM container: Just say no to patents
diff --git a/presets/consumer/avformat/ten_bit/AV1 b/presets/consumer/avformat/ten_bit/AV1
@@ -17,3 +17,4 @@ pix_fmt=yuv420p10le
 meta.preset.name=ten_bit/10-bit AV1 WebM
 meta.preset.extension=webm
 meta.preset.note=10-bit AV1 video with Opus audio in Matroska container: Just say no to patents
+meta.preset.hidden=1
diff --git a/presets/consumer/avformat/ten_bit/SVT-AV1 b/presets/consumer/avformat/ten_bit/SVT-AV1
@@ -0,0 +1,17 @@
+f=webm
+
+acodec=libopus
+ar=48000
+ab=192k
+vbr=off
+
+vcodec=libsvtav1
+crf=32
+bf=1
+svtav1-params=preset=5:tile-columns=1:fast-decode=0:tune=0:film-grain=0:film-grain-denoise=0:enable-overlays=1:enable-variance-boost=1:variance-boost-strength=1:variance-octile=7:enable-qm=1:qm-min=0
+pix_fmt=yuv420p10le
+progressive=1
+
+meta.preset.name=ten_bit/10-bit AV1 WebM
+meta.preset.extension=webm
+meta.preset.note=10-bit AV1 video with Opus audio in WebM container: Just say no to patents
diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
@@ -30,7 +30,7 @@
 #include <sys/param.h>
 #endif
 
-#if (defined(__linux__) && !defined(__APPLE__))
+#if defined(__linux__) || defined(__GLIBC__)
 #include <locale.h>
 typedef locale_t mlt_locale_t;
 #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506)

diff --git a/src/framework/mlt_repository.c b/src/framework/mlt_repository.c
@@ -581,7 +581,7 @@ static void list_presets(mlt_properties properties, const char *path, const char
                     // load the preset
                     mlt_properties preset = mlt_properties_load(fullname);
                     if (preset && mlt_properties_count(preset)) {
-                        snprintf(fullname, 1024, "%s/%s", path, de->d_name);
+                        snprintf(fullname, sizeof(fullname), "%s/%s", path, de->d_name);
                         mlt_properties_set_data(properties,
                                                 fullname,
                                                 preset,

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
@@ -207,13 +207,12 @@ int mlt_service_connect_producer(mlt_service self, mlt_service producer, int ind
     }
 
     // If we have space, assign the input
-    if (base->in != NULL && index >= 0 && index < base->size) {
+    if (producer != NULL && base->in != NULL && index >= 0 && index < base->size) {
         // Get the current service
         mlt_service current = (index < base->count) ? base->in[index] : NULL;
 
         // Increment the reference count on this producer
-        if (producer != NULL)
-            mlt_properties_inc_ref(MLT_SERVICE_PROPERTIES(producer));
+        mlt_properties_inc_ref(MLT_SERVICE_PROPERTIES(producer));
 
         // Now we disconnect the producer service from its consumer
         mlt_service_disconnect(producer);

diff --git a/src/framework/mlt_version.h b/src/framework/mlt_version.h
@@ -2,7 +2,7 @@
  * \file mlt_version.h
  * \brief contains version information
  *
- * Copyright (C) 2010-2023 Meltytech, LLC
+ * Copyright (C) 2010-2024 Meltytech, LLC
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 #define MLT_STRINGIZE(s) MLT_STRINGIZE2(s)
 
 #define LIBMLT_VERSION_MAJOR 7
-#define LIBMLT_VERSION_MINOR 23
+#define LIBMLT_VERSION_MINOR 25
 #define LIBMLT_VERSION_REVISION 0
 #define LIBMLT_VERSION_INT \
     ((LIBMLT_VERSION_MAJOR << 16) + (LIBMLT_VERSION_MINOR << 8) + LIBMLT_VERSION_REVISION)

diff --git a/src/melt/CMakeLists.txt b/src/melt/CMakeLists.txt
@@ -1,8 +1,20 @@
-add_executable(melt melt.c io.c io.h)
+add_custom_command(
+    OUTPUT JitControl.pb-c.c JitControl.pb-c.h
+    COMMAND protoc-c --c_out=. JitControl.proto
+    DEPENDS JitControl.proto
+)
+
+add_custom_command(
+    OUTPUT JitStatus.pb-c.c JitStatus.pb-c.h
+    COMMAND protoc-c --c_out=. JitStatus.proto
+    DEPENDS JitStatus.proto
+)
+
+add_executable(melt melt.c io.c io.h JitControl.pb-c.c JitStatus.pb-c.c)
 
 target_compile_options(melt PRIVATE ${MLT_COMPILE_OPTIONS})
 
-target_link_libraries(melt PRIVATE mlt Threads::Threads)
+target_link_libraries(melt PRIVATE mlt Threads::Threads protobuf-c m)
 
 target_compile_definitions(melt PRIVATE VERSION="${MLT_VERSION}")
 

diff --git a/src/melt/JitControl.proto b/src/melt/JitControl.proto
@@ -0,0 +1,17 @@
+syntax = "proto2";
+
+message JitControl {
+    optional ControlType type = 1;
+    optional int32 play_rate = 2;
+    optional int64 seek_position = 3;
+}
+
+enum ControlType {
+    PAUSE = 0;
+    PLAY = 1;
+    PLAY_RATE = 2;
+    QUIT = 3;
+    SEEK = 4;
+    SEEK_REL = 5;
+    KEEP_ALIVE = 6;
+}
diff --git a/src/melt/JitStatus.proto b/src/melt/JitStatus.proto
@@ -0,0 +1,38 @@
+syntax = "proto2";
+
+message JitStatus {
+    optional int64 duration = 1;
+    optional double frame_rate = 2;
+    optional bool playing = 3;
+    optional int32 play_rate = 4;
+    optional int64 position = 5;
+    optional int32 total_channels = 6;
+    optional MediaInfo media_info = 7;
+}
+
+message MediaInfo {
+    repeated Stream streams = 1;
+}
+
+message Stream {
+    optional StreamType type = 1;
+    optional AudioStream audio = 2;
+    optional VideoStream video = 3;
+}
+
+message AudioStream {
+    optional int32 channels = 1;
+    optional string language = 2;
+}
+
+message VideoStream {
+    optional double frame_rate = 1;
+    optional int32 width = 2;
+    optional int32 height = 3;
+}
+
+enum StreamType {
+    UNKNOWN = 0;
+    AUDIO = 1;
+    VIDEO = 2;
+}