From e906e5d49b37b90ff56329c2e085e3412fe7cfdd Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 26 Jul 2016 13:36:12 +0200
Subject: [PATCH] packetizer: add new dts module
Based on packetizer/a52.c and packetizer/dts_helper.h
---
modules/packetizer/Makefile.am | 3 +
modules/packetizer/dts.c | 332 +++++++++++++++++++++++++++++++++
po/POTFILES.in | 1 +
3 files changed, 336 insertions(+)
create mode 100644 modules/packetizer/dts.c
diff --git a/modules/packetizer/Makefile.am b/modules/packetizer/Makefile.am
index 2bc1190e6381..d44755f36742 100644
--- a/modules/packetizer/Makefile.am
+++ b/modules/packetizer/Makefile.am
@@ -17,6 +17,8 @@ libpacketizer_hevc_plugin_la_SOURCES = packetizer/hevc.c \
packetizer/hxxx_nal.h \
packetizer/hxxx_common.c packetizer/hxxx_common.h
libpacketizer_a52_plugin_la_SOURCES = packetizer/a52.c packetizer/a52.h
+libpacketizer_dts_plugin_la_SOURCES = packetizer/dts.c \
+ packetizer/dts_header.c packetizer/dts_header.h
libpacketizer_avparser_plugin_la_SOURCES = packetizer/avparser.c \
packetizer/avparser.h \
@@ -40,6 +42,7 @@ packetizer_LTLIBRARIES = \
libpacketizer_hevc_plugin.la \
libpacketizer_copy_plugin.la \
libpacketizer_a52_plugin.la \
+ libpacketizer_dts_plugin.la \
$(NULL)
if HAVE_AVCODEC
diff --git a/modules/packetizer/dts.c b/modules/packetizer/dts.c
new file mode 100644
index 000000000000..847e5649137d
--- /dev/null
+++ b/modules/packetizer/dts.c
@@ -0,0 +1,332 @@
+/*****************************************************************************
+ * dts.c: parse DTS audio sync info and packetize the stream
+ *****************************************************************************
+ * Copyright (C) 2001-2016 VLC authors and VideoLAN
+ *
+ * Authors: 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
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_block_helper.h>
+#include <vlc_modules.h>
+
+#include "dts_header.h"
+
+#include "packetizer_helper.h"
+
+static int Open( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+vlc_module_begin ()
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_PACKETIZER )
+ set_description( N_("DTS audio packetizer") )
+ set_capability( "packetizer", 10 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
+
+struct decoder_sys_t
+{
+ /*
+ * Input properties
+ */
+ int i_state;
+
+ block_bytestream_t bytestream;
+
+ /*
+ * Common properties
+ */
+ date_t end_date;
+ bool b_date_set;
+
+ mtime_t i_pts;
+
+ vlc_dts_header_t dts;
+};
+
+static void PacketizeFlush( 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 );
+}
+
+static block_t *GetOutBuffer( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( !p_sys->b_date_set
+ || p_dec->fmt_out.audio.i_rate != p_sys->dts.i_rate )
+ {
+ msg_Dbg( p_dec, "DTS samplerate:%d bitrate:%d",
+ p_sys->dts.i_rate, p_sys->dts.i_bitrate );
+
+ date_Init( &p_sys->end_date, p_sys->dts.i_rate, 1 );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
+ p_sys->b_date_set = true;
+ }
+
+ p_dec->fmt_out.audio.i_rate = p_sys->dts.i_rate;
+ if( p_dec->fmt_out.audio.i_bytes_per_frame < p_sys->dts.i_frame_size )
+ p_dec->fmt_out.audio.i_bytes_per_frame = p_sys->dts.i_frame_size;
+ p_dec->fmt_out.audio.i_frame_length = p_sys->dts.i_frame_length;
+
+ p_dec->fmt_out.audio.i_original_channels = p_sys->dts.i_original_channels;
+ p_dec->fmt_out.audio.i_physical_channels =
+ p_sys->dts.i_original_channels & AOUT_CHAN_PHYSMASK;
+ p_dec->fmt_out.audio.i_channels =
+ popcount( p_dec->fmt_out.audio.i_physical_channels );
+
+ p_dec->fmt_out.i_bitrate = p_sys->dts.i_bitrate;
+
+ block_t *p_block = block_Alloc( p_sys->dts.i_frame_size );
+ if( p_block == NULL )
+ return NULL;
+
+ p_block->i_nb_samples = p_sys->dts.i_frame_length;
+ 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_block->i_nb_samples ) - p_block->i_pts;
+ return p_block;
+}
+
+static block_t *PacketizeBlock( 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];
+ 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 )
+ {
+ PacketizeFlush( 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 );
+ *pp_block = NULL;
+ return NULL;
+ }
+
+ block_BytestreamPush( &p_sys->bytestream, *pp_block );
+
+ while( 1 )
+ {
+ switch( p_sys->i_state )
+ {
+ case STATE_NOSYNC:
+ 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 */
+ if( vlc_dts_header_Parse( &p_sys->dts, p_header,
+ VLC_DTS_HEADER_SIZE ) != VLC_SUCCESS )
+ {
+ 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->dts.i_frame_size, p_header, 6 )
+ != VLC_SUCCESS )
+ {
+ /* Need more data */
+ return NULL;
+ }
+
+ if( p_header[0] == 0 && p_header[1] == 0 )
+ {
+ /* DTS wav files and audio CD's use stuffing */
+ p_sys->i_state = STATE_GET_DATA;
+ break;
+ }
+
+ if( !vlc_dts_header_IsSync( p_header, 6 ) )
+ {
+ msg_Dbg( p_dec, "emulated sync word "
+ "(no sync on following frame)" );
+ 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->dts.i_frame_size ) != VLC_SUCCESS )
+ {
+ /* Need more data */
+ return NULL;
+ }
+ p_sys->i_state = STATE_SEND_DATA;
+
+ case STATE_SEND_DATA:
+ if( p_sys->dts.b_dts_hd )
+ {
+ /* FIXME: DTSHD is ignored for now */
+ block_SkipBytes( &p_sys->bytestream, p_sys->dts.i_frame_size );
+ p_sys->i_state = STATE_NOSYNC;
+ break;
+ }
+
+ if( !(p_out_buffer = GetOutBuffer( p_dec )) )
+ {
+ //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_out_buffer->p_buffer,
+ __MIN( p_sys->dts.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;
+
+ /* So p_block doesn't get re-added several times */
+ *pp_block = block_BytestreamPop( &p_sys->bytestream );
+
+ p_sys->i_state = STATE_NOSYNC;
+
+ return p_out_buffer;
+ }
+ }
+}
+
+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;
+
+ block_BytestreamRelease( &p_sys->bytestream );
+
+ free( p_sys );
+}
+
+static int Open( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
+
+ switch( p_dec->fmt_in.i_codec )
+ {
+ case VLC_CODEC_DTS:
+ break;
+ default:
+ return VLC_EGENERIC;
+ }
+
+ /* Allocate the memory needed to store the decoder's structure */
+ if( ( p_dec->p_sys = p_sys = malloc(sizeof(decoder_sys_t)) ) == NULL )
+ return VLC_ENOMEM;
+
+ /* Misc init */
+ p_sys->i_state = STATE_NOSYNC;
+ date_Set( &p_sys->end_date, 0 );
+ p_sys->i_pts = VLC_TS_INVALID;
+ p_sys->b_date_set = false;
+
+ block_BytestreamInit( &p_sys->bytestream );
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec;
+ p_dec->fmt_out.audio = p_dec->fmt_in.audio;
+
+ p_sys->dts.i_rate = p_dec->fmt_out.audio.i_rate;
+ p_sys->dts.i_frame_size = p_dec->fmt_out.audio.i_bytes_per_frame;
+ p_sys->dts.i_frame_length = p_dec->fmt_out.audio.i_frame_length;
+ p_sys->dts.i_original_channels = p_dec->fmt_out.audio.i_original_channels;
+ p_sys->dts.i_bitrate = p_dec->fmt_out.i_bitrate;
+
+ /* Set callback */
+ p_dec->pf_packetize = PacketizeBlock;
+ p_dec->pf_flush = PacketizeFlush;
+ return VLC_SUCCESS;
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3abcf389ee5d..8d16a43c8fd6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1004,6 +1004,7 @@ modules/packetizer/a52.c
modules/packetizer/avparser.h
modules/packetizer/copy.c
modules/packetizer/dirac.c
+modules/packetizer/dts.c
modules/packetizer/flac.c
modules/packetizer/h264.c
modules/packetizer/hevc.c
--
GitLab