Changeset 2e1cf451fa5cca785451c97aaea55fd4f7e14d95

Timestamp:

07/09/04 11:34:03 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1094549643 +0000

git-parent:

[f9701bc54aa3779d0188761f26f5bb507b1692e3]

git-author:

Gildas Bazin <gbazin@videolan.org> 1094549643 +0000

Message:

* src/input/decoder.c, modules/codec/faad.c: work around another bug in libfaad with ADTS streams.

Files:

• modules/codec/faad.c (modified) (3 diffs)
• src/input/decoder.c (modified) (1 diff)

modules/codec/faad.c

@@ -6 +6 @@
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
-netcourrier.com
+videolan.org
- *
- * This program is free software; you can redistribute it and/or modify
@@ -201 +201 @@
-    }
-
+    if( p_dec->fmt_out.audio.i_rate == 0 && p_dec->fmt_in.i_extra > 0 )
+    {
+        /* We have a decoder config so init the handle */
+        unsigned long i_rate;
+        unsigned char i_channels;
+
+        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
+                          p_dec->fmt_in.i_extra,
+                          &i_rate, &i_channels ) >= 0 )
+        {
+            p_dec->fmt_out.audio.i_rate = i_rate;
+            p_dec->fmt_out.audio.i_channels = i_channels;
+            aout_DateInit( &p_sys->date, i_rate );
+        }
+    }
+
-    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
-    {
@@ -308 +324 @@
-                    break;
-                }
+            }
+
+            if( j == MAX_CHANNEL_POSITIONS )
+            {
+                msg_Warn( p_dec, "unknow channel ordering" );
+                block_Release( p_block );
+                return NULL;
-            }
-        }

src/input/decoder.c

@@ -590 +590 @@
-                    p_packetizer->pf_packetize( p_packetizer, &p_block )) )
-            {
+                if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
+                {
+                    p_dec->fmt_in.i_extra = p_packetizer->fmt_out.i_extra;
+                    p_dec->fmt_in.p_extra = malloc( p_dec->fmt_in.i_extra );
+                    memcpy( p_dec->fmt_in.p_extra,
+                            p_packetizer->fmt_out.p_extra,
+                            p_dec->fmt_in.i_extra );
+                }
+
-                while( p_packetized_block )
-                {