Changeset 84ae579e4f14328f28d90b06b768e4924b7b5a4b

Timestamp:

12/09/02 01:52:42 (6 years ago)

Author:

Boris Dorès <babal@videolan.org>

git-committer:

Boris Dorès <babal@videolan.org> 1039395162 +0000

git-parent:

[2397666ac33531200664b053ea2dd993a12424d4]

git-author:

Boris Dorès <babal@videolan.org> 1039395162 +0000

Message:

- new headphone channel mixer with virtual spatialization effect : This

effect should give you the feeling that you stands in a real room with
a complete 5.1 speaker set when using only a headphone, providing a
more realistic sound experience. It should also be more comfortable
and less tiring when listening to music for long periods of time.It
works with any source format from mono to 5.1.

-> please try it and feel free to give me some feedback. Some

improvements are already planned (adding echo, more configuration
options, ...).

NB: whereas the filter itself is in a (very first) stable version, the

way it is integrated to the filter chain is only a _temporary_ hack
since it's the audio ouput core (input.c actually) which is directly
responsible for it. Integrating it in a more suitable way will
probably require some work on the way the filters are selected as
well as on the configuration level, but I'm working on it :)

Files:

• AUTHORS (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• configure.ac.in (modified) (1 diff)
• modules/LIST (modified) (2 diffs)
• modules/audio_filter/channel_mixer/Modules.am (modified) (1 diff)
• modules/audio_filter/channel_mixer/headphone.c (added)
• src/audio_output/input.c (modified) (4 diffs)
• src/libvlc.h (modified) (3 diffs)

AUTHORS

@@ -129 +129 @@
-D: Win32 network input
-D: Win32 interface
+D: Headphone channel mixer
-S: France
-

ChangeLog

@@ -2 +2 @@
-Not released yet
-
+  * ./modules/audio_filter/channel_mixer/headphone.x: new headphone channel
+    mixer with virtual spatialization effect
+  * ./modules/gui/win32/preferences.*: redesigned preference dialog box
-  * ./modules/audio_filter/resampler/linear.c: new audio resampler based on
-    linear interpolation

configure.ac.in

@@ -689 +689 @@
-PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
-PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler"
-
+ headphone_channel_mixer
-PLUGINS="${PLUGINS} trivial_mixer spdif_mixer float32_mixer"
-PLUGINS="${PLUGINS} aout_file"

modules/LIST

@@ -1 +1 @@
-List of vlc plugins
-5 2002/11/21 21:37:46 gbazin
+6 2002/12/09 00:52:42 babal
-
- * a52_system: input module for A52 decapsulation.
@@ -66 +66 @@
-
- * gtk: interface using the Gtk+ widget set.
+
+ * headphone: headphone channel mixer with virtual spatialization effect.
-
- * idct: inverse DCT module, used by the video decoder.

modules/audio_filter/channel_mixer/Modules.am

@@ -1 +1 @@
-SOURCES_trivial_channel_mixer = modules/audio_filter/channel_mixer/trivial.c
+SOURCES_headphone_channel_mixer = modules/audio_filter/channel_mixer/headphone.c

src/audio_output/input.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2002/12/06 10:10:39 sam
+7 2002/12/09 00:52:42 babal
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -42 +42 @@
-int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
-{
-
+
+
-
-    aout_FormatPrint( p_aout, "input", &p_input->input );
@@ -53 +54 @@
-    memcpy( &intermediate_format, &p_aout->mixer.mixer,
-            sizeof(audio_sample_format_t) );
+    memcpy( &headphone_intermediate_format, &p_aout->mixer.mixer,
+            sizeof(audio_sample_format_t) );
+    if ( config_GetInt( p_aout , "headphone" ) )
+    {
+        headphone_intermediate_format.i_physical_channels = p_input->input.i_physical_channels;
+        headphone_intermediate_format.i_original_channels = p_input->input.i_original_channels;
+        headphone_intermediate_format.i_bytes_per_frame =
+                headphone_intermediate_format.i_bytes_per_frame
+                * aout_FormatNbChannels( &headphone_intermediate_format )
+                / aout_FormatNbChannels( &intermediate_format );
+    }
+
-    intermediate_format.i_rate = p_input->input.i_rate;
+    headphone_intermediate_format.i_rate = p_input->input.i_rate;
-    if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
-                                     &p_input->i_nb_filters, &p_input->input,
-
+headphone_
-    {
-        msg_Err( p_aout, "couldn't set an input pipeline" );
@@ -64 +78 @@
-
-        return -1;
+    }
+
+    if ( config_GetInt( p_aout , "headphone" ) )
+    {
+        /* create a vlc object */
+        p_headphone_filter = vlc_object_create( p_aout
+                , sizeof(aout_filter_t) );
+        if ( p_headphone_filter == NULL )
+        {
+            msg_Err( p_aout, "couldn't open the headphone virtual spatialization module" );
+            aout_FifoDestroy( p_aout, &p_input->fifo );
+            p_input->b_error = 1;
+            return -1;
+        }
+        vlc_object_attach( p_headphone_filter, p_aout );
+
+        /* find the headphone filter */
+        memcpy( &p_headphone_filter->input, &headphone_intermediate_format
+                , sizeof(audio_sample_format_t) );
+        memcpy( &p_headphone_filter->output, &intermediate_format
+                , sizeof(audio_sample_format_t) );
+        p_headphone_filter->p_module = module_Need( p_headphone_filter, "audio filter"
+                , "headphone" );
+        if ( p_headphone_filter->p_module == NULL )
+        {
+            vlc_object_detach( p_headphone_filter );
+            vlc_object_destroy( p_headphone_filter );
+
+            msg_Err( p_aout, "couldn't open the headphone virtual spatialization module" );
+            aout_FifoDestroy( p_aout, &p_input->fifo );
+            p_input->b_error = 1;
+            return -1;
+        }
+
+        /* success */
+        p_headphone_filter->b_reinit = VLC_TRUE;
+        p_input->pp_filters[p_input->i_nb_filters++] = p_headphone_filter;
-    }
-

src/libvlc.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-7 2002/12/07 22:29:15 titer
+8 2002/12/09 00:52:42 babal
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -109 +109 @@
-    "you notice a lag between the video and the audio.")
-
+#define HEADPHONE_TEXT N_("headphone virtual spatialization effect")
+#define HEADPHONE_LONGTEXT N_( \
+    "This effect gives you the feeling that you stands in a real room " \
+    "with a complete 5.1 speaker set when using only a headphone, " \
+    "providing a more realistic sound experience. It should also be " \
+    "more comfortable and less tiring when listening to music for " \
+    "long periods of time.\nIt works with any source format from mono " \
+    "to 5.1.")
+
+#define HEADPHONE_DIM_TEXT N_("characteristic dimension")
+#define HEADPHONE_DIM_LONGTEXT N_( \
+     "Headphone virtual spatialization effect parameter: "\
+     "distance between front left speaker and listener in meters.")
+
-#define VOUT_TEXT N_("video output module")
-#define VOUT_LONGTEXT N_( \
@@ -401 +415 @@
-    add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT );
-    add_integer( "audio-format", 0, NULL, FORMAT_TEXT, FORMAT_LONGTEXT );
+    add_bool( "headphone", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT );
+    add_integer( "headphone-dim", 5, NULL, HEADPHONE_DIM_TEXT,
+                 HEADPHONE_DIM_LONGTEXT );
-
-    /* Video options */