[vlc-devel] [PATCH 14/17] dtstofloat32: move to dca codec
Thomas Guillem
thomas at gllm.fr
Wed Jul 27 17:27:30 CEST 2016
This decoder works (for now) only if the input is correctly packetized.
---
configure.ac | 2 +-
extras/package/rpm/vlc.altlinux.spec | 10 +-
modules/MODULES_LIST | 2 +-
modules/audio_filter/Makefile.am | 7 -
modules/audio_filter/converter/dtstofloat32.c | 371 --------------------------
modules/codec/Makefile.am | 7 +
modules/codec/dca.c | 359 +++++++++++++++++++++++++
po/POTFILES.in | 2 +-
8 files changed, 374 insertions(+), 386 deletions(-)
delete mode 100644 modules/audio_filter/converter/dtstofloat32.c
create mode 100644 modules/codec/dca.c
diff --git a/configure.ac b/configure.ac
index 7fbc4df..ef7d9ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2697,7 +2697,7 @@ fi
dnl
dnl DTS Coherent Acoustics decoder plugin
dnl
-PKG_ENABLE_MODULES_VLC([DCA], [dtstofloat32], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [auto])
+PKG_ENABLE_MODULES_VLC([DCA], [dca], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [auto])
dnl
dnl Flac plugin
diff --git a/extras/package/rpm/vlc.altlinux.spec b/extras/package/rpm/vlc.altlinux.spec
index d7db35a..6c011b1 100644
--- a/extras/package/rpm/vlc.altlinux.spec
+++ b/extras/package/rpm/vlc.altlinux.spec
@@ -1266,6 +1266,11 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
%files plugin-live555
%_vlc_pluginsdir/demux/liblive555_plugin.so*
+%if_enabled dca
+%files plugin-dca
+%_vlc_pluginsdir/codec/libdca_plugin.so*
+%endif
+
%ifnarch x86_64
%files plugin-loader
%_vlc_pluginsdir/codec/libdmo_plugin.so*
@@ -1408,11 +1413,6 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
%files plugin-dvdread
%_vlc_pluginsdir/access/libdvdread_plugin.so*
-%if_enabled dca
-%files plugin-dca
-%_vlc_pluginsdir/audio_filter/libdtstofloat32_plugin.so*
-%endif
-
%if_enabled gnomevfs
%files plugin-gnomevfs
%_vlc_pluginsdir/access/libaccess_gnomevfs_plugin.so*
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 85b0532..06ac327 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -91,6 +91,7 @@ $Id$
* daala: a daala video decoder/packetizer using libdaala
* dbus: D-Bus control interface
* dbus_screensaver: preventing the computer from suspending
+ * dca: DTS audio decoder plugin, using libdca
* dc1394: IIDC (DCAM) FireWire input module
* dcp: Digital Cinema Package input
* ddummy: dummy decoder
@@ -115,7 +116,6 @@ $Id$
* dshow: DirectShow access plugin for encoding cards under Windows
* dsm: SMB access module
* dts: DTS basic parser/packetizer
- * dtstofloat32: DTS Audio converter
* dtv: DVB support (superseds bda module for Windows)
* dummy: dummy interface
* dv1394: Digital Video (Firewire/IEEE1394/I-Link) access module
diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am
index af4442d..ef48c75 100644
--- a/modules/audio_filter/Makefile.am
+++ b/modules/audio_filter/Makefile.am
@@ -76,13 +76,6 @@ audio_filter_LTLIBRARIES += \
libtrivial_channel_mixer_plugin.la
# Converters
-libdtstofloat32_plugin_la_SOURCES = audio_filter/converter/dtstofloat32.c
-libdtstofloat32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DCA_CFLAGS)
-libdtstofloat32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(audio_filterdir)'
-libdtstofloat32_plugin_la_LIBADD = $(LIBM) $(DCA_LIBS)
-EXTRA_LTLIBRARIES += libdtstofloat32_plugin.la
-audio_filter_LTLIBRARIES += $(LTLIBdtstofloat32)
-
libmad_plugin_la_SOURCES = audio_filter/converter/mpgatofixed32.c
libmad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(MAD_CFLAGS)
libmad_plugin_la_LIBADD = $(AM_LIBADD) $(MAD_LIBS)
diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
deleted file mode 100644
index 7b76417..0000000
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*****************************************************************************
- * dtstofloat32.c: DTS Coherent Acoustics decoder plugin for VLC.
- * This plugin makes use of libdca to do the actual decoding
- * (http://developers.videolan.org/libdca.html).
- *****************************************************************************
- * Copyright (C) 2001, 2002libdca VLC authors and VideoLAN
- * $Id$
- *
- * Author: Gildas Bazin <gbazin at videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * NOTA BENE: this module requires the linking against a library which is
- * known to require licensing under the GNU General Public License version 2
- * (or later). Therefore, the result of compiling this module will normally
- * be subject to the terms of that later license.
- *****************************************************************************/
-
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
-
-#include <dca.h> /* libdca header file */
-
-#include <vlc_aout.h>
-#include <vlc_block.h>
-#include <vlc_filter.h>
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int OpenFilter ( vlc_object_t * );
-static void CloseFilter( vlc_object_t * );
-static block_t *Convert( filter_t *, block_t * );
-
-/* libdca channel order
- * libdca currently only decodes 5.1, even if you have a DTS-ES source. */
-static const uint32_t pi_channels_in[] =
-{ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
- AOUT_CHAN_REARCENTER, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
- AOUT_CHAN_LFE,
- 0 };
-
-/*****************************************************************************
- * Local structures
- *****************************************************************************/
-struct filter_sys_t
-{
- dca_state_t * p_libdca; /* libdca internal structure */
- bool b_dynrng; /* see below */
- int i_flags; /* libdca flags, see dtsdec/doc/libdts.txt */
- bool b_dontwarn;
- int i_nb_channels; /* number of float32 per sample */
-
- uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
-};
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-#define DYNRNG_TEXT N_("DTS dynamic range compression")
-#define DYNRNG_LONGTEXT N_( \
- "Dynamic range compression makes the loud sounds softer, and the soft " \
- "sounds louder, so you can more easily listen to the stream in a noisy " \
- "environment without disturbing anyone. If you disable the dynamic range "\
- "compression the playback will be more adapted to a movie theater or a " \
- "listening room.")
-
-vlc_module_begin ()
- set_category( CAT_INPUT )
- set_subcategory( SUBCAT_INPUT_ACODEC )
- set_shortname( "DCA" )
- set_description( N_("DTS Coherent Acoustics audio decoder") )
- add_bool( "dts-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
- set_capability( "audio converter", 100 )
- set_callbacks( OpenFilter, CloseFilter )
-vlc_module_end ()
-
-/*****************************************************************************
- * Open:
- *****************************************************************************/
-static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
- const audio_format_t *restrict input,
- const audio_format_t *restrict output )
-{
- p_sys->b_dynrng = var_InheritBool( p_this, "dts-dynrng" );
- p_sys->b_dontwarn = 0;
-
- /* We'll do our own downmixing, thanks. */
- p_sys->i_nb_channels = aout_FormatNbChannels( output );
- switch ( output->i_physical_channels & ~AOUT_CHAN_LFE )
- {
- case AOUT_CHAN_CENTER:
- if ( (output->i_original_channels & AOUT_CHAN_CENTER)
- || (output->i_original_channels
- & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
- {
- p_sys->i_flags = DCA_MONO;
- }
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
- if ( output->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
- {
- p_sys->i_flags = DCA_DOLBY;
- }
- else if ( input->i_original_channels == AOUT_CHAN_CENTER )
- {
- p_sys->i_flags = DCA_MONO;
- }
- else if ( input->i_original_channels & AOUT_CHAN_DUALMONO )
- {
- p_sys->i_flags = DCA_CHANNEL;
- }
- else
- {
- p_sys->i_flags = DCA_STEREO;
- }
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
- p_sys->i_flags = DCA_3F;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER:
- p_sys->i_flags = DCA_2F1R;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARCENTER:
- p_sys->i_flags = DCA_3F1R;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
- p_sys->i_flags = DCA_2F2R;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
- p_sys->i_flags = DCA_3F2R;
- break;
-
- default:
- msg_Warn( p_this, "unknown sample format!" );
- free( p_sys );
- return -1;
- }
- if ( output->i_physical_channels & AOUT_CHAN_LFE )
- {
- p_sys->i_flags |= DCA_LFE;
- }
- //p_sys->i_flags |= DCA_ADJUST_LEVEL;
-
- /* Initialize libdca */
- p_sys->p_libdca = dca_init( 0 );
- if( p_sys->p_libdca == NULL )
- {
- msg_Err( p_this, "unable to initialize libdca" );
- return VLC_EGENERIC;
- }
-
- aout_CheckChannelReorder( pi_channels_in, NULL,
- output->i_physical_channels,
- p_sys->pi_chan_table );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Interleave: helper function to interleave channels
- *****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_nb_channels,
- uint8_t *pi_chan_table )
-{
- /* We do not only have to interleave, but also reorder the channels. */
-
- int i, j;
- for ( j = 0; j < i_nb_channels; j++ )
- {
- for ( i = 0; i < 256; i++ )
- {
- p_out[i * i_nb_channels + pi_chan_table[j]] = p_in[j * 256 + i];
- }
- }
-}
-
-/*****************************************************************************
- * Duplicate: helper function to duplicate a unique channel
- *****************************************************************************/
-static void Duplicate( float * p_out, const float * p_in )
-{
- int i;
-
- for ( i = 256; i--; )
- {
- *p_out++ = *p_in;
- *p_out++ = *p_in;
- p_in++;
- }
-}
-
-/*****************************************************************************
- * Exchange: helper function to exchange left & right channels
- *****************************************************************************/
-static void Exchange( float * p_out, const float * p_in )
-{
- int i;
- const float * p_first = p_in + 256;
- const float * p_second = p_in;
-
- for ( i = 0; i < 256; i++ )
- {
- *p_out++ = *p_first++;
- *p_out++ = *p_second++;
- }
-}
-
-/*****************************************************************************
- * Convert: decode a DTS frame.
- *****************************************************************************/
-static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
-{
- filter_sys_t *p_sys = p_filter->p_sys;
- sample_t i_sample_level = 1;
- int i_flags = p_sys->i_flags;
- size_t i_bytes_per_block = 256 * p_sys->i_nb_channels
- * sizeof(float);
-
- block_t *p_out_buf = block_Alloc( 6 * i_bytes_per_block );
- if( unlikely(p_out_buf == NULL) )
- goto out;
-
- /*
- * Do the actual decoding now.
- */
-
- /* Needs to be called so the decoder knows which type of bitstream it is
- * dealing with. */
- int i_sample_rate, i_bit_rate, i_frame_length;
- if( !dca_syncinfo( p_sys->p_libdca, p_in_buf->p_buffer, &i_flags,
- &i_sample_rate, &i_bit_rate, &i_frame_length ) )
- {
- msg_Warn( p_filter, "libdca couldn't sync on frame" );
- p_out_buf->i_nb_samples = p_out_buf->i_buffer = 0;
- goto out;
- }
-
- i_flags = p_sys->i_flags;
- dca_frame( p_sys->p_libdca, p_in_buf->p_buffer,
- &i_flags, &i_sample_level, 0 );
-
- if ( (i_flags & DCA_CHANNEL_MASK) != (p_sys->i_flags & DCA_CHANNEL_MASK)
- && !p_sys->b_dontwarn )
- {
- msg_Warn( p_filter,
- "libdca couldn't do the requested downmix 0x%x->0x%x",
- p_sys->i_flags & DCA_CHANNEL_MASK,
- i_flags & DCA_CHANNEL_MASK );
-
- p_sys->b_dontwarn = 1;
- }
-
- if( 0)//!p_sys->b_dynrng )
- {
- dca_dynrng( p_sys->p_libdca, NULL, NULL );
- }
-
- for( int i = 0; i < dca_blocks_num(p_sys->p_libdca); i++ )
- {
- sample_t * p_samples;
-
- if( dca_block( p_sys->p_libdca ) )
- {
- msg_Warn( p_filter, "dca_block failed for block %d", i );
- break;
- }
-
- p_samples = dca_samples( p_sys->p_libdca );
-
- if ( (p_sys->i_flags & DCA_CHANNEL_MASK) == DCA_MONO
- && (p_filter->fmt_out.audio.i_physical_channels
- & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
- {
- Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples );
- }
- else if ( p_filter->fmt_out.audio.i_original_channels
- & AOUT_CHAN_REVERSESTEREO )
- {
- Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples );
- }
- else
- {
- /* Interleave the *$£%ù samples. */
- Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
- }
- }
-
- p_out_buf->i_buffer = p_in_buf->i_nb_samples * 4 * p_sys->i_nb_channels;
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_dts = p_in_buf->i_dts;
- p_out_buf->i_pts = p_in_buf->i_pts;
- p_out_buf->i_length = p_in_buf->i_length;
-out:
- block_Release( p_in_buf );
- return p_out_buf;
-}
-
-/*****************************************************************************
- * OpenFilter:
- *****************************************************************************/
-static int OpenFilter( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t *)p_this;
- filter_sys_t *p_sys;
- int i_ret;
-
- if( p_filter->fmt_in.i_codec != VLC_CODEC_DTS
- || p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
- return VLC_EGENERIC;
-
- /* Allocate the memory needed to store the module's structure */
- p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );
- if( p_sys == NULL )
- return VLC_ENOMEM;
-
- i_ret = Open( VLC_OBJECT(p_filter), p_sys,
- &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;
-}
-
-/*****************************************************************************
- * CloseFilter : deallocate data structures
- *****************************************************************************/
-static void CloseFilter( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t *)p_this;
- filter_sys_t *p_sys = p_filter->p_sys;
-
- dca_free( p_sys->p_libdca );
- free( p_sys );
-}
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 1bdf0c1..bdb8894 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -23,6 +23,13 @@ libliba52_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
EXTRA_LTLIBRARIES += libliba52_plugin.la
codec_LTLIBRARIES += $(LTLIBliba52)
+libdca_plugin_la_SOURCES = codec/dca.c
+libdca_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DCA_CFLAGS)
+libdca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libdca_plugin_la_LIBADD = $(LIBM) $(DCA_LIBS)
+EXTRA_LTLIBRARIES += libdca_plugin.la
+codec_LTLIBRARIES += $(LTLIBdca)
+
libadpcm_plugin_la_SOURCES = codec/adpcm.c
codec_LTLIBRARIES += libadpcm_plugin.la
diff --git a/modules/codec/dca.c b/modules/codec/dca.c
new file mode 100644
index 0000000..511aeb9
--- /dev/null
+++ b/modules/codec/dca.c
@@ -0,0 +1,359 @@
+/*****************************************************************************
+ * dca.c: DTS Coherent Acoustics decoder plugin for VLC.
+ * This plugin makes use of libdca to do the actual decoding
+ * (http://developers.videolan.org/libdca.html).
+ *****************************************************************************
+ * Copyright (C) 2001, 2016 libdca VLC authors and VideoLAN
+ *
+ * Author: Gildas Bazin <gbazin at videolan.org>
+ * Thomas Guillem <thomas at gllm.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * NOTA BENE: this module requires the linking against a library which is
+ * known to require licensing under the GNU General Public License version 2
+ * (or later). Therefore, the result of compiling this module will normally
+ * be subject to the terms of that later license.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+
+#include <dca.h> /* libdca header file */
+
+#include <vlc_aout.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
+
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+struct decoder_sys_t
+{
+ dca_state_t *p_libdca; /* libdca internal structure */
+ bool b_dynrng; /* see below */
+ int i_flags; /* libdca flags, see dtsdec/doc/libdts.txt */
+ bool b_dontwarn;
+ int i_nb_channels; /* number of float32 per sample */
+
+ uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
+ bool b_synced;
+};
+
+#define DYNRNG_TEXT N_("DTS dynamic range compression")
+#define DYNRNG_LONGTEXT N_( \
+ "Dynamic range compression makes the loud sounds softer, and the soft " \
+ "sounds louder, so you can more easily listen to the stream in a noisy " \
+ "environment without disturbing anyone. If you disable the dynamic range "\
+ "compression the playback will be more adapted to a movie theater or a " \
+ "listening room.")
+
+vlc_module_begin ()
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+ set_shortname( "DCA" )
+ set_description( N_("DTS Coherent Acoustics audio decoder") )
+ add_bool( "dts-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
+ set_capability( "decoder", 100 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
+
+/*
+ * helper function to interleave channels
+ */
+static void Interleave( float * p_out, const float * p_in, int i_nb_channels,
+ uint8_t *pi_chan_table )
+{
+ /* We do not only have to interleave, but also reorder the channels. */
+
+ int i, j;
+ for ( j = 0; j < i_nb_channels; j++ )
+ {
+ for ( i = 0; i < 256; i++ )
+ {
+ p_out[i * i_nb_channels + pi_chan_table[j]] = p_in[j * 256 + i];
+ }
+ }
+}
+
+/*
+ * helper function to duplicate a unique channel
+ */
+static void Duplicate( float * p_out, const float * p_in )
+{
+ int i;
+
+ for ( i = 256; i--; )
+ {
+ *p_out++ = *p_in;
+ *p_out++ = *p_in;
+ p_in++;
+ }
+}
+
+/*
+ * helper function to exchange left & right channels
+ */
+static void Exchange( float * p_out, const float * p_in )
+{
+ int i;
+ const float * p_first = p_in + 256;
+ const float * p_second = p_in;
+
+ for ( i = 0; i < 256; i++ )
+ {
+ *p_out++ = *p_first++;
+ *p_out++ = *p_second++;
+ }
+}
+
+static block_t *Decode( decoder_t *p_dec, block_t **pp_block )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if (pp_block == NULL || *pp_block == NULL)
+ return NULL;
+
+ block_t *p_in_buf = *pp_block;
+ sample_t i_sample_level = 1;
+ int i_flags = p_sys->i_flags;
+ size_t i_bytes_per_block = 256 * p_sys->i_nb_channels * sizeof(float);
+
+ block_t *p_out_buf = block_Alloc( 6 * i_bytes_per_block );
+ if( unlikely(p_out_buf == NULL) )
+ goto out;
+
+ /*
+ * Do the actual decoding now.
+ */
+
+ /* Needs to be called so the decoder knows which type of bitstream it is
+ * dealing with. */
+ int i_sample_rate, i_bit_rate, i_frame_length;
+ if( !dca_syncinfo( p_sys->p_libdca, p_in_buf->p_buffer, &i_flags,
+ &i_sample_rate, &i_bit_rate, &i_frame_length ) )
+ {
+ msg_Warn( p_dec, "libdca couldn't sync on frame" );
+ p_out_buf->i_nb_samples = p_out_buf->i_buffer = 0;
+ goto out;
+ }
+
+ i_flags = p_sys->i_flags;
+ dca_frame( p_sys->p_libdca, p_in_buf->p_buffer,
+ &i_flags, &i_sample_level, 0 );
+
+ if ( (i_flags & DCA_CHANNEL_MASK) != (p_sys->i_flags & DCA_CHANNEL_MASK)
+ && !p_sys->b_dontwarn )
+ {
+ msg_Warn( p_dec,
+ "libdca couldn't do the requested downmix 0x%x->0x%x",
+ p_sys->i_flags & DCA_CHANNEL_MASK,
+ i_flags & DCA_CHANNEL_MASK );
+
+ p_sys->b_dontwarn = 1;
+ }
+
+ if( 0)//!p_sys->b_dynrng )
+ {
+ dca_dynrng( p_sys->p_libdca, NULL, NULL );
+ }
+
+ for( int i = 0; i < dca_blocks_num(p_sys->p_libdca); i++ )
+ {
+ sample_t * p_samples;
+
+ if( dca_block( p_sys->p_libdca ) )
+ {
+ msg_Warn( p_dec, "dca_block failed for block %d", i );
+ break;
+ }
+
+ p_samples = dca_samples( p_sys->p_libdca );
+
+ if ( (p_sys->i_flags & DCA_CHANNEL_MASK) == DCA_MONO
+ && (p_dec->fmt_out.audio.i_physical_channels
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ {
+ Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples );
+ }
+ else if ( p_dec->fmt_out.audio.i_original_channels
+ & AOUT_CHAN_REVERSESTEREO )
+ {
+ Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples );
+ }
+ else
+ {
+ /* Interleave the *$£%ù samples. */
+ Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
+ }
+ }
+
+ p_out_buf->i_nb_samples = dca_blocks_num(p_sys->p_libdca) * 256;
+ p_out_buf->i_buffer = p_in_buf->i_nb_samples * sizeof(float) * p_sys->i_nb_channels;
+ p_out_buf->i_dts = p_in_buf->i_dts;
+ p_out_buf->i_pts = p_in_buf->i_pts;
+ p_out_buf->i_length = p_in_buf->i_length;
+out:
+ block_Release( p_in_buf );
+ *pp_block = NULL;
+ return p_out_buf;
+}
+
+static int channels_vlc2dca( const audio_format_t *p_audio, int *p_flags )
+{
+ int i_flags = 0;
+
+ switch ( p_audio->i_physical_channels & ~AOUT_CHAN_LFE )
+ {
+ case AOUT_CHAN_CENTER:
+ if ( (p_audio->i_original_channels & AOUT_CHAN_CENTER)
+ || (p_audio->i_original_channels
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ i_flags = DCA_MONO;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
+ if ( p_audio->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ i_flags = DCA_DOLBY;
+ else if ( p_audio->i_original_channels == AOUT_CHAN_CENTER )
+ i_flags = DCA_MONO;
+ else if ( p_audio->i_original_channels & AOUT_CHAN_DUALMONO )
+ i_flags = DCA_CHANNEL;
+ else
+ i_flags = DCA_STEREO;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
+ i_flags = DCA_3F;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER:
+ i_flags = DCA_2F1R;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARCENTER:
+ i_flags = DCA_3F1R;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
+ i_flags = DCA_2F2R;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
+ i_flags = DCA_3F2R;
+ break;
+
+ default:
+ return VLC_EGENERIC;
+ }
+
+ if ( p_audio->i_physical_channels & AOUT_CHAN_LFE )
+ i_flags |= DCA_LFE;
+ *p_flags = i_flags;
+ return VLC_SUCCESS;
+}
+
+static int Open( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys;
+
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_DTS
+ || p_dec->fmt_in.audio.i_rate == 0
+ || p_dec->fmt_in.audio.i_physical_channels == 0
+ || p_dec->fmt_in.audio.i_original_channels == 0
+ || p_dec->fmt_in.audio.i_bytes_per_frame == 0
+ || p_dec->fmt_in.audio.i_frame_length == 0 )
+ return VLC_EGENERIC;
+
+ /* Allocate the memory needed to store the module's structure */
+ p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
+
+ p_sys->b_dynrng = var_InheritBool( p_this, "dts-dynrng" );
+ p_sys->b_dontwarn = 0;
+
+ /* We'll do our own downmixing, thanks. */
+ p_sys->i_nb_channels = aout_FormatNbChannels( &p_dec->fmt_in.audio );
+ if( channels_vlc2dca( &p_dec->fmt_in.audio, &p_sys->i_flags )
+ != VLC_SUCCESS )
+ {
+ msg_Warn( p_this, "unknown sample format!" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+ //p_sys->i_flags |= DCA_ADJUST_LEVEL;
+
+ /* Initialize libdca */
+ p_sys->p_libdca = dca_init( 0 );
+ if( p_sys->p_libdca == NULL )
+ {
+ msg_Err( p_this, "unable to initialize libdca" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* libdca channel order
+ * libdca currently only decodes 5.1, even if you have a DTS-ES source. */
+ static const uint32_t pi_channels_in[] = {
+ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_REARCENTER, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LFE, 0
+ };
+
+ aout_CheckChannelReorder( pi_channels_in, NULL,
+ p_dec->fmt_in.audio.i_physical_channels,
+ p_sys->pi_chan_table );
+
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.audio = p_dec->fmt_in.audio;
+ p_dec->fmt_out.audio.i_format = VLC_CODEC_FL32;
+ p_dec->fmt_out.i_codec = p_dec->fmt_out.audio.i_format;
+
+ aout_FormatPrepare( &p_dec->fmt_out.audio );
+
+ if( decoder_UpdateAudioFormat( p_dec ) )
+ {
+ es_format_Init( &p_dec->fmt_out, UNKNOWN_ES, 0 );
+ Close( p_this );
+ return VLC_EGENERIC;
+ }
+
+ p_dec->pf_decode_audio = Decode;
+ p_dec->pf_flush = NULL;
+ return VLC_SUCCESS;
+}
+
+static void Close( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ dca_free( p_sys->p_libdca );
+ free( p_sys );
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 395fce8..d8ea328 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -284,7 +284,6 @@ modules/audio_filter/channel_mixer/simple.c
modules/audio_filter/channel_mixer/trivial.c
modules/audio_filter/chorus_flanger.c
modules/audio_filter/compressor.c
-modules/audio_filter/converter/dtstofloat32.c
modules/audio_filter/converter/format.c
modules/audio_filter/converter/mpgatofixed32.c
modules/audio_filter/converter/tospdif.c
@@ -353,6 +352,7 @@ modules/codec/cdg.c
modules/codec/crystalhd.c
modules/codec/cvdsub.c
modules/codec/daala.c
+modules/codec/dca.c
modules/codec/ddummy.c
modules/codec/dmo/buffer.c
modules/codec/dmo/dmo.c
--
2.8.1
More information about the vlc-devel
mailing list