vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Feb 26 20:55:34 2015 +0100| [f468f4c146495e2935895ef84c98a90dc6076776] | committer: Jean-Baptiste Kempf
Add avparser.h to prepare for submodulification (cherry picked from commit 361829e7efe8742cc153eeb552232aa9b5a9596b) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f468f4c146495e2935895ef84c98a90dc6076776 --- modules/codec/avcodec/avcodec.c | 3 +++ modules/packetizer/Modules.am | 2 +- modules/packetizer/avparser.c | 16 +++++------- modules/packetizer/avparser.h | 51 +++++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 2 +- 5 files changed, 62 insertions(+), 12 deletions(-) diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 1807712..07902af 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -76,6 +76,7 @@ static const char *const enc_hq_list_text[] = { #ifdef MERGE_FFMPEG # include "../../demux/avformat/avformat.h" # include "../../access/avio.h" +# include "../../packetizer/avparser.h" #endif /***************************************************************************** @@ -245,6 +246,8 @@ vlc_module_begin () # include "../../demux/avformat/avformat.c" add_submodule () AVIO_MODULE + add_submodule () + AVPARSER_MODULE #endif vlc_module_end () diff --git a/modules/packetizer/Modules.am b/modules/packetizer/Modules.am index e07880b..fe4b949 100644 --- a/modules/packetizer/Modules.am +++ b/modules/packetizer/Modules.am @@ -9,7 +9,7 @@ SOURCES_packetizer_dirac = dirac.c SOURCES_packetizer_flac = flac.c SOURCES_packetizer_hevc = hevc.c -libpacketizer_avparser_plugin_la_SOURCES = avparser.c \ +libpacketizer_avparser_plugin_la_SOURCES = avparser.c avparser.h \ ../codec/avcodec/avcommon.h \ ../codec/avcodec/avcodec.h \ ../codec/avcodec/fourcc.c diff --git a/modules/packetizer/avparser.c b/modules/packetizer/avparser.c index 317b6f3..1c4cf4e 100644 --- a/modules/packetizer/avparser.c +++ b/modules/packetizer/avparser.c @@ -37,19 +37,15 @@ #include "../codec/avcodec/avcodec.h" #include "../codec/avcodec/avcommon.h" +#include "avparser.h" /***************************************************************************** * Module descriptor *****************************************************************************/ -static int OpenPacketizer ( vlc_object_t * ); -static void ClosePacketizer( vlc_object_t * ); - +#ifndef MERGE_FFMPEG vlc_module_begin () - set_category( CAT_SOUT ) - set_subcategory( SUBCAT_SOUT_PACKETIZER ) - set_description( N_("avparser packetizer") ) - set_capability( "packetizer", 1 ) - set_callbacks( OpenPacketizer, ClosePacketizer ) + AVPARSER_MODULE vlc_module_end () +#endif /***************************************************************************** * Local prototypes @@ -69,7 +65,7 @@ static block_t * Packetize( decoder_t *, block_t ** ); * Tries to launch a decoder and return score so that the interface is able * to choose. *****************************************************************************/ -static int OpenPacketizer( vlc_object_t *p_this ) +int OpenPacketizer( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; @@ -125,7 +121,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) /***************************************************************************** * ClosePacketizer: *****************************************************************************/ -static void ClosePacketizer( vlc_object_t *p_this ) +void ClosePacketizer( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; avcodec_free_context( &p_dec->p_sys->p_codec_ctx ); diff --git a/modules/packetizer/avparser.h b/modules/packetizer/avparser.h new file mode 100644 index 0000000..dabbd7a --- /dev/null +++ b/modules/packetizer/avparser.h @@ -0,0 +1,51 @@ +/***************************************************************************** + * avparser.h + ***************************************************************************** + * Copyright (C) 2015 VLC authors and VideoLAN + * $Id$ + * + * Authors: Denis Charmet <[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_codec.h> +#include <vlc_block.h> + +#include "../codec/avcodec/avcodec.h" +#include "../codec/avcodec/avcommon.h" + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +int OpenPacketizer ( vlc_object_t * ); +void ClosePacketizer( vlc_object_t * ); + +#define AVPARSER_MODULE \ + set_category( CAT_SOUT ) \ + set_subcategory( SUBCAT_SOUT_PACKETIZER ) \ + set_description( N_("avparser packetizer") ) \ + set_capability( "packetizer", 1 ) \ + set_callbacks( OpenPacketizer, ClosePacketizer ) diff --git a/po/POTFILES.in b/po/POTFILES.in index 142f928..0a7c635 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -990,7 +990,7 @@ modules/mux/ogg.c modules/mux/wav.c modules/notify/growl.m modules/notify/notify.c -modules/packetizer/avparser.c +modules/packetizer/avparser.h modules/packetizer/copy.c modules/packetizer/dirac.c modules/packetizer/flac.c _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
