Commit c859332c authored by Thomas Guillem's avatar Thomas Guillem

dtstofloat32: move to dca codec

This decoder works (for now) only if the input is correctly packetized.
parent b896923e
......@@ -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
......
......@@ -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*
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
/*****************************************************************************
* dtstofloat32.c: DTS Coherent Acoustics decoder plugin for VLC.
* 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, 2002libdca VLC authors and VideoLAN
* $Id$
* Copyright (C) 2001, 2016 libdca VLC authors and VideoLAN
*
* Author: Gildas Bazin <gbazin@videolan.org>
* Thomas Guillem <thomas@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
......@@ -30,10 +30,6 @@
* be subject to the terms of that later license.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
......@@ -41,45 +37,27 @@
#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>
#include <vlc_codec.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 };
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
/*****************************************************************************
* Local structures
*****************************************************************************/
struct filter_sys_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 */
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;
};
/*****************************************************************************
* 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 " \
......@@ -94,104 +72,13 @@ vlc_module_begin ()
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 )
set_capability( "decoder", 100 )
set_callbacks( Open, Close )
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
*****************************************************************************/
/*
* helper function to interleave channels
*/
static void Interleave( float * p_out, const float * p_in, int i_nb_channels,
uint8_t *pi_chan_table )
{
......@@ -207,9 +94,9 @@ static void Interleave( float * p_out, const float * p_in, int i_nb_channels,
}
}
/*****************************************************************************
* Duplicate: helper function to duplicate a unique channel
*****************************************************************************/
/*
* helper function to duplicate a unique channel
*/
static void Duplicate( float * p_out, const float * p_in )
{
int i;
......@@ -222,9 +109,9 @@ static void Duplicate( float * p_out, const float * p_in )
}
}
/*****************************************************************************
* Exchange: helper function to exchange left & right channels
*****************************************************************************/
/*
* helper function to exchange left & right channels
*/
static void Exchange( float * p_out, const float * p_in )
{
int i;
......@@ -238,16 +125,17 @@ static void Exchange( float * p_out, const float * p_in )
}
}
/*****************************************************************************
* Convert: decode a DTS frame.
*****************************************************************************/
static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
static block_t *Decode( decoder_t *p_dec, block_t **pp_block )
{
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);
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) )
......@@ -263,7 +151,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
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" );
msg_Warn( p_dec, "libdca couldn't sync on frame" );
p_out_buf->i_nb_samples = p_out_buf->i_buffer = 0;
goto out;
}
......@@ -275,7 +163,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
if ( (i_flags & DCA_CHANNEL_MASK) != (p_sys->i_flags & DCA_CHANNEL_MASK)
&& !p_sys->b_dontwarn )
{
msg_Warn( p_filter,
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 );
......@@ -294,20 +182,20 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
if( dca_block( p_sys->p_libdca ) )
{
msg_Warn( p_filter, "dca_block failed for block %d", i );
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_filter->fmt_out.audio.i_physical_channels
&& (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_filter->fmt_out.audio.i_original_channels
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),
......@@ -321,50 +209,150 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
}
}
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_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;
}
/*****************************************************************************
* OpenFilter:
*****************************************************************************/
static int OpenFilter( vlc_object_t *p_this )
static int channels_vlc2dca( const audio_format_t *p_audio, int *p_flags )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
int i_ret;
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;
if( p_filter->fmt_in.i_codec != VLC_CODEC_DTS
|| p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
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_filter->p_sys = malloc( sizeof(filter_sys_t) );
p_sys = p_dec->p_sys = malloc( sizeof(decoder_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_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
};
p_filter->pf_audio_filter = Convert;
p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
aout_CheckChannelReorder( pi_channels_in, NULL,
p_dec->fmt_in.audio.i_physical_channels,
p_sys->pi_chan_table );
return i_ret;
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;
}
/*****************************************************************************
* CloseFilter : deallocate data structures
*****************************************************************************/
static void CloseFilter( vlc_object_t *p_this )
static void Close( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
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 );
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment