Changeset 3c5c04601e89885ce961a766d85cffe9ab5b375a

Timestamp:

05/06/08 00:02:49 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212616969 +0200

git-parent:

[6d004778d445e1666c33b6ea4515a32428218e05]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212616962 +0200

Message:

This should fix audio transcoding. (unfortunately I have some issues
a bit later ... but at least it gives a starting point for people
wanting to have fun with transcode / audio / filter chains)

Files:

• modules/stream_out/transcode.c (modified) (2 diffs)

modules/stream_out/transcode.c

@@ -1216 +1216 @@
-
-    /* Init filter chain */
-fals
+tru
-                    transcode_audio_filter_allocation_init, NULL, NULL );
-    filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in );
@@ -1229 +1229 @@
-        filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &fmt_out );
-        fmt_last = fmt_out;
+    }
+
+    /* FIXME: same comment as in "#if 0"ed code */
+    int i;
+    for( i = 0; i < 4; i++ )
+    {
+        if( (fmt_last.audio.i_channels !=
+            id->p_encoder->fmt_in.audio.i_channels) ||
+            (fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate) ||
+            (fmt_last.i_codec != id->p_encoder->fmt_in.i_codec) )
+        {
+            filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &id->p_encoder->fmt_in );
+            fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
+        }
-    }
-