Release 0.9.9

Author: andreiltd

README.md

@@ -84,6 +84,12 @@ GStreamer project.
 $ brew install gstreamer gst-plugins-base gst-plugins-good gst-python json-glib
 ```
 
+Install additional Python dependencies
+```console
+pip3 install pycairo
+pip3 install PyGObject
+```
+
 Build
 ```console
 $ meson build
@@ -95,8 +101,8 @@ GStreamer and the plugins can be built from source by using
 [gst-build](https://gitlab.freedesktop.org/gstreamer/gst-build), or starting
 from GStreamer 1.20, [GStreamer mono repo](https://gitlab.freedesktop.org/gstreamer/gstreamer).
 
-Install `meson` and `ninja` as instructed in the [Linux](#linux) and
-[Windows](#windows) sections above.
+Install `meson` and `ninja` as instructed in the [Linux](#linux),
+[Windows](#windows), and [macOS](#macos) sections above.
 
 On Linux systems additional dependencies may be required:
 ```console
@@ -120,6 +126,13 @@ $ meson builddir -Dcustom_subprojects=gst-home-audio -Dauto_features=disabled -D
 $ ninja -C builddir
 ```
 
+**Note:** *On macOS, an additional `-Dcpp_std=c++17` flag is needed to build the project*
+```console
+$ cd gst-build
+$ meson builddir -Dcustom_subprojects=gst-home-audio -Dauto_features=disabled -Dgstreamer:tools=enabled -Dcpp_std=c++17
+$ ninja -C builddir
+```
+
 These commands will build the `gst-home-audio` plugins, along with GStreamer
 core, basic plugins, and tools such as `gst-launch-1.0`, `gst-inspect-1.0` etc.
 
@@ -253,7 +266,7 @@ $ ./gst-ha-dap -i input.xml -o output.json
 ## Plugins Overview
 
 ### dlbac3parse
-Dolby Digital Plus Parser.This plug-in performs parsing of incoming  Dolby
+Dolby Digital Plus Parser. This plug-in performs parsing of incoming  Dolby
 Digital, Dolby Digital Plus signal.
 
 **Launch Line**
@@ -283,7 +296,7 @@ Single stream:
 ```console
 $ gst-launch-1.0 \
     audiotestsrc ! \
-    dlbflexr device-config=device.conf sink_0::stream-config=stream.conf sink_0::volume=0.9 sink_0::upmix=true ! \
+    dlbflexr device-config=device.conf sink_0::stream-config=stream.conf sink_0::upmix=true ! \
     autoaudiosink
 ```
 

docker/Dockerfile

@@ -28,7 +28,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     valgrind\
     wget
 
-RUN pip3 install --no-cache-dir meson
+RUN pip3 install --no-cache-dir \
+    meson \
+    gcovr
 
 RUN groupadd -g 1002 builder
 RUN useradd -u 1002 -g 1002 -ms /bin/bash builder

integration/gst_ha_dap/interface.py

@@ -11,7 +11,7 @@
 
 VERSION_MAJOR  = 0
 VERSION_MINOR  = 9
-VERSION_BUGFIX = 3
+VERSION_BUGFIX = 9
 
 PREAMBLE = """
 Dolby Atmos for home audio executable

integration/gst_ha_flexr/interface.py

@@ -13,7 +13,7 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 9
-VERSION_BUGFIX = 3
+VERSION_BUGFIX = 9
 
 PREAMBLE = """
 Dolby Atmos for home audio executable
@@ -43,6 +43,8 @@ def parse_command_line(my_args=None) -> argparse.Namespace:
         prog="gst-ha-flexr", formatter_class=argparse.RawTextHelpFormatter
     )
     sinks = parser.add_mutually_exclusive_group()
+    input_gains = parser.add_mutually_exclusive_group()
+    external_gains = parser.add_mutually_exclusive_group()
     parser.add_argument(
         "-wd",
         "--working_dir",
@@ -58,7 +60,8 @@ def parse_command_line(my_args=None) -> argparse.Namespace:
         "Supported formats:\n"
         "Dolby Digital:      .ac3\n"
         "Dolby Digital Plus: .ec3\n"
-        "PCM:                .wav\n\n",
+        "PCM:                .wav\n"
+        "MP4:                .mp4\n\n",
         type=str,
         metavar="<filename>",
         required=True,
@@ -116,12 +119,23 @@ def parse_command_line(my_args=None) -> argparse.Namespace:
         action="store_true",
         default=False,
     )
-    parser.add_argument(
+    input_gains.add_argument(
+        "-pr",
+        "--profile",
+        help="Select content profile.\n"
+        "Default: off\n"
+        "Not allowed with content normalization gain (-cg argument).\n\n",
+        type=str,
+        metavar="<off|movie|music>",
+        default="off",
+    )
+    input_gains.add_argument(
         "-cg",
         "--content-normalization-gain",
         help="Linear gain to bring the input to system level.\n"
         "Range: [0.0 - 10.0]\n"
-        "Default: 1.0\n\n",
+        "Default: 1.0\n"
+        "Not allowed with profile (-pr argument)\n\n",
         type=float,
         metavar="<gain>",
         default=1.0
@@ -136,7 +150,7 @@ def parse_command_line(my_args=None) -> argparse.Namespace:
         metavar="<gain>",
         default=1.0
     )
-    parser.add_argument(
+    external_gains.add_argument(
         "-eg",
         "--external-user-gain",
         help="Linear gain to be applied by downstream external processing.\n"
@@ -146,6 +160,27 @@ def parse_command_line(my_args=None) -> argparse.Namespace:
         metavar="<gain>",
         default=1.0
     )
+    external_gains.add_argument(
+        "-egs",
+        "--external-user-gain-by-step",
+        help="Linear gain to be applied by downstream external processing.\n"
+        "This property is an alternative form of external-user-gain \n"
+        "where instead of using the linear gain, index into the volume \n"
+        "steps defined in device configuration is used.\n"
+        "Default: disabled - flag not set.\n\n",
+        type=int,
+        metavar="<vol_step>",
+        default=-1
+    )
+    parser.add_argument(
+        "-im",
+        "--interp-mode",
+        help="Selects interpolation mode.\n"
+        "Default: offline\n\n",
+        type=str,
+        metavar="<offline|runtime>",
+        default="offline"
+    )
     parser.add_argument(
         "--debug",
         help=argparse.SUPPRESS,
@@ -154,15 +189,15 @@ def parse_command_line(my_args=None) -> argparse.Namespace:
     )
     parser.add_argument(
         "-gd",
-        "--gst_debug",
+        "--gst-debug",
         help="Number specyfing Gstreamer Debug Level\n\n",
         type=int,
         metavar="<val>",
         default=0,
     )
     parser.add_argument(
         "-pg",
-        "--pipeline_graph",
+        "--pipeline-graph",
         help="Defines debug dot file name\n\n",
         type=str,
         metavar="<filename>",
@@ -214,6 +249,23 @@ def validate_command_line(args) -> Tuple[bool, str]:
                 "Invalid gain value. Gain must be in range [0.0 - 10.0]"
             )
 
+    if args.profile is not None:
+        if args.profile not in ["off", "music", "movie"]:
+            return False, (
+                "Invalid profile name. Allowed options are:\n"
+                "    off\n"
+                "    movie\n"
+                "    music"
+            )
+
+    if args.interp_mode is not None:
+        if args.interp_mode not in ["offline", "runtime"]:
+            return False, (
+                "Invalid interpolation mode. Allowed options are:\n"
+                "    offline\n"
+                "    runtime"
+            )
+
     return True, "OK"
 
 

integration/gst_ha_flexr/pipeline.py

@@ -67,6 +67,8 @@ def __init__(self, plugin_path, settings):
         # Set element properties
         self.flexr.set_property("device-config", self.settings.dconf)
         self.flexr.set_property("external-user-gain", self.settings.external_gain)
+        self.flexr.set_property("external-user-gain-by-step",
+                                self.settings.external_gain_by_step)
         if self.settings.active_channels_enable:
             self.flexr.set_property("active-channels-enable", True)
             self.flexr.set_property(
@@ -79,8 +81,10 @@ def __init__(self, plugin_path, settings):
         # Set pad properies
         self.flexr_sink_pad.set_property("stream-config", self.settings.sconf)
         self.flexr_sink_pad.set_property("upmix", self.settings.upmix)
-        self.flexr_sink_pad.set_property("content-normalization-gain", self.settings.content_gain)
+        self.flexr_sink_pad.set_property("content-normalization-gain",
+                                         self.settings.content_gain)
         self.flexr_sink_pad.set_property("internal-user-gain", self.settings.internal_gain)
+        self.flexr_sink_pad.set_property("interp-mode", self.settings.interp_mode)
 
         # Populate the pipeline
         self.pipeline.add(self.src)
@@ -123,12 +127,26 @@ def _have_type(self, typefind, probability, caps):
         self.input_type = caps.to_string()
 
         # Set flexr pad properties dependent on file type
+        force_order = False
+        set_profile = self.settings.profile != "off"
+        
         if self.input_type in DD_TYPES or "video/quicktime" in self.input_type:
             force_order = True
+            if set_profile:
+                profile_name = "dlb-"+self.settings.profile
         else:
-            force_order = False
+            if set_profile:
+                profile_name = self.settings.profile
+
         self.flexr_sink_pad.set_property("force-order", force_order)
+        
+        if set_profile:
+            self.flexr_sink_pad.set_property(
+                "content-normalization-gain",
+                self.settings.content_gain_for_profile[profile_name]
+            )
 
+        # Add elements to pipeline according to input type
         if "video/quicktime" in self.input_type:
             # Demuxer for MP4 input
             self.demux = Gst.ElementFactory.make("qtdemux", "demux")
@@ -154,6 +172,7 @@ def _have_type(self, typefind, probability, caps):
             self.dec1 = Gst.ElementFactory.make("dlbac3parse", "ac3-parser")
             # AC3 decoder
             self.dec2 = Gst.ElementFactory.make("dlbac3dec", "ac3-dec")
+
         else:
             print("Error: Unable to create pipeline - unsupported input file format.")
             self.error_kill()

integration/gst_ha_flexr/settings.py

@@ -19,9 +19,19 @@ def __init__(self):
         self.upmix = False
         self.active_channels_enable = False
         self.active_channels_bitmask = 0
+        self.profile = None
         self.content_gain = 1.0
         self.internal_gain = 1.0
         self.external_gain = 1.0
+        self.external_gain_by_step = -1
+        self.content_gain_for_profile = {
+            "off": 1.0,            #  0 dB
+            "music": 0.63095,      # -4 dB
+            "movie": 1.41253,      # +3 dB
+            "dlb-music": 4.46683,  # +13 dB
+            "dlb-movie": 3.54813   # +11 dB
+        }
+        self.interp_mode = None
         self.pipeline_graph = ""
         self.device_obj = None
         self.playback_device = ""
@@ -173,9 +183,12 @@ def create_from_args(self, args):
 
         # Write other settings
         self.upmix = args.upmix
+        self.profile = args.profile
+        self.content_gain = args.content_normalization_gain
         self.internal_gain = args.internal_user_gain
         self.external_gain = args.external_user_gain
-        self.content_gain = args.content_normalization_gain
+        self.external_gain_by_step = args.external_user_gain_by_step
+        self.interp_mode = args.interp_mode
         if type(args.playback) == bool:
             self._select_device()
         elif type(args.playback) == str:

libs/utils/dlbutils.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
 
  * Dolby Home Audio GStreamer Plugins
- * Copyright (C) 2020, Dolby Laboratories
+ * Copyright (C) 2020-2022, Dolby Laboratories
 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

meson.build

@@ -1,6 +1,6 @@
 project('gst-home-audio', 'c', 'cpp',
-         version : '0.9.3',
-   meson_version : '>= 0.58.0',
+         version : '0.9.9',
+   meson_version : '>= 0.59.0',
  default_options : ['warning_level=1', 'buildtype=debugoptimized', 'cpp_std=c++17'])
 
 system = host_machine.system()
@@ -102,7 +102,7 @@ gst_plugins_dlb_build_dir = meson.current_build_dir()
 dep_map = {
   'dlb_buffer': {'ver': '>= 1.0.0'},
   'dlb_audio_parser': {'ver': '>= 1.0.0'},
-  'dlb_flexr': {'option': get_option('flexr').disabled(), 'ver': '0.6.0'},
+  'dlb_flexr': {'option': get_option('flexr').disabled(), 'ver': '1.0.1'},
   'dlb_oar': {'option': get_option('oar').disabled(), 'ver': '2.5.0'},
   'dlb_udc': {'option': get_option('ac3').disabled(), 'ver': '4.10.0'},
   'dlb_dap': {'option': get_option('dap').disabled(), 'ver': '2.9.0.2'},

plugins/ac3/dlbac3dec.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
 
  * Dolby Home Audio GStreamer Plugins
- * Copyright (C) 2020-2021, Dolby Laboratories
+ * Copyright (C) 2020-2022, Dolby Laboratories
 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -165,6 +165,7 @@ dlb_ac3dec_init (DlbAc3Dec * ac3dec)
   dlb_udc_drc_settings_init (&ac3dec->drc);
 
   gst_audio_decoder_set_needs_format (GST_AUDIO_DECODER (ac3dec), TRUE);
+  gst_audio_decoder_set_estimate_rate (GST_AUDIO_DECODER (ac3dec), TRUE);
   gst_audio_decoder_set_use_default_pad_acceptcaps (GST_AUDIO_DECODER_CAST
       (ac3dec), TRUE);
 
@@ -532,6 +533,7 @@ dlb_ac3dec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
       goto decode_error;
 
     if (G_UNLIKELY (!blocksz)) {
+      gst_buffer_unmap (outbuf, &outmap);
       gst_buffer_unref (outbuf);
       goto cleanup;
     }
@@ -567,7 +569,7 @@ dlb_ac3dec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
   {
     gst_buffer_unmap (inbuf, &inmap);
 
-    if (ret != GST_FLOW_ERROR && blocksz) {
+    if (ret != GST_FLOW_ERROR) {
       GST_LOG_OBJECT (decoder, "finish frame");
       ret = gst_audio_decoder_finish_subframe (decoder, NULL);
     }

plugins/ac3/dlbac3dec.h

@@ -1,7 +1,7 @@
 /*******************************************************************************
 
  * Dolby Home Audio GStreamer Plugins
- * Copyright (C) 2020, Dolby Laboratories
+ * Copyright (C) 2020-2022, Dolby Laboratories
 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public