/*****************************************************************************
* m4v.c : MPEG-4 Video demuxer
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
#include "vlc_codec.h"
/*****************************************************************************
static void Close( vlc_object_t * );
vlc_module_begin();
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_description( _("MPEG-4 video demuxer" ) );
set_capability( "demux2", 0 );
set_callbacks( Open, Close );
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- vlc_bool_t b_forced = VLC_FALSE;
-
uint8_t *p_peek;
- es_format_t fmt;
-
- if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
- if( !strncmp( p_demux->psz_demux, "mp4v", 4 ) ||
- !strncmp( p_demux->psz_demux, "m4v", 4 ) )
+ if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 )
{
- b_forced = VLC_TRUE;
- }
-
- if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 || p_peek[3] > 0x2f )
- {
- if( !b_forced )
+ if( !p_demux->b_force )
{
msg_Warn( p_demux, "m4v module discarded (no startcode)" );
return VLC_EGENERIC;
}
- msg_Err( p_demux, "this doesn't look like an MPEG-4 ES stream, continuing" );
+ msg_Warn( p_demux, "this doesn't look like an MPEG-4 ES stream, "
+ "continuing anyway" );
}
p_demux->pf_demux = Demux;
p_sys->p_es = NULL;
p_sys->i_dts = 1;
- /*
- * Load the mpegvideo packetizer
- */
- p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER );
- p_sys->p_packetizer->pf_decode_audio = NULL;
- p_sys->p_packetizer->pf_decode_video = NULL;
- p_sys->p_packetizer->pf_decode_sub = NULL;
- p_sys->p_packetizer->pf_packetize = NULL;
- es_format_Init( &p_sys->p_packetizer->fmt_in, VIDEO_ES,
- VLC_FOURCC( 'm', 'p', '4', 'v' ) );
+ /* Load the mpeg4video packetizer */
+ INIT_VPACKETIZER( p_sys->p_packetizer, 'm', 'p', '4', 'v' );
es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
- p_sys->p_packetizer->p_module =
- module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
- if( p_sys->p_packetizer->p_module == NULL)
- {
- vlc_object_destroy( p_sys->p_packetizer );
- msg_Err( p_demux, "cannot find mp4v packetizer" );
- free( p_sys );
- return VLC_EGENERIC;
- }
+ LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mpeg4 video" );
- /*
- * create the output
- */
- es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
- p_sys->p_es = es_out_Add( p_demux->out, &fmt );
+ /* We need to wait until we get p_extra (VOL header) from the packetizer
+ * before we create the output */
return VLC_SUCCESS;
}
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
- vlc_object_destroy( p_sys->p_packetizer );
+ DESTROY_PACKETIZER( p_sys->p_packetizer) ;
free( p_sys );
}