* modules/stream_out/transcode.c: prepare transcoder to use resampling/downmixing...

* modules/audio_filter/*: set the output format to what's really being output.

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 9937c29ba238cfc683fcfb72f0ff0ca5e68f25f6..63e07193797fa960b4e00175877d7bdb88fc1c28 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -442,6 +442,7 @@ static int OpenFilter( vlc_object_t *p_this )
                   p_filter->fmt_in.audio, p_filter->fmt_out.audio );
 
     p_filter->pf_audio_filter = Convert;
+    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
 
     return i_ret;
 }

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 2116facf361873c2f957add4bcb59bd6d2718b2f..9c438ef0c4fbeb196fa99d4e1076486ea9c9f525 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -414,6 +414,7 @@ static int OpenFilter( vlc_object_t *p_this )
                   p_filter->fmt_in.audio, p_filter->fmt_out.audio );
 
     p_filter->pf_audio_filter = Convert;
+    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
 
     return i_ret;
 }

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 8c30c4b3f535fd034d978d7ecf50f4bc7e1b55a0..c493dc3e7408e874633522987022fbd87be30cd2 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -273,15 +273,20 @@ static int OpenFilter( vlc_object_t *p_this )
     mad_synth_init( &p_sys->mad_synth );
     mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC );
 
+    if( p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+        p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
+    else
+        p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
+    p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
+
+    p_filter->fmt_out.audio.i_bitspersample = sizeof(float);
+    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
+
     msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
              (char *)&p_filter->fmt_in.i_codec,
              (char *)&p_filter->fmt_out.i_codec,
              p_filter->fmt_out.audio.i_bitspersample );
 
-    p_filter->fmt_out.i_codec =
-        p_filter->fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
-    p_filter->fmt_out.audio.i_bitspersample = sizeof(float);
-
     return 0;
 }
 

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index 109c64b8303315c6693f2fced88609454602e073..28b338a4e4aa21bfd04183bf1232ed13df34c74c 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -220,8 +220,9 @@ static int Open( vlc_object_t *p_this )
     if( ConvertTable[i].pf_convert == NULL )
         return VLC_EGENERIC;
 
-    
     p_filter->pf_audio_filter = ConvertTable[i].pf_convert;
+    p_filter->fmt_out.audio = p_filter->fmt_in.audio;
+    p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
 
     msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
              (char *)&p_filter->fmt_in.i_codec,

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index f593f83a4c4537c16ad817cafc896e8a9167aa24..56c9f1085e03513a4d06536088e4bf0ac1ccb8f0 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -890,6 +890,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
                                 sout_stream_id_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
+    es_format_t fmt_last;
 
     /*
      * Open decoder
@@ -911,6 +912,9 @@ static int transcode_audio_new( sout_stream_t *p_stream,
     }
     id->p_decoder->fmt_out.audio.i_bitspersample = 
         audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
+    fmt_last = id->p_decoder->fmt_out;
+    /* FIX decoders so we don't have to do this */
+    fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate;
 
     /*
      * Open encoder
@@ -962,7 +966,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
     id->p_encoder->fmt_in.audio.i_bitspersample =
         audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
 
-    /* Check if we need a filter for chroma conversion or resizing */
+    /* Check if we need a filter for the audio format conversion */
     if( id->p_decoder->fmt_out.i_codec !=
         id->p_encoder->fmt_in.i_codec )
     {
@@ -972,7 +976,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
 
         id->pp_filter[0]->pf_audio_buffer_new = __block_New;
 
-        id->pp_filter[0]->fmt_in = id->p_decoder->fmt_out;
+        id->pp_filter[0]->fmt_in = fmt_last;
         id->pp_filter[0]->fmt_out = id->p_encoder->fmt_in;
         id->pp_filter[0]->p_module =
             module_Need( id->pp_filter[0], "audio filter2", 0, 0 );
@@ -993,6 +997,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
 
         id->pp_filter[0]->fmt_out.audio.i_bitspersample = 
             audio_BitsPerSample( id->pp_filter[0]->fmt_out.i_codec );
+        fmt_last = id->pp_filter[0]->fmt_out;
 
         /* Try a 2 stage conversion */
         if( id->pp_filter[0]->fmt_out.i_codec !=
@@ -1029,6 +1034,86 @@ static int transcode_audio_new( sout_stream_t *p_stream,
                 return VLC_EGENERIC;
             }
             else id->i_filter++;
+
+            fmt_last = id->pp_filter[1]->fmt_out;
+        }
+    }
+
+    /* Check if we need a filter for channel downmixing */
+    if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
+    {
+        id->pp_filter[id->i_filter] =
+            vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+        vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
+
+        id->pp_filter[id->i_filter]->pf_audio_buffer_new = __block_New;
+
+        id->pp_filter[id->i_filter]->fmt_in = fmt_last;
+        id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
+        id->pp_filter[id->i_filter]->fmt_out.audio.i_rate =
+            fmt_last.audio.i_rate;
+
+        id->pp_filter[id->i_filter]->p_module =
+            module_Need( id->pp_filter[id->i_filter], "audio filter2", 0, 0 );
+        if( id->pp_filter[id->i_filter]->p_module )
+        {
+            id->pp_filter[id->i_filter]->fmt_out.audio.i_bitspersample = 
+                audio_BitsPerSample( id->pp_filter[id->i_filter]->fmt_out.i_codec );
+            fmt_last = id->pp_filter[id->i_filter]->fmt_out;
+
+            id->i_filter++;
+        }
+        else
+        {
+            msg_Dbg( p_stream, "no audio filter found for mixing from"
+                     " %i to %i channels",
+                     id->pp_filter[id->i_filter]->fmt_in.audio.i_channels,
+                     id->pp_filter[id->i_filter]->fmt_out.audio.i_channels );
+            vlc_object_detach( id->pp_filter[id->i_filter] );
+            vlc_object_destroy( id->pp_filter[id->i_filter] );
+            id->p_encoder->fmt_in.audio.i_channels = fmt_last.audio.i_channels;
+            id->p_encoder->fmt_out.audio.i_channels =fmt_last.audio.i_channels;
+
+            id->p_encoder->fmt_in.audio.i_physical_channels =
+                id->p_encoder->fmt_in.audio.i_original_channels =
+                    fmt_last.audio.i_physical_channels;
+            id->p_encoder->fmt_out.audio.i_physical_channels =
+                id->p_encoder->fmt_out.audio.i_original_channels =
+                    fmt_last.audio.i_physical_channels;
+        }
+    }
+
+    /* Check if we need a filter for the sampling rate conversion */
+    if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
+    {
+        id->pp_filter[id->i_filter] =
+            vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+        vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
+
+        id->pp_filter[id->i_filter]->pf_audio_buffer_new = __block_New;
+
+        id->pp_filter[id->i_filter]->fmt_in = fmt_last;
+        id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
+        id->pp_filter[id->i_filter]->p_module =
+            module_Need( id->pp_filter[id->i_filter], "audio filter2", 0, 0 );
+        if( id->pp_filter[id->i_filter]->p_module )
+        {
+            id->pp_filter[id->i_filter]->fmt_out.audio.i_bitspersample = 
+                audio_BitsPerSample( id->pp_filter[id->i_filter]->fmt_out.i_codec );
+            fmt_last = id->pp_filter[id->i_filter]->fmt_out;
+
+            id->i_filter++;
+        }
+        else
+        {
+            msg_Dbg( p_stream, "no audio filter found resampling from"
+                     " %iHz to %iHz",
+                     id->pp_filter[id->i_filter]->fmt_in.audio.i_rate,
+                     id->pp_filter[id->i_filter]->fmt_out.audio.i_rate );
+            vlc_object_detach( id->pp_filter[id->i_filter] );
+            vlc_object_destroy( id->pp_filter[id->i_filter] );
+            id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
+            id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
         }
     }