Changeset 17afdb9122177e7dd1a974c26d9948c1dbfd4e18

Timestamp:

08/29/06 13:27:38 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1156850858 +0000

git-parent:

[1d0b15b5cb9fae31bdc56931a0167556cc4ebe92]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1156850858 +0000

Message:

Cleanup

Files:

• modules/audio_filter/converter/mono.c (modified) (7 diffs)

modules/audio_filter/converter/mono.c

@@ -104 +104 @@
-  AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
-
-
+mono-
-/*****************************************************************************
- * Module descriptor
@@ -112 +112 @@
-    set_capability( "audio filter2", 5 );
-
-mono-
+
-              MONO_DOWNMIX_LONGTEXT, VLC_FALSE );
-mono-
+
-        MONO_CHANNEL_LONGTEXT, VLC_FALSE );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
@@ -380 +380 @@
-        (p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate) &&
-        (p_filter->fmt_in.audio.i_format != AOUT_FMT_S16_NE) &&
-
+
+
+
-    {
-        msg_Err( p_this, "couldn't load mono filter" );
@@ -394 +396 @@
-    }
-
-mono-
+
-                VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-mono-
-
-mono-
+
+
+
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    p_sys->i_channel_selected =
-mono-
+
-
-    if( p_sys->b_downmix )
-    {
+        msg_Dbg( p_this, "using stereo to mono downmix" );
-        p_filter->fmt_out.audio.i_physical_channels = AOUT_CHAN_CENTER;
+        p_filter->fmt_out.audio.i_channels = 1;
-    }
-    else
-    {
+        msg_Dbg( p_this, "using pseudo mono" );
-        p_filter->fmt_out.audio.i_physical_channels =
-                            (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT);
-}
-p_filter->fmt_out.audio.i_channels = aout_FormatNbChannels( &(p_filter->fmt_out.audio) );
+    p_filter->fmt_out.audio.i_channels = 2;
+}
-
-    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
@@ -454 +459 @@
-    filter_sys_t *p_sys = p_filter->p_sys;
-
-mono-
-mono-
+
+
-    free( p_sys );
-}
@@ -517 +522 @@
-    out_buf.i_nb_samples = p_out->i_samples;
-
+    memset( p_out->p_buffer, 0, i_out_size );
-    if( p_filter->p_sys->b_downmix )
-    {
-        memset( out_buf.p_buffer, 0, i_out_size );
-        stereo2mono_downmix( (aout_instance_t *)p_filter, &aout_filter,
-                             &in_buf, &out_buf );
@@ -576 +581 @@
-        i_overflow_size = p_sys->i_overflow_buffer_size;
-
-        memset( p_out, 0, i_out_size );
-        if ( i_out_size > i_overflow_size )
-            memcpy( p_out, p_overflow, i_overflow_size );