*****************************************************************************
* Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research
* Organisation (CSIRO) Australia
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
*
* $Id$
*
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/intf.h>
-
-#include <osd.h>
-
-#include "charset.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_codec.h>
+#include <vlc_osd.h>
+#include <vlc_charset.h>
+#include <vlc_interface.h>
#include "xtag.h"
#undef CMML_DEBUG
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-int E_(OpenIntf) ( vlc_object_t * );
-void E_(CloseIntf) ( vlc_object_t * );
+int OpenIntf ( vlc_object_t * );
+void CloseIntf ( vlc_object_t * );
/*****************************************************************************
* Module descriptor.
*****************************************************************************/
-vlc_module_begin();
- set_description( _("CMML annotations decoder") );
- set_capability( "decoder", 50 );
- set_callbacks( OpenDecoder, CloseDecoder );
- add_shortcut( "cmml" );
-
- add_submodule();
- set_capability( "interface", 0 );
- set_callbacks( E_(OpenIntf), E_(CloseIntf) );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("CMML annotations decoder") )
+ set_capability( "decoder", 50 )
+ set_callbacks( OpenDecoder, CloseDecoder )
+ add_shortcut( "cmml" )
+
+ add_submodule ()
+ set_capability( "interface", 0 )
+ set_callbacks( OpenIntf, CloseIntf )
+ add_shortcut( "cmml" )
+vlc_module_end ()
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
decoder_t *p_dec = (decoder_t*)p_this;
input_thread_t * p_input;
decoder_sys_t *p_sys;
- vlc_value_t val;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('c','m','m','l') )
- {
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_CMML )
return VLC_EGENERIC;
- }
p_dec->pf_decode_sub = DecodeBlock;
-#ifdef CMML_DEBUG
- msg_Dbg( p_dec, "I am at %p", p_dec );
-#endif
-
/* Allocate the memory needed to store the decoder's structure */
- if( ( p_dec->p_sys = p_sys =
- (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
- {
- msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
- }
+ if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL )
+ return VLC_ENOMEM;
/* Let other interested modules know that we're a CMML decoder
* We have to set this variable on the input thread, because there's
* decoder succesfully with vlc_object_find. (Any hints on how to achieve
* this would be rather appreciated ;) */
p_input = vlc_object_find( p_dec, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( p_input )
+ {
+ vlc_value_t val;
+
#ifdef CMML_DEBUG
- msg_Dbg( p_dec, "p_input is at %p", p_input );
+ msg_Dbg( p_dec, "p_input is at %p", p_input );
#endif
- val.p_address = p_dec;
- var_Create( p_input, "has-cmml-decoder",
- VLC_VAR_ADDRESS|VLC_VAR_DOINHERIT );
- if( var_Set( p_input, "has-cmml-decoder", val ) != VLC_SUCCESS )
- {
- msg_Dbg( p_dec, "var_Set of has-cmml-decoder failed" );
+ val.p_address = p_dec;
+ var_Create( p_input, "has-cmml-decoder",
+ VLC_VAR_ADDRESS|VLC_VAR_DOINHERIT );
+
+ if( var_Set( p_input, "has-cmml-decoder", val ) != VLC_SUCCESS )
+ msg_Dbg( p_dec, "var_Set of has-cmml-decoder failed" );
+ vlc_object_release( p_input );
}
- vlc_object_release( p_input );
/* initialise the CMML responder interface */
p_sys->p_intf = intf_Create( p_dec, "cmml" );
- p_sys->p_intf->b_block = VLC_FALSE;
- intf_RunThread( p_sys->p_intf );
+ if( p_sys->p_intf )
+ intf_RunThread( p_sys->p_intf );
+
+ p_dec->fmt_out.i_cat = SPU_ES;
+ p_dec->fmt_out.i_codec = 0;
return VLC_SUCCESS;
}
* displaying is done in the DisplayAnchor function in intf.c (called from
* DisplayPendingAnchor, which in turn is called from the main RunIntf
* loop). */
- p_spu = p_dec->pf_spu_buffer_new( p_dec );
+ p_spu = decoder_NewSubpicture( p_dec );
if( !p_spu )
{
msg_Dbg( p_dec, "couldn't allocate new subpicture" );
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- intf_thread_t *p_intf;
/* Destroy the interface object/thread */
- p_intf = vlc_object_find( p_dec, VLC_OBJECT_INTF, FIND_CHILD );
- if( p_intf != NULL )
+ if( p_sys->p_intf != NULL )
{
-#ifdef CMML_DEBUG
- msg_Dbg( p_dec, "CMML decoder is freeing interface thread" );
-#endif
+ intf_thread_t *p_intf = p_sys->p_intf;
intf_StopThread( p_intf );
vlc_object_detach( p_intf );
vlc_object_release( p_intf );
- intf_Destroy( p_intf );
}
- p_sys->p_intf = NULL;
-
free( p_sys );
}
/* Copy the whole CMML tag into our own buffer:
allocate i_buffer bytes + 1 for the terminating \0 */
- if ( (psz_cmml = malloc( p_block->i_buffer + 1 )) == NULL )
+ if( (psz_cmml = malloc( p_block->i_buffer + 1 )) == NULL )
return;
- psz_cmml = memcpy( psz_cmml, p_block->p_buffer, p_block->i_buffer );
+ memcpy( psz_cmml, p_block->p_buffer, p_block->i_buffer );
psz_cmml[p_block->i_buffer] = '\0'; /* terminate the string */
#ifdef CMML_DEBUG
msg_Dbg( p_dec, "psz_cmml is \"%s\"", psz_cmml );
#endif
-
+
/* Parse the <clip> part of the CMML */
p_clip_parser = xtag_new_parse( psz_cmml, p_block->i_buffer );
if( !p_clip_parser )
if( psz_url )
{
char *psz_tmp = strdup( psz_url );
-
+
val.p_address = psz_tmp;
if( var_Set( p_dec, "psz-current-anchor-url", val ) != VLC_SUCCESS )
{
- (void) var_Create( p_dec, "psz-current-anchor-url",
- VLC_VAR_ADDRESS|VLC_VAR_DOINHERIT );
+ var_Create( p_dec, "psz-current-anchor-url",
+ VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT );
msg_Dbg( p_dec, "creating psz-current-anchor-url" );
if( var_Set( p_dec, "psz-current-anchor-url", val ) != VLC_SUCCESS )
msg_Dbg( p_dec, "var_Set of psz-current-anchor-url failed" );
val.p_address = psz_tmp;
if( var_Set( p_dec, "psz-current-anchor-description", val ) != VLC_SUCCESS )
{
- (void) var_Create( p_dec, "psz-current-anchor-description",
- VLC_VAR_ADDRESS|VLC_VAR_DOINHERIT );
+ var_Create( p_dec, "psz-current-anchor-description",
+ VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT );
msg_Dbg( p_dec, "creating psz-current-anchor-description" );
if( var_Set( p_dec, "psz-current-anchor-description", val ) != VLC_SUCCESS )
msg_Dbg( p_dec, "var_Set of psz-current-anchor-description failed" );
}
- if( psz_subtitle ) free( psz_subtitle );
- if( psz_cmml ) free( psz_cmml );
- if( p_anchor ) free( p_anchor );
- if( p_clip_parser ) free( p_clip_parser );
- if( psz_url ) free( psz_url );
+ free( psz_subtitle );
+ free( psz_cmml );
+ free( p_anchor );
+ free( p_clip_parser );
+ free( psz_url );
}
projects / vlc / blobdiff