diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 99bb90a05ced6dd308054123df2c932f7fb7b941..67e69b04a19a5c19f288e6090d8ef90e222ac921 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -26,9 +26,6 @@ libaraw_plugin_la_SOURCES = codec/araw.c
libaraw_plugin_la_LIBADD = $(LIBM)
codec_LTLIBRARIES += libaraw_plugin.la
-libdts_plugin_la_SOURCES = codec/dts.c packetizer/dts_header.c packetizer/dts_header.h
-codec_LTLIBRARIES += libdts_plugin.la
-
libfaad_plugin_la_SOURCES = codec/faad.c
libfaad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_faad)
libfaad_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
diff --git a/modules/codec/dts.c b/modules/codec/dts.c
deleted file mode 100644
index c70f12ad1d810fe708844c267b7c95da331c25e1..0000000000000000000000000000000000000000
--- a/modules/codec/dts.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*****************************************************************************
- * dts.c: parse DTS audio sync info and packetize the stream
- *****************************************************************************
- * Copyright (C) 2003-2009 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- * Gildas Bazin <gbazin@netcourrier.com>
- *
- * 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
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include <assert.h>
-
-#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_codec.h>
-#include <vlc_block_helper.h>
-#include <vlc_bits.h>
-#include <vlc_modules.h>
-#include <vlc_cpu.h>
-
-#include "../packetizer/packetizer_helper.h"
-#include "../packetizer/dts_header.h"
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int OpenPacketizer( vlc_object_t * );
-static void CloseCommon ( vlc_object_t * );
-
-vlc_module_begin ()
- set_description( N_("DTS parser") )
- set_capability( "decoder", 100 )
- set_callbacks( OpenDecoder, CloseCommon )
-
- add_submodule ()
- set_description( N_("DTS audio packetizer") )
- set_capability( "packetizer", 10 )
- set_callbacks( OpenPacketizer, CloseCommon )
-vlc_module_end ()
-
-/*****************************************************************************
- * decoder_sys_t : decoder descriptor
- *****************************************************************************/
-struct decoder_sys_t
-{
- /* Module mode */
- bool b_packetizer;
-
- /*
- * Input properties
- */
- int i_state;
-
- block_bytestream_t bytestream;
-
- /*
- * Common properties
- */
- date_t end_date;
-
- mtime_t i_pts;
-
- bool b_dts_hd; /* Is the current frame a DTS HD one */
- unsigned int i_bit_rate;
- unsigned int i_frame_size;
- unsigned int i_frame_length;
- unsigned int i_rate;
- unsigned int i_channels;
- unsigned int i_channels_conf;
-};
-
-/****************************************************************************
- * Local prototypes
- ****************************************************************************/
-static int OpenCommon( vlc_object_t *, bool b_packetizer );
-static block_t *DecodeBlock( decoder_t *, block_t ** );
-static void Flush( decoder_t * );
-
-static int SyncInfo( const uint8_t *, bool *, unsigned int *, unsigned int *,
- unsigned int *, unsigned int *, unsigned int * );
-
-static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
-static block_t *GetAoutBuffer( decoder_t * );
-static block_t *GetSoutBuffer( decoder_t * );
-
-/*****************************************************************************
- * OpenDecoder: probe the decoder
- *****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
-{
- /* 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 );
-}
-
-/*****************************************************************************
- * OpenPacketizer: probe the packetizer
- *****************************************************************************/
-static int OpenPacketizer( vlc_object_t *p_this )
-{
- return OpenCommon( p_this, true );
-}
-
-/*****************************************************************************
- * OpenCommon:
- *****************************************************************************/
-static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
-{
- decoder_t *p_dec = (decoder_t*)p_this;
- decoder_sys_t *p_sys;
-
- if( p_dec->fmt_in.i_codec != VLC_CODEC_DTS )
- return VLC_EGENERIC;
-
- /* Allocate the memory needed to store the decoder's structure */
- if( ( p_dec->p_sys = p_sys = malloc(sizeof(*p_sys)) ) == NULL )
- return VLC_ENOMEM;
-
- /* Misc init */
- p_sys->b_packetizer = b_packetizer;
- p_sys->i_state = STATE_NOSYNC;
- date_Set( &p_sys->end_date, 0 );
- p_sys->b_dts_hd = false;
- p_sys->i_pts = VLC_TS_INVALID;
-
- block_BytestreamInit( &p_sys->bytestream );
-
- /* Set output properties */
- p_dec->fmt_out.i_cat = AUDIO_ES;
- p_dec->fmt_out.i_codec = VLC_CODEC_DTS;
- p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
-
- /* Set callback */
- p_dec->pf_decode_audio = DecodeBlock;
- p_dec->pf_packetize = DecodeBlock;
- p_dec->pf_flush = Flush;
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Flush:
- *****************************************************************************/
-static void Flush( decoder_t *p_dec )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- date_Set( &p_sys->end_date, 0 );
- p_sys->i_state = STATE_NOSYNC;
- block_BytestreamEmpty( &p_sys->bytestream );
-}
-
-/****************************************************************************
- * DecodeBlock: the whole thing
- ****************************************************************************/
-static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
- uint8_t p_header[VLC_DTS_HEADER_SIZE];
- uint8_t *p_buf;
- block_t *p_out_buffer;
-
- if( !pp_block || !*pp_block )
- return NULL;
-
- if( (*pp_block)->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
- {
- if( (*pp_block)->i_flags & BLOCK_FLAG_CORRUPTED )
- {
- Flush( p_dec );
- block_Release( *pp_block );
- *pp_block = NULL;
- return NULL;
- }
- else /* BLOCK_FLAG_DISCONTINUITY */
- date_Set( &p_sys->end_date, 0 );
- }
-
- if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID )
- {
- /* We've just started the stream, wait for the first PTS. */
- block_Release( *pp_block );
- return NULL;
- }
-
- block_BytestreamPush( &p_sys->bytestream, *pp_block );
-
- while( 1 )
- {
- switch( p_sys->i_state )
- {
- case STATE_NOSYNC:
- /* Look for sync code - should be 0x7ffe8001 */
- while( block_PeekBytes( &p_sys->bytestream, p_header, 6 )
- == VLC_SUCCESS )
- {
- if( vlc_dts_header_IsSync( p_header, 6 ) )
- {
- p_sys->i_state = STATE_SYNC;
- break;
- }
- block_SkipByte( &p_sys->bytestream );
- }
- if( p_sys->i_state != STATE_SYNC )
- {
- block_BytestreamFlush( &p_sys->bytestream );
-
- /* Need more data */
- return NULL;
- }
-
- case STATE_SYNC:
- /* New frame, set the Presentation Time Stamp */
- p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
- if( p_sys->i_pts > VLC_TS_INVALID &&
- p_sys->i_pts != date_Get( &p_sys->end_date ) )
- {
- date_Set( &p_sys->end_date, p_sys->i_pts );
- }
- p_sys->i_state = STATE_HEADER;
-
- case STATE_HEADER:
- /* Get DTS frame header (VLC_DTS_HEADER_SIZE bytes) */
- if( block_PeekBytes( &p_sys->bytestream, p_header,
- VLC_DTS_HEADER_SIZE ) != VLC_SUCCESS )
- {
- /* Need more data */
- return NULL;
- }
-
- /* Check if frame is valid and get frame info */
- p_sys->i_frame_size = SyncInfo( p_header,
- &p_sys->b_dts_hd,
- &p_sys->i_channels,
- &p_sys->i_channels_conf,
- &p_sys->i_rate,
- &p_sys->i_bit_rate,
- &p_sys->i_frame_length );
- if( !p_sys->i_frame_size )
- {
- msg_Dbg( p_dec, "emulated sync word" );
- block_SkipByte( &p_sys->bytestream );
- p_sys->i_state = STATE_NOSYNC;
- break;
- }
- p_sys->i_state = STATE_NEXT_SYNC;
-
- case STATE_NEXT_SYNC:
- /* TODO: If pp_block == NULL, flush the buffer without checking the
- * next sync word */
-
- /* Check if next expected frame contains the sync word */
- if( block_PeekOffsetBytes( &p_sys->bytestream,
- p_sys->i_frame_size, p_header, 6 )
- != VLC_SUCCESS )
- {
- /* Need more data */
- return NULL;
- }
-
- if( p_sys->b_packetizer &&
- p_header[0] == 0 && p_header[1] == 0 )
- {
- /* DTS wav files and audio CD's use stuffing */
- p_sys->i_state = STATE_SEND_DATA;
- break;
- }
-
- if( vlc_dts_header_IsSync( p_header, 6 ) )
- {
- msg_Dbg( p_dec, "emulated sync word "
- "(no sync on following frame): %2.2x%2.2x%2.2x%2.2x",
- (int)p_header[0], (int)p_header[1],
- (int)p_header[2], (int)p_header[3] );
- p_sys->i_state = STATE_NOSYNC;
- block_SkipByte( &p_sys->bytestream );
- break;
- }
- p_sys->i_state = STATE_SEND_DATA;
- break;
-
- case STATE_GET_DATA:
- /* Make sure we have enough data.
- * (Not useful if we went through NEXT_SYNC) */
- if( block_WaitBytes( &p_sys->bytestream,
- p_sys->i_frame_size ) != VLC_SUCCESS )
- {
- /* Need more data */
- return NULL;
- }
- p_sys->i_state = STATE_SEND_DATA;
-
- case STATE_SEND_DATA:
- if( p_sys->b_dts_hd )
- {
- /* Ignore DTS-HD */
- block_SkipBytes( &p_sys->bytestream, p_sys->i_frame_size );
- p_sys->i_state = STATE_NOSYNC;
- break;
- }
-
- if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
- {
- //p_dec->b_error = true;
- return NULL;
- }
-
- /* Copy the whole frame into the buffer. When we reach this point
- * we already know we have enough data available. */
- block_GetBytes( &p_sys->bytestream,
- p_buf, __MIN( p_sys->i_frame_size, p_out_buffer->i_buffer ) );
-
- /* Make sure we don't reuse the same pts twice */
- if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts )
- p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID;
-
- p_sys->i_state = STATE_NOSYNC;
-
- /* So p_block doesn't get re-added several times */
- *pp_block = block_BytestreamPop( &p_sys->bytestream );
-
- return p_out_buffer;
- }
- }
-
- return NULL;
-}
-
-/*****************************************************************************
- * CloseCommon: clean up the decoder
- *****************************************************************************/
-static void CloseCommon( vlc_object_t *p_this )
-{
- decoder_t *p_dec = (decoder_t*)p_this;
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- block_BytestreamRelease( &p_sys->bytestream );
-
- free( p_sys );
-}
-
-/*****************************************************************************
- * GetOutBuffer:
- *****************************************************************************/
-static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
- uint8_t *p_buf;
-
- if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate )
- {
- msg_Info( p_dec, "DTS channels:%d samplerate:%d bitrate:%d",
- p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate );
-
- date_Init( &p_sys->end_date, p_sys->i_rate, 1 );
- date_Set( &p_sys->end_date, p_sys->i_pts );
- }
-
- p_dec->fmt_out.audio.i_rate = p_sys->i_rate;
- p_dec->fmt_out.audio.i_channels = p_sys->i_channels;
- /* Hack for DTS S/PDIF filter which needs to pad the DTS frames */
- p_dec->fmt_out.audio.i_bytes_per_frame =
- __MAX( p_sys->i_frame_size, p_sys->i_frame_length * 4 );
- p_dec->fmt_out.audio.i_frame_length = p_sys->i_frame_length;
-
- p_dec->fmt_out.audio.i_original_channels = p_sys->i_channels_conf;
- p_dec->fmt_out.audio.i_physical_channels =
- p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
-
- p_dec->fmt_out.i_bitrate = p_sys->i_bit_rate;
-
- if( p_sys->b_packetizer )
- {
- block_t *p_sout_buffer = GetSoutBuffer( p_dec );
- p_buf = p_sout_buffer ? p_sout_buffer->p_buffer : NULL;
- *pp_out_buffer = p_sout_buffer;
- }
- else
- {
- block_t *p_aout_buffer = GetAoutBuffer( p_dec );
- p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
- *pp_out_buffer = p_aout_buffer;
- }
-
- return p_buf;
-}
-
-/*****************************************************************************
- * GetAoutBuffer:
- *****************************************************************************/
-static block_t *GetAoutBuffer( decoder_t *p_dec )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_buf;
-
- /* Hack for DTS S/PDIF filter which needs to send 3 frames at a time
- * (plus a few header bytes) */
- p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length * 4 );
- if( p_buf == NULL ) return NULL;
-
- p_buf->i_nb_samples = p_sys->i_frame_length;
- p_buf->i_buffer = p_sys->i_frame_size;
-
- p_buf->i_pts = date_Get( &p_sys->end_date );
- p_buf->i_length = date_Increment( &p_sys->end_date, p_sys->i_frame_length )
- - p_buf->i_pts;
-
- return p_buf;
-}
-
-/*****************************************************************************
- * GetSoutBuffer:
- *****************************************************************************/
-static block_t *GetSoutBuffer( decoder_t *p_dec )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
-
- p_block = block_Alloc( p_sys->i_frame_size );
- if( p_block == NULL ) return NULL;
-
- p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
-
- p_block->i_length = date_Increment( &p_sys->end_date,
- p_sys->i_frame_length ) - p_block->i_pts;
-
- return p_block;
-}
-
-/*****************************************************************************
- * SyncInfo: parse DTS sync info
- *****************************************************************************/
-
-static int SyncInfo( const uint8_t *p_buf,
- bool *pb_dts_hd,
- unsigned int *pi_channels,
- unsigned int *pi_channels_conf,
- unsigned int *pi_sample_rate,
- unsigned int *pi_bit_rate,
- unsigned int *pi_frame_length )
-{
- vlc_dts_header_t dts;
- if( vlc_dts_header_Parse( &dts, p_buf, VLC_DTS_HEADER_SIZE ) != VLC_SUCCESS )
- return 0;
-
- *pb_dts_hd = dts.b_dts_hd;
-
- *pi_channels = popcount(dts.i_original_channels & AOUT_CHAN_PHYSMASK);
- *pi_channels_conf = dts.i_original_channels;
- *pi_sample_rate = dts.i_rate;
- *pi_bit_rate = dts.i_bitrate;
- *pi_frame_length = dts.i_frame_length;
-
- return dts.i_frame_size;
-}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8d16a43c8fd64bcd1e297289ca889c5c3cd94583..6475b9404d12affbe0ef2802e1aae39b80053a03 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -358,7 +358,6 @@ modules/codec/ddummy.c
modules/codec/dmo/buffer.c
modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.h
-modules/codec/dts.c
modules/codec/dvbsub.c
modules/codec/edummy.c
modules/codec/faad.c