/*****************************************************************************
* h264.c : H264 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
#include "vlc_codec.h"
/*****************************************************************************
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_description( _("H264 video demuxer" ) );
- set_capability( "demux2", 0 );
- add_float( "h264-fps", 25.0, NULL, "fps", "fps", VLC_TRUE );
- set_callbacks( Open, Close );
- add_shortcut( "h264" );
-vlc_module_end();
+#define FPS_TEXT N_("Frames per Second")
+#define FPS_LONGTEXT N_("Desired frame rate for the H264 stream.")
+
+
+vlc_module_begin ()
+ set_shortname( "H264")
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_description( N_("H264 video demuxer" ) )
+ set_capability( "demux", 0 )
+ add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+ set_callbacks( Open, Close )
+ add_shortcut( "h264" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- vlc_bool_t b_forced = VLC_FALSE;
+ const uint8_t *p_peek;
+ es_format_t fmt;
- uint8_t *p_peek;
- vlc_value_t val;
-
- if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
-
- if( !strncmp( p_demux->psz_demux, "h264", 4 ) )
- {
- b_forced = VLC_TRUE;
- }
+ if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
if( p_peek[0] != 0x00 || p_peek[1] != 0x00 ||
p_peek[2] != 0x00 || p_peek[3] != 0x01 ||
(p_peek[4]&0x1F) != 7 ) /* SPS */
{
- if( !b_forced )
+ if( !p_demux->b_force )
{
msg_Warn( p_demux, "h264 module discarded (no startcode)" );
return VLC_EGENERIC;
}
- msg_Err( p_demux, "this doesn't look like a H264 ES stream, continuing" );
+ msg_Err( p_demux, "this doesn't look like a H264 ES stream, "
+ "continuing anyway" );
}
p_demux->pf_demux = Demux;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->p_es = NULL;
p_sys->i_dts = 1;
- var_Create( p_demux, "h264-fps", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
- var_Get( p_demux, "h264-fps", &val );
- p_sys->f_fps = val.f_float;
- if( val.f_float < 0.001 )
- {
+ p_sys->f_fps = var_CreateGetFloat( p_demux, "h264-fps" );
+ if( p_sys->f_fps < 0.001 )
p_sys->f_fps = 0.001;
- }
msg_Dbg( p_demux, "using %.2f fps", p_sys->f_fps );
- /*
- * 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( 'h', '2', '6', '4' ) );
- 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)
+ /* Load the mpegvideo packetizer */
+ es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_H264 );
+ p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "h264" );
+ if( !p_sys->p_packetizer )
{
- vlc_object_destroy( p_sys->p_packetizer );
- msg_Err( p_demux, "cannot find mp4v packetizer" );
free( p_sys );
return VLC_EGENERIC;
}
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 );
-
+ demux_PacketizerDestroy( p_sys->p_packetizer );
free( p_sys );
}
{
block_t *p_next = p_block_out->p_next;
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
-
- p_block_out->i_dts = p_sys->i_dts;
- p_block_out->i_pts = p_sys->i_dts;
-
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);
}
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
+ p_block_out->i_dts = p_sys->i_dts;
+ p_block_out->i_pts = p_sys->i_dts;
+
es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
p_block_out = p_next;
- /* FIXME FIXME FIXME FIXME */
p_sys->i_dts += (int64_t)((double)1000000.0 / p_sys->f_fps);
- /* FIXME FIXME FIXME FIXME */
}
}
return 1;
if( i_query == DEMUX_SET_TIME )
return VLC_EGENERIC;
else
- return demux2_vaControlHelper( p_demux->s,
+ return demux_vaControlHelper( p_demux->s,
0, -1,
0, 1, i_query, args );
}
projects / vlc / blobdiff