[vlc-commits] commit: Disable A52, DTS and MPEG Audio dummy decoder plugins ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Apr 15 21:22:13 2010 +0300| [4ae4621a3ba903086a7fee8b53bdeb5f9d66bd02] | committer: Rémi Denis-Courmont 

Disable A52, DTS and MPEG Audio dummy decoder plugins

As a consequence, the avcodec decoder plugin will be used instead.
Note that this will break SPDIF output. It also makes liba52, libdca
and libmad totally redumdant (though they arguably are anyway).

To fix the dummy decoders, we need to resize aout_buffer_t. That is
already implemented in VLC 1.1.x, so use that if you want SPDIF.

Alternatively, to restore liba52/libdca/libmad use (but not SPDIF),
we would need to convert their plugins from audio filters to decoders.
But this would be a waste of time considering avcodec already works.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=4ae4621a3ba903086a7fee8b53bdeb5f9d66bd02
---

 modules/codec/a52.c        |    5 +++++
 modules/codec/dts.c        |    5 +++++
 modules/codec/mpeg_audio.c |    5 +++++
 3 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 474a1d0..f55cae1 100644
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -159,7 +159,12 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
 
 static int OpenDecoder( vlc_object_t *p_this )
 {
+#if 0
     return OpenCommon( p_this, false );
+#else
+    msg_Dbg( p_this, "skipping broken module" );
+    return VLC_EGENERIC;
+#endif
 }
 
 static int OpenPacketizer( vlc_object_t *p_this )
diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index 9b4ac47..090eae1 100644
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -117,11 +117,16 @@ static block_t       *GetSoutBuffer( decoder_t * );
  *****************************************************************************/
 static int OpenDecoder( vlc_object_t *p_this )
 {
+#if 0
     /* HACK: Don't use this codec if we don't have an dts audio filter */
     if( !module_exists( "dtstofloat32" ) )
         return VLC_EGENERIC;
 
     return OpenCommon( p_this, false );
+#else
+    msg_Dbg( p_this, "skipping broken module" );
+    return VLC_EGENERIC;
+#endif
 }
 
 /*****************************************************************************
diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 306bf07..91aa7db 100644
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -171,10 +171,15 @@ static int Open( vlc_object_t *p_this )
 static int OpenDecoder( vlc_object_t *p_this )
 {
     /* HACK: Don't use this codec if we don't have an mpga audio filter */
+#if 0
     if( !module_exists( "mpgatofixed32" ) )
         return VLC_EGENERIC;
 
     return Open( p_this );
+#else
+    msg_Dbg( p_this, "skipping broken module" );
+    return VLC_EGENERIC;
+#endif
 }
 
 static int OpenPacketizer( vlc_object_t *p_this )