src/audio_output/dec.c

@@ -236,10 +236,12 @@ error:
 void vlc_aout_stream_Delete (vlc_aout_stream *stream)
 {
     audio_output_t *aout = aout_stream_aout(stream);
+    aout_owner_t *owner = aout_stream_owner(stream);
 
     if (stream->mixer_format.i_format)
     {
         stream_Reset(stream);
+        vlc_audio_meter_Reset(&owner->meter, NULL);
         if (stream->filters)
             aout_FiltersDelete (aout, stream->filters);
         aout_OutputDelete (aout);

src/audio_output/meter.c

@@ -103,16 +103,19 @@ vlc_audio_meter_AddPlugin(struct vlc_audio_meter *meter, const char *chain,
     if (plugin->name == NULL)
         goto error;
 
+    vlc_mutex_lock(&meter->lock);
     if (meter->fmt != NULL)
     {
         plugin->filter = vlc_audio_meter_CreatePluginFilter(meter, plugin);
         if (plugin->filter == NULL)
+        {
+            vlc_mutex_unlock(&meter->lock);
             goto error;
+        }
 
         assert(plugin->filter->ops->drain_audio == NULL); /* Not supported */
     }
 
-    vlc_mutex_lock(&meter->lock);
     vlc_list_append(&plugin->node, &meter->plugins);
     vlc_mutex_unlock(&meter->lock);
 
@@ -153,10 +156,10 @@ vlc_audio_meter_Reset(struct vlc_audio_meter *meter, const audio_sample_format_t
 {
     int ret = VLC_SUCCESS;
 
-    meter->fmt = fmt;
-
     vlc_mutex_lock(&meter->lock);
 
+    meter->fmt = fmt;
+
     /* Reload every plugins using the new fmt */
     vlc_audio_meter_plugin *plugin;
     vlc_list_foreach(plugin, &meter->plugins, node)

test/src/player/player.c

@@ -2792,6 +2792,8 @@ test_audio_loudness_meter_cb(vlc_tick_t date, double momentary_loudness,
 static void
 test_audio_loudness_meter(struct ctx *ctx)
 {
+    test_log("test_audio_loudness_meter\n");
+
     vlc_player_t *player = ctx->player;
 
     static const union vlc_player_metadata_cbs cbs = {