Commit ad4a7e63 authored by gbazin's avatar gbazin
Browse files

* modules/audio_filter/converter/dtstofloat32.c: added implementation for the...

* modules/audio_filter/converter/dtstofloat32.c: added implementation for the new audio filter architecture.
* codec/dts.c: bug fix.
* codec/araw.c: added more PCM formats to the encoder.
parent 44fb66b7
......@@ -4,9 +4,9 @@
* (http://www.videolan.org/dtsdec/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: dtstofloat32.c,v 1.2 2004/02/29 13:05:22 gbazin Exp $
* $Id$
*
* Author: Gildas Bazin <gbazin@netcourrier.com>
* Author: Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -33,8 +33,9 @@
#include <dts.h> /* libdts header file */
#include "audio_output.h"
#include <vlc/decoder.h>
#include "aout_internal.h"
#include "vlc_filter.h"
/*****************************************************************************
* Local prototypes
......@@ -44,10 +45,17 @@ static void Destroy ( vlc_object_t * );
static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
static int Open ( vlc_object_t *, filter_sys_t *,
audio_format_t, audio_format_t );
static int OpenFilter ( vlc_object_t * );
static void CloseFilter( vlc_object_t * );
static block_t *Convert( filter_t *, block_t * );
/*****************************************************************************
* Local structures
*****************************************************************************/
struct aout_filter_sys_t
struct filter_sys_t
{
dts_state_t * p_libdts; /* libdts internal structure */
vlc_bool_t b_dynrng; /* see below */
......@@ -72,15 +80,21 @@ vlc_module_begin();
add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
add_submodule();
set_description( _("DTS Coherent Acoustics audio decoder") );
set_capability( "audio filter2", 100 );
set_callbacks( OpenFilter, CloseFilter );
vlc_module_end();
/*****************************************************************************
* Create:
*****************************************************************************/
static int Create( vlc_object_t * _p_filter )
static int Create( vlc_object_t *p_this )
{
aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
struct aout_filter_sys_t * p_sys;
aout_filter_t *p_filter = (aout_filter_t *)p_this;
filter_sys_t *p_sys;
int i_ret;
if ( p_filter->input.i_format != VLC_FOURCC('d','t','s',' ')
|| p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
......@@ -94,24 +108,40 @@ static int Create( vlc_object_t * _p_filter )
}
/* Allocate the memory needed to store the module's structure */
p_sys = p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
p_sys = malloc( sizeof(filter_sys_t) );
p_filter->p_sys = (struct aout_filter_sys_t *)p_sys;
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return -1;
}
p_sys->b_dynrng = config_GetInt( p_filter, "dts-dynrng" );
i_ret = Open( VLC_OBJECT(p_filter), p_sys,
p_filter->input, p_filter->output );
p_filter->pf_do_work = DoWork;
p_filter->b_in_place = 0;
return i_ret;
}
/*****************************************************************************
* Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
audio_format_t input, audio_format_t output )
{
p_sys->b_dynrng = config_GetInt( p_this, "dts-dynrng" );
p_sys->b_dontwarn = 0;
/* We'll do our own downmixing, thanks. */
p_sys->i_nb_channels = aout_FormatNbChannels( &p_filter->output );
switch ( (p_filter->output.i_physical_channels & AOUT_CHAN_PHYSMASK)
p_sys->i_nb_channels = aout_FormatNbChannels( &output );
switch ( (output.i_physical_channels & AOUT_CHAN_PHYSMASK)
& ~AOUT_CHAN_LFE )
{
case AOUT_CHAN_CENTER:
if ( (p_filter->output.i_original_channels & AOUT_CHAN_CENTER)
|| (p_filter->output.i_original_channels
if ( (output.i_original_channels & AOUT_CHAN_CENTER)
|| (output.i_original_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
p_sys->i_flags = DTS_MONO;
......@@ -119,15 +149,15 @@ static int Create( vlc_object_t * _p_filter )
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
if ( p_filter->output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
if ( output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
p_sys->i_flags = DTS_DOLBY;
}
else if ( p_filter->input.i_original_channels == AOUT_CHAN_CENTER )
else if ( input.i_original_channels == AOUT_CHAN_CENTER )
{
p_sys->i_flags = DTS_MONO;
}
else if ( p_filter->input.i_original_channels & AOUT_CHAN_DUALMONO )
else if ( input.i_original_channels & AOUT_CHAN_DUALMONO )
{
p_sys->i_flags = DTS_CHANNEL;
}
......@@ -161,11 +191,11 @@ static int Create( vlc_object_t * _p_filter )
break;
default:
msg_Warn( p_filter, "unknown sample format!" );
msg_Warn( p_this, "unknown sample format!" );
free( p_sys );
return -1;
}
if ( p_filter->output.i_physical_channels & AOUT_CHAN_LFE )
if ( output.i_physical_channels & AOUT_CHAN_LFE )
{
p_sys->i_flags |= DTS_LFE;
}
......@@ -175,14 +205,11 @@ static int Create( vlc_object_t * _p_filter )
p_sys->p_libdts = dts_init( 0 );
if( p_sys->p_libdts == NULL )
{
msg_Err( p_filter, "unable to initialize libdts" );
return -1;
msg_Err( p_this, "unable to initialize libdts" );
return VLC_EGENERIC;
}
p_filter->pf_do_work = DoWork;
p_filter->b_in_place = 0;
return 0;
return VLC_SUCCESS;
}
/*****************************************************************************
......@@ -269,7 +296,7 @@ static void Exchange( float * p_out, const float * p_in )
static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
struct aout_filter_sys_t * p_sys = p_filter->p_sys;
filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
sample_t i_sample_level = 1;
int i_flags = p_sys->i_flags;
int i_bytes_per_block = 256 * p_sys->i_nb_channels
......@@ -308,10 +335,10 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if( 0)//!p_sys->b_dynrng )
{
dts_dynrng( p_filter->p_sys->p_libdts, NULL, NULL );
dts_dynrng( p_sys->p_libdts, NULL, NULL );
}
for ( i = 0; i < dts_blocks_num(p_filter->p_sys->p_libdts); i++ )
for ( i = 0; i < dts_blocks_num(p_sys->p_libdts); i++ )
{
sample_t * p_samples;
......@@ -351,11 +378,104 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
/*****************************************************************************
* Destroy : deallocate data structures
*****************************************************************************/
static void Destroy( vlc_object_t * _p_filter )
static void Destroy( vlc_object_t *p_this )
{
aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
struct aout_filter_sys_t * p_sys = p_filter->p_sys;
aout_filter_t *p_filter = (aout_filter_t *)p_this;
filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
dts_free( p_sys->p_libdts );
free( p_sys );
}
/*****************************************************************************
* 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_FOURCC('d','t','s',' ') )
{
return VLC_EGENERIC;
}
p_filter->fmt_out.audio.i_format =
p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
/* 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 )
{
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
/* Allocate the memory needed to store the module's structure */
p_filter->p_sys = p_sys = malloc( sizeof(filter_sys_t) );
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
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;
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;
dts_free( p_sys->p_libdts );
free( p_sys );
}
static block_t *Convert( filter_t *p_filter, block_t *p_block )
{
aout_filter_t aout_filter;
aout_buffer_t in_buf, out_buf;
block_t *p_out;
int i_out_size = p_block->i_samples *
p_filter->fmt_out.audio.i_bitspersample *
p_filter->fmt_out.audio.i_channels;
p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
if( !p_out )
{
msg_Warn( p_filter, "can't get output buffer" );
return NULL;
}
p_out->i_samples = p_block->i_samples;
p_out->i_dts = p_block->i_dts;
p_out->i_pts = p_block->i_pts;
p_out->i_length = p_block->i_length;
aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
aout_filter.input = p_filter->fmt_in.audio;
aout_filter.input.i_format = p_filter->fmt_in.i_codec;
aout_filter.output = p_filter->fmt_out.audio;
aout_filter.output.i_format = p_filter->fmt_out.i_codec;
in_buf.p_buffer = p_block->p_buffer;
in_buf.i_nb_bytes = p_block->i_buffer;
in_buf.i_nb_samples = p_block->i_samples;
out_buf.p_buffer = p_out->p_buffer;
out_buf.i_nb_bytes = p_out->i_buffer;
out_buf.i_nb_samples = p_out->i_samples;
DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
return p_out;
}
......@@ -74,7 +74,7 @@ static int Open( vlc_object_t *p_this )
}
else return VLC_EGENERIC;
msg_Err( p_this, "%4.4s->%4.4s, bits per sample: %i",
msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
(char *)&p_filter->fmt_in.i_codec,
(char *)&p_filter->fmt_out.i_codec,
p_filter->fmt_in.audio.i_bitspersample );
......
......@@ -405,28 +405,29 @@ static int EncoderOpen( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
if( p_enc->fmt_in.i_codec != VLC_FOURCC( 's', '1', '6', 'b' ) &&
p_enc->fmt_in.i_codec != VLC_FOURCC( 's', '1', '6', 'l' ) )
if( (p_enc->fmt_out.i_codec == VLC_FOURCC('u','8',' ',' ') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','8',' ',' ') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','1','6','l') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','1','6','b')) &&
(p_enc->fmt_in.i_codec == VLC_FOURCC( 's', '1', '6', 'b' ) ||
p_enc->fmt_in.i_codec == VLC_FOURCC( 's', '1', '6', 'l' )) )
{
msg_Warn( p_enc, "unhandled input format" );
return VLC_EGENERIC;
;
}
switch( p_enc->fmt_out.i_codec )
else if( p_enc->fmt_out.i_codec == VLC_FOURCC('f','l','3','2') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('f','l','6','4') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('u','8',' ',' ') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','8',' ',' ') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','1','6','l') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','1','6','b') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','2','4','l') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','2','4','b') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','3','2','l') ||
p_enc->fmt_out.i_codec == VLC_FOURCC('s','3','2','b') )
{
case VLC_FOURCC( 's', '1', '6', 'b' ):
case VLC_FOURCC( 's', '1', '6', 'l' ):
case VLC_FOURCC( 'u', '8', ' ', ' ' ):
case VLC_FOURCC( 's', '8', ' ', ' ' ):
#if 0
-> could be easyly done with table look up
case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
#endif
break;
default:
return VLC_EGENERIC;
p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
}
else return VLC_EGENERIC;
p_enc->p_sys = NULL;
p_enc->pf_encode_audio = EncoderEncode;
......
......@@ -2,7 +2,7 @@
* dts.c: parse DTS audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dts.c,v 1.18 2004/02/25 17:48:52 fenrir Exp $
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -130,6 +130,7 @@ static int OpenDecoder( vlc_object_t *p_this )
/* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES;
p_dec->fmt_out.i_codec = VLC_FOURCC('d','t','s',' ');
p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
/* Set callback */
p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
......
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