Changeset d20dd24295a3f43ad2cdec0fcd8a83793cb45bde

Timestamp:

06/17/07 15:54:20 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1182088460 +0000

git-parent:

[ef2723ee44a031e8c0f6c5437fff7d40ffad971a]

git-author:

Laurent Aimar <fenrir@videolan.org> 1182088460 +0000

Message:

Added replay gain support (audio-replay-gain-mode track or album to activate
it, disabled by default)

Files:

• include/vlc_aout.h (modified) (1 diff)
• include/vlc_es.h (modified) (4 diffs)
• include/vlc_input.h (modified) (1 diff)
• include/vlc_meta.h (modified) (1 diff)
• modules/audio_mixer/float32.c (modified) (3 diffs)
• src/audio_output/aout_internal.h (modified) (1 diff)
• src/audio_output/dec.c (modified) (5 diffs)
• src/audio_output/input.c (modified) (6 diffs)
• src/input/decoder.c (modified) (2 diffs)
• src/libvlc-module.c (modified) (2 diffs)

include/vlc_aout.h

@@ -271 +271 @@
-    /* Mixer information */
-    byte_t *                p_first_byte_to_mix;
+    audio_replay_gain_t     replay_gain;
+    float                   f_multiplier;
-
-    /* If b_restart == 1, the input pipeline will be re-created. */

include/vlc_es.h

@@ -46 +46 @@
-
-/**
+ * audio replay gain description
+ */
+#define AUDIO_REPLAY_GAIN_MAX (2)
+#define AUDIO_REPLAY_GAIN_TRACK (0)
+#define AUDIO_REPLAY_GAIN_ALBUM (1)
+typedef struct
+{
+    /* true if we have the peak value */
+    vlc_bool_t pb_peak[AUDIO_REPLAY_GAIN_MAX];
+    /* peak value where 1.0 means full sample value */
+    float      pf_peak[AUDIO_REPLAY_GAIN_MAX];
+
+    /* true if we have the gain value */
+    vlc_bool_t pb_gain[AUDIO_REPLAY_GAIN_MAX];
+    /* gain value in dB */
+    float      pf_gain[AUDIO_REPLAY_GAIN_MAX];
+} audio_replay_gain_t;
+
+/**
- * audio format description
- */
@@ -174 +193 @@
-    extra_languages_t *p_extra_languages;
-
-
+
+
-    video_format_t video;
-    subs_format_t  subs;
@@ -209 +229 @@
-
-    memset( &fmt->audio, 0, sizeof(audio_format_t) );
+    memset( &fmt->audio_replay_gain, 0, sizeof(audio_replay_gain_t) );
-    memset( &fmt->video, 0, sizeof(video_format_t) );
-    memset( &fmt->subs, 0, sizeof(subs_format_t) );
@@ -268 +289 @@
-{
-    if( fmt->psz_language ) free( fmt->psz_language );
-    fmt->psz_language = NULL;
-
-    if( fmt->psz_description ) free( fmt->psz_description );
-    fmt->psz_description = NULL;
-
-    if( fmt->i_extra > 0 ) free( fmt->p_extra );
-    fmt->i_extra = 0;
-    fmt->p_extra = NULL;
-
-    if( fmt->video.p_palette )
-        free( fmt->video.p_palette );
-    fmt->video.p_palette = NULL;
-
-    if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
-
-
-
-
-
+
+
+
+
+
+
-            if( fmt->p_extra_languages[i].psz_language )
-                free( fmt->p_extra_languages[i].psz_language );
-            if( fmt->p_extra_languages[i].psz_description )
-                free( fmt->p_extra_languages[i].psz_description );
-            i++;
-        }
-        free(fmt->p_extra_languages);
-    }
-
-
+
+
+
-}
-#endif

include/vlc_input.h

@@ -197 +197 @@
-
-/*****************************************************************************
+ * Meta data helpers
+ *****************************************************************************/
+static inline void vlc_audio_replay_gain_MergeFromMeta( audio_replay_gain_t *p_dst,
+                                                        const vlc_meta_t *p_meta )
+{
+    int i;
+    if( !p_meta )
+        return;
+
+    for( i = 0; i < p_meta->i_extra; i++ )
+    {
+        const char *psz_name = p_meta->ppsz_extra_name[i];
+        const char *psz_value = p_meta->ppsz_extra_value[i];
+
+        if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
+            !strcasecmp( psz_name, "RG_RADIO" ) )
+        {
+            p_dst->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+            p_dst->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
+        }
+        else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) ||
+                 !strcasecmp( psz_name, "RG_PEAK" ) )
+        {
+            p_dst->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+            p_dst->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
+        }
+        else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) ||
+                 !strcasecmp( psz_name, "RG_AUDIOPHILE" ) )
+        {
+            p_dst->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+            p_dst->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
+        }
+        else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) )
+        {
+            p_dst->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+            p_dst->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
+        }
+    }
+}
+
+/*****************************************************************************
- * Seek point: (generalisation of chapters)
- *****************************************************************************/

