[vlc-devel] [PATCH 3/3] demux/dirac: New [raw] Dirac demuxer.
davidf+nntp at woaf.net
davidf+nntp at woaf.net
Thu Apr 2 16:36:32 CEST 2009
From: David Flynn <davidf at rd.bbc.co.uk>
Reads raw dirac streams, feeds into packetizer.
Signed-off-by: David Flynn <davidf at rd.bbc.co.uk>
---
modules/demux/Modules.am | 2 +
modules/demux/dirac.c | 249 ++++++++++++++++++++++++++++++++++++++++++++++
src/input/demux.c | 1 +
3 files changed, 252 insertions(+), 0 deletions(-)
create mode 100644 modules/demux/dirac.c
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 97c6d04..ed91e1f 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -29,10 +29,12 @@ SOURCES_tta = tta.c
SOURCES_vc1 = vc1.c
SOURCES_demux_cdg = cdg.c
SOURCES_smf = smf.c
+SOURCES_dirac = dirac.c
libvlc_LTLIBRARIES += \
libaiff_plugin.la \
libau_plugin.la \
+ libdirac_plugin.la \
libdemux_cdg_plugin.la \
libdemuxdump_plugin.la \
libflacsys_plugin.la \
diff --git a/modules/demux/dirac.c b/modules/demux/dirac.c
new file mode 100644
index 0000000..9162ca8
--- /dev/null
+++ b/modules/demux/dirac.c
@@ -0,0 +1,249 @@
+/*****************************************************************************
+ * dirac.c : Dirac Video demuxer
+ *****************************************************************************
+ * Copyright (C) 2002-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: David Flynn <davidf at rd.bbc.co.uk>
+ * Based on vc1.c by: Laurent Aimar <fenrir at via.ecp.fr>
+ *
+ * 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 <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+#include "vlc_codec.h"
+
+#define DEMUX_CFG_PREFIX "dirac-"
+
+#define DEMUX_DTSOFFSET "dts-offset"
+#define DEMUX_DTSOFFSET_TEXT N_("Value to adjust dts by")
+#define DEMUX_DTSOFFSET_LONGTEXT DEMUX_DTSOFFSET_TEXT
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+vlc_module_begin();
+ set_shortname( "Dirac");
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ set_description( N_("Dirac video demuxer" ) );
+ set_capability( "demux", 200 );
+ add_integer( DEMUX_CFG_PREFIX DEMUX_DTSOFFSET, 0, NULL,
+ DEMUX_DTSOFFSET_TEXT, DEMUX_DTSOFFSET_LONGTEXT, false )
+ set_callbacks( Open, Close );
+vlc_module_end();
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+struct demux_sys_t
+{
+ mtime_t i_dts;
+ mtime_t i_offset;
+ mtime_t i_dtsoffset;
+ mtime_t i_pts_offset_lowtide;
+ es_out_id_t *p_es;
+
+ bool b_first;
+
+ decoder_t *p_packetizer;
+};
+
+enum {
+ VALID_PTS = 0x01000000,
+ VALID_DTS = 0x02000000,
+ NON_DATED = 0x04000000,
+ DIRAC_BLK = 0x80000000,
+};
+
+static int Demux( demux_t * );
+static int Control( demux_t *, int, va_list );
+
+#define DIRAC_PACKET_SIZE 4096
+
+/*****************************************************************************
+ * Open: initializes demux structures
+ *****************************************************************************/
+static int Open( vlc_object_t * p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys;
+ const uint8_t *p_peek;
+ es_format_t fmt;
+
+ if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
+
+ if( p_peek[0] != 'B' || p_peek[1] != 'B' ||
+ p_peek[2] != 'C' || p_peek[3] != 'D') /* start of ParseInfo */
+ {
+ if( !p_demux->b_force )
+ return VLC_EGENERIC;
+
+ msg_Err( p_demux, "This doesn't look like a Dirac stream (incorrect parsecode)" );
+ msg_Warn( p_demux, "continuing anyway" );
+ }
+
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
+
+ p_sys->i_pts_offset_lowtide = INT64_MAX;
+ p_sys->b_first = true;
+
+ p_sys->i_dtsoffset = var_CreateGetInteger( p_demux, DEMUX_CFG_PREFIX DEMUX_DTSOFFSET );
+
+ /* Load the packetizer */
+ es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'd','r','a','c' ) );
+ p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "dirac" );
+ if( !p_sys->p_packetizer )
+ {
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close: frees unused data
+ *****************************************************************************/
+static void Close( vlc_object_t * p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ demux_PacketizerDestroy( p_sys->p_packetizer );
+
+ if( p_sys->i_pts_offset_lowtide < INT64_MAX &&
+ p_sys->i_pts_offset_lowtide > 0 )
+ {
+ msg_Warn( p_demux, "For all packets seen, pts-dts (%"PRId64") could be reduced to 0",
+ p_sys->i_pts_offset_lowtide );
+ }
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************
+ * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ *****************************************************************************/
+static int Demux( demux_t *p_demux)
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ block_t *p_block_in, *p_block_out;
+
+ if( ( p_block_in = stream_Block( p_demux->s, DIRAC_PACKET_SIZE ) ) == NULL )
+ return 0;
+
+ p_block_in->i_flags = DIRAC_BLK;
+ p_block_in->i_dts = p_block_in->i_pts = 0;
+ if( p_sys->b_first ) {
+ p_sys->b_first = false;
+ p_block_in->i_flags |= VALID_DTS;
+
+ block_t *p_null = block_Alloc( 128 );
+ if( p_null )
+ {
+ p_null->i_flags = BLOCK_FLAG_DISCONTINUITY;
+ p_null->p_next = p_block_in;
+ }
+ p_block_in = p_null;
+ }
+
+ while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
+ {
+ while( p_block_out )
+ {
+ block_t *p_next = p_block_out->p_next;
+ p_block_out->p_next = NULL;
+
+ if( p_sys->p_es == NULL )
+ {
+ p_sys->p_packetizer->fmt_out.b_packetized = true;
+ p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
+ }
+
+ p_block_out->i_dts += 1 + p_sys->i_offset + p_sys->i_dtsoffset;
+ p_block_out->i_pts += 1 + p_sys->i_offset;
+ p_sys->i_dts = p_block_out->i_dts;
+
+ /* track low watermark for pts_offset -- can be used to show
+ * when it is too large */
+ mtime_t i_delay = p_block_out->i_pts - p_block_out->i_dts;
+ if( p_sys->i_pts_offset_lowtide > i_delay )
+ p_sys->i_pts_offset_lowtide = i_delay;
+
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
+ es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
+
+ p_block_out = p_next;
+ }
+ }
+ return 1;
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ if( DEMUX_SET_TIME == i_query )
+ {
+ int64_t i64 = (int64_t)va_arg( args, int64_t );
+ p_sys->i_offset = i64;
+ return VLC_SUCCESS;
+ }
+ else if( DEMUX_GET_TIME == i_query )
+ {
+ int64_t *pi64 = (int64_t*)va_arg( args, int64_t * );
+ *pi64 = p_sys->i_dts;
+ return VLC_SUCCESS;
+ }
+ else if( DEMUX_GET_FPS == i_query )
+ {
+ if( !p_sys->p_packetizer->fmt_out.video.i_frame_rate )
+ return VLC_EGENERIC;
+ double *pd = (double*)va_arg( args, double * );
+ *pd = (float) p_sys->p_packetizer->fmt_out.video.i_frame_rate
+ / p_sys->p_packetizer->fmt_out.video.i_frame_rate_base;
+ return VLC_SUCCESS;
+ }
+ else
+ {
+ if( DEMUX_SET_POSITION == i_query )
+ {
+ p_sys->b_first = true;
+ }
+ return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
+ }
+}
+
diff --git a/src/input/demux.c b/src/input/demux.c
index dfbcb62..1c39648 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -98,6 +98,7 @@ demux_t *__demux_New( vlc_object_t *p_obj,
{ "au", "au" },
{ "flac", "flac" },
{ "dv", "dv" },
+ { "drc", "dirac" },
{ "m3u", "playlist" },
{ "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" },
{ "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" },
--
1.5.6.5
More information about the vlc-devel
mailing list