vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Dec 16 11:43:19 2017 +0200| [eb8ab8df4b1483e1cc299d96b5c43b738ee03d25] | committer: Rémi Denis-Courmont
diracsys: remove raw Dirac demuxer > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb8ab8df4b1483e1cc299d96b5c43b738ee03d25 --- modules/MODULES_LIST | 1 - modules/demux/Makefile.am | 4 - modules/demux/dirac.c | 247 --------------------------------------------- po/POTFILES.in | 1 - test/Makefile.am | 1 - test/src/input/demux-run.c | 1 - 6 files changed, 255 deletions(-) diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST index d3c8980ee3..d4039b4d6a 100644 --- a/modules/MODULES_LIST +++ b/modules/MODULES_LIST @@ -107,7 +107,6 @@ $Id$ * demux_chromecast: Internal demux filter to report the playback time on the Chromecast * demux_stl: EBU STL subtitles demuxer * demuxdump: Pseudo-demuxer that dumps the stream - * diracsys: BBC Dirac demuxer * direct3d11: video output module using the Direct3D11 API * direct3d11_filters: adjust|deinterlacer filter for Direct3D11 video decoding * direct3d9: video output module using the Direct3D9 API diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index 773a582af2..e6006ae0a4 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -117,10 +117,6 @@ libsid_plugin_la_LIBADD = $(LIBS_sid) EXTRA_LTLIBRARIES += libsid_plugin.la demux_LTLIBRARIES += $(LTLIBsid) -libdiracsys_plugin_la_SOURCES = demux/dirac.c -libdiracsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -demux_LTLIBRARIES += libdiracsys_plugin.la - libimage_plugin_la_SOURCES = demux/image.c demux/mxpeg_helper.h demux_LTLIBRARIES += libimage_plugin.la diff --git a/modules/demux/dirac.c b/modules/demux/dirac.c deleted file mode 100644 index e8e7b67b60..0000000000 --- a/modules/demux/dirac.c +++ /dev/null @@ -1,247 +0,0 @@ -/***************************************************************************** - * dirac.c : Dirac Video demuxer - ***************************************************************************** - * Copyright (C) 2002-2008 VLC authors and VideoLAN - * $Id$ - * - * Authors: David Flynn <[email protected]> - * Based on vc1.c by: Laurent Aimar <[email protected]> - * - * 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_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", 50 ); - add_integer( DEMUX_CFG_PREFIX DEMUX_DTSOFFSET, 0, - DEMUX_DTSOFFSET_TEXT, DEMUX_DTSOFFSET_LONGTEXT, false ) - set_callbacks( Open, Close ); - add_shortcut( "dirac" ) -vlc_module_end(); - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -struct demux_sys_t -{ - mtime_t i_dts; - mtime_t i_dtsoffset; - mtime_t i_pts_offset_lowtide; - es_out_id_t *p_es; - - enum { - /* demuxer states, do not reorder (++ is used) */ - DIRAC_DEMUX_DISCONT = 0, /* signal a discontinuity to packetizer */ - DIRAC_DEMUX_FIRST, /* provide an origin timestamp for the packetizer */ - DIRAC_DEMUX_STEADY, /* normal operation */ - } i_state; - - decoder_t *p_packetizer; -}; - -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( vlc_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->obj.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->i_state = DIRAC_DEMUX_FIRST; - - p_sys->i_dtsoffset = var_CreateGetInteger( p_demux, DEMUX_CFG_PREFIX DEMUX_DTSOFFSET ); - - /* Load the packetizer */ - es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_DIRAC ); - 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; - - bool b_eof = false; - - p_block_in = vlc_stream_Block( p_demux->s, DIRAC_PACKET_SIZE ); - if( !p_block_in ) - { - b_eof = true; - } - else - { - if( p_sys->i_state == DIRAC_DEMUX_DISCONT ) - { - p_sys->i_state++; - p_block_in->i_flags = BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED; - } - - if ( p_sys->i_state == DIRAC_DEMUX_FIRST ) - { - p_sys->i_state++; - /* by default, timestamps are invalid. - * Except when we need an anchor point */ - p_block_in->i_dts = VLC_TS_0; - } - } - - while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, - (p_block_in) ? &p_block_in : NULL )) ) - { - 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_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out); - - p_block_out->i_dts += p_sys->i_dtsoffset; - 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_SetPCR( p_demux->out, p_block_out->i_dts ); - es_out_Send( p_demux->out, p_sys->p_es, p_block_out ); - - p_block_out = p_next; - } - } - - return b_eof ? VLC_DEMUXER_EOF : VLC_DEMUXER_SUCCESS; -} - -/***************************************************************************** - * 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_GET_TIME == i_query ) - { - int64_t *pi64 = 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 = 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 || DEMUX_SET_TIME == i_query ) - { - p_sys->i_state = DIRAC_DEMUX_DISCONT; - } - return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args ); - } -} - diff --git a/po/POTFILES.in b/po/POTFILES.in index 1610fb6192..ee1e658d02 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -394,7 +394,6 @@ modules/demux/avi/libavi.h modules/demux/caf.c modules/demux/cdg.c modules/demux/demuxdump.c -modules/demux/dirac.c modules/demux/directory.c modules/demux/filter/noseek.c modules/demux/flac.c diff --git a/test/Makefile.am b/test/Makefile.am index f29d694960..e0d461e5be 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -157,7 +157,6 @@ libvlc_demux_run_la_LIBADD += \ ../modules/libau_plugin.la \ ../modules/libavi_plugin.la \ ../modules/libcaf_plugin.la \ - ../modules/libdiracsys_plugin.la \ ../modules/libes_plugin.la \ ../modules/libflacsys_plugin.la \ ../modules/libh26x_plugin.la \ diff --git a/test/src/input/demux-run.c b/test/src/input/demux-run.c index c83c35aac9..557c4984d8 100644 --- a/test/src/input/demux-run.c +++ b/test/src/input/demux-run.c @@ -400,7 +400,6 @@ extern vlc_plugin_cb vlc_static_modules[]; f(au) \ f(avi) \ f(caf) \ - f(diracsys) \ f(es) \ f(flacsys) \ f(h26x) \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