include/vlc_meta.h

@@ -210 +210 @@
-        for( j = 0; j < dst->i_extra; j++ )
-        {
-i
+j
-            {
-i
-i
+j
+j
-                break;
-            }
-            if( j >= dst->i_extra )
-                vlc_meta_AddExtra( dst, src->ppsz_extra_name[i], src->ppsz_extra_value[i] );
-        }
+        if( j >= dst->i_extra )
+            vlc_meta_AddExtra( dst, src->ppsz_extra_name[i], src->ppsz_extra_value[i] );
-    }
-}

modules/audio_mixer/float32.c

@@ -61 +61 @@
-    }
-
+    /* Use the trivial mixer when we can */
-    if ( p_aout->i_nb_inputs == 1 && p_aout->mixer.f_multiplier == 1.0 )
-    {
-
-
+
+
+
+
+
+
+
+
-    }
-
-    p_aout->mixer.pf_do_work = DoWork;
-
-    return 0;
-}
@@ -110 +116 @@
-static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
-{
-
-
+
+
+
-    int i_input;
-    int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
-
-    for ( i_input = 0; i_input < i_nb_inputs; i_input++ )
@@ -119 +125 @@
-        int i_nb_words = p_buffer->i_nb_samples * i_nb_channels;
-        aout_input_t * p_input = p_aout->pp_inputs[i_input];
+        float f_multiplier = f_multiplier_global * p_input->f_multiplier;
+
-        float * p_out = (float *)p_buffer->p_buffer;
-        float * p_in = (float *)p_input->p_first_byte_to_mix;

src/audio_output/aout_internal.h

@@ -125 +125 @@
-
-/* From dec.c */
-) __aout_DecNew(VLC_OBJECT(a), b, c
-
+, d) __aout_DecNew(VLC_OBJECT(a), b, c, d
+, audio_replay_gain_t *
-int aout_DecDelete ( aout_instance_t *, aout_input_t * );
-aout_buffer_t * aout_DecNewBuffer( aout_instance_t *, aout_input_t *, size_t );

src/audio_output/dec.c

@@ -46 +46 @@
- *****************************************************************************/
-static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
-
+
+
-{
-    aout_input_t * p_input;
@@ -83 +84 @@
-        goto error;
-    }
+    memset( p_input, 0, sizeof(aout_input_t) );
-
-    vlc_mutex_init( p_aout, &p_input->lock );
@@ -91 +93 @@
-    memcpy( &p_input->input, p_format,
-            sizeof(audio_sample_format_t) );
+    if( p_replay_gain )
+        p_input->replay_gain = *p_replay_gain;
-
-    p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
@@ -167 +171 @@
-aout_input_t * __aout_DecNew( vlc_object_t * p_this,
-                              aout_instance_t ** pp_aout,
-
+
+
-{
-    if ( *pp_aout == NULL )
@@ -192 +197 @@
-    }
-
-
+, p_replay_gain
-}
-

src/audio_output/input.c

@@ -31 +31 @@
-#include <stdlib.h>                            /* calloc(), malloc(), free() */
-#include <string.h>
+#include <math.h>
-
-#include <vlc_input.h>                 /* for input_thread_t and i_pts_delay */
@@ -52 +53 @@
-static int EqualizerCallback( vlc_object_t *, char const *,
-                              vlc_value_t, vlc_value_t, void * );
-
+
+
+
-/*****************************************************************************
- * aout_InputNew : allocate a new input and rework the filter pipeline
@@ -161 +164 @@
-        text.psz_string = _("Audio visualizations");
-        var_Change( p_aout, "audio-visual", VLC_VAR_SETTEXT, &text, NULL );
+    }
+
+    if( var_Type( p_aout, "audio-replay-gain-mode" ) == 0 )
+    {
+        module_config_t *p_config;
+        int i;
+
+        p_config = config_FindConfig( VLC_OBJECT(p_aout), "audio-replay-gain-mode" );
+        if( p_config && p_config->i_list )
+        {
+            var_Create( p_aout, "audio-replay-gain-mode",
+                        VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+
+            text.psz_string = _("Replay gain");
+            var_Change( p_aout, "audio-replay-gain-mode", VLC_VAR_SETTEXT, &text, NULL );
+
+            for( i = 0; i < p_config->i_list; i++ )
+            {
+                val.psz_string = (char *)p_config->ppsz_list[i];
+                text.psz_string = (char *)p_config->ppsz_list_text[i];
+                var_Change( p_aout, "audio-replay-gain-mode", VLC_VAR_ADDCHOICE,
+                            &val, &text );
+            }
+
+            var_AddCallback( p_aout, "audio-replay-gain-mode", ReplayGainCallback, NULL );
+        }
+    }
+    if( var_Type( p_aout, "audio-replay-gain-preamp" ) == 0 )
+    {
+        var_Create( p_aout, "audio-replay-gain-preamp",
+                    VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+    }
+    if( var_Type( p_aout, "audio-replay-gain-default" ) == 0 )
+    {
+        var_Create( p_aout, "audio-replay-gain-default",
+                    VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+    }
+    if( var_Type( p_aout, "audio-replay-gain-peak-protection" ) == 0 )
+    {
+        var_Create( p_aout, "audio-replay-gain-peak-protection",
+                    VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-    }
-
@@ -367 +411 @@
-                                     * p_input->input.i_rate
-                                     / p_input->input.i_frame_length) );
+
+    ReplayGainSelect( p_aout, p_input );
+
-    /* Success */
-    p_input->b_error = VLC_FALSE;
@@ -659 +706 @@
-    var_Destroy( p_aout, "audio-visual" );
-
+    var_Destroy( p_aout, "audio-replay-gain-mode" );
+    var_Destroy( p_aout, "audio-replay-gain-default" );
+    var_Destroy( p_aout, "audio-replay-gain-preamp" );
+    var_Destroy( p_aout, "audio-replay-gain-peak-protection" );
+
-    /* error flag */
-    p_input->b_error = 1;
@@ -818 +870 @@
-    return VLC_SUCCESS;
-}
+
+static int ReplayGainCallback( vlc_object_t *p_this, char const *psz_cmd,
+                               vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    aout_instance_t *p_aout = (aout_instance_t *)p_this;
+    int i;
+
+    vlc_mutex_lock( &p_aout->mixer_lock );
+    for( i = 0; i < p_aout->i_nb_inputs; i++ )
+        ReplayGainSelect( p_aout, p_aout->pp_inputs[i] );
+    vlc_mutex_unlock( &p_aout->mixer_lock );
+
+    return VLC_SUCCESS;
+}
+
+static void ReplayGainSelect( aout_instance_t *p_aout, aout_input_t *p_input )
+{
+    char *psz_replay_gain = var_GetString( p_aout, "audio-replay-gain-mode" );
+    int i_mode;
+    int i_use;
+    float f_gain;
+
+    p_input->f_multiplier = 1.0;
+
+    if( !psz_replay_gain )
+        return;
+
+    /* Find select mode */
+    if( !strcmp( psz_replay_gain, "track" ) )
+        i_mode = AUDIO_REPLAY_GAIN_TRACK;
+    else if( !strcmp( psz_replay_gain, "album" ) )
+        i_mode = AUDIO_REPLAY_GAIN_ALBUM;
+    else
+        i_mode = AUDIO_REPLAY_GAIN_MAX;
+
+    /* If the select mode is not available, prefer the other one */
+    i_use = i_mode;
+    if( i_use != AUDIO_REPLAY_GAIN_MAX && !p_input->replay_gain.pb_gain[i_use] )
+    {
+        for( i_use = 0; i_use < AUDIO_REPLAY_GAIN_MAX; i_use++ )
+        {
+            if( p_input->replay_gain.pb_gain[i_use] )
+                break;
+        }
+    }
+
+    /* */
+    if( i_use != AUDIO_REPLAY_GAIN_MAX )
+        f_gain = p_input->replay_gain.pf_gain[i_use] + var_GetFloat( p_aout, "audio-replay-gain-preamp" );
+    else if( i_mode != AUDIO_REPLAY_GAIN_MAX )
+        f_gain = var_GetFloat( p_aout, "audio-replay-gain-default" );
+    else
+        f_gain = 0.0;
+    p_input->f_multiplier = pow( 10.0, f_gain / 20.0 );
+
+    /* */
+    if( p_input->replay_gain.pb_peak[i_use] &&
+        var_GetBool( p_aout, "audio-replay-gain-peak-protection" ) &&
+        p_input->replay_gain.pf_peak[i_use] * p_input->f_multiplier > 1.0 )
+    {
+        p_input->f_multiplier = 1.0f / p_input->replay_gain.pf_peak[i_use];
+    }
+
+    free( psz_replay_gain );
+}
+

src/input/decoder.c

@@ -416 +416 @@
-    }
-
+    /* Copy ourself the input replay gain */
+    if( fmt->i_cat == AUDIO_ES )
+    {
+        int i;
+        for( i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+        {
+            if( !p_dec->fmt_out.audio_replay_gain.pb_peak[i] )
+            {
+                p_dec->fmt_out.audio_replay_gain.pb_peak[i] = fmt->audio_replay_gain.pb_peak[i];
+                p_dec->fmt_out.audio_replay_gain.pf_peak[i] = fmt->audio_replay_gain.pf_peak[i];
+            }
+            if( !p_dec->fmt_out.audio_replay_gain.pb_gain[i] )
+            {
+                p_dec->fmt_out.audio_replay_gain.pb_gain[i] = fmt->audio_replay_gain.pb_gain[i];
+                p_dec->fmt_out.audio_replay_gain.pf_gain[i] = fmt->audio_replay_gain.pf_gain[i];
+            }
+        }
+    }
-    return p_dec;
-}
@@ -887 +905 @@
-
-        p_sys->p_aout_input =
-
+, &p_dec->fmt_out.audio_replay_gain
-        if( p_sys->p_aout_input == NULL )
-        {

src/libvlc-module.c

@@ -220 +220 @@
-#define AUDIO_VISUAL_LONGTEXT N_( \
-    "This adds visualization modules (spectrum analyzer, etc.).")
+
+
+#define AUDIO_REPLAY_GAIN_MODE_TEXT N_( \
+    "Replay gain mode" )
+#define AUDIO_REPLAY_GAIN_MODE_LONGTEXT N_( \
+    "Select the replay gain mode" )
+#define AUDIO_REPLAY_GAIN_PREAMP_TEXT N_( \
+    "Replay preamp" )
+#define AUDIO_REPLAY_GAIN_PREAMP_LONGTEXT N_( \
+    "This allows you to change the default target level (89 dB) " \
+    "for stream with replay gain information" )
+#define AUDIO_REPLAY_GAIN_DEFAULT_TEXT N_( \
+    "Default replay gain" )
+#define AUDIO_REPLAY_GAIN_DEFAULT_LONGTEXT N_( \
+    "This is the gain used for stream without replay gain information" )
+#define AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT N_( \
+    "Peak protection" )
+#define AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT N_( \
+    "Protect against sound clipping" )
+
+static const char *ppsz_replay_gain_mode[] = { "none", "track", "album" };
+static const char *ppsz_replay_gain_mode_text[] = { N_("None"), N_("Track"), N_("Album") };
-
-/*****************************************************************************
@@ -1293 +1315 @@
-    add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
-                 DESYNC_LONGTEXT, VLC_TRUE );
+
+    /* FIXME TODO create a subcat replay gain ? */
+    add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], NULL, AUDIO_REPLAY_GAIN_MODE_TEXT,
+                AUDIO_REPLAY_GAIN_MODE_LONGTEXT, VLC_FALSE );
+        change_string_list( ppsz_replay_gain_mode, ppsz_replay_gain_mode_text, 0 );
+    add_float( "audio-replay-gain-preamp", 0.0, NULL,
+               AUDIO_REPLAY_GAIN_PREAMP_TEXT, AUDIO_REPLAY_GAIN_PREAMP_LONGTEXT, VLC_FALSE );
+    add_float( "audio-replay-gain-default", -7.0, NULL,
+               AUDIO_REPLAY_GAIN_DEFAULT_TEXT, AUDIO_REPLAY_GAIN_DEFAULT_LONGTEXT, VLC_FALSE );
+    add_bool( "audio-replay-gain-peak-protection", VLC_TRUE, NULL,
+              AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT, AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT, VLC_TRUE );
+
-    set_subcategory( SUBCAT_AUDIO_AOUT );
-    add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,