* Module descriptor
*****************************************************************************/
static int OpenAudio( vlc_object_t * );
+static int OpenVideo( vlc_object_t * );
static void Close ( vlc_object_t * );
+#define FPS_TEXT N_("Frames per Second")
+#define FPS_LONGTEXT N_("This is the frame rate used as a fallback when " \
+ "playing MPEG video elementary streams.")
+
vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
add_shortcut( "mlp" )
add_shortcut( "thd" )
+
+ add_submodule()
+ set_description( N_("MPEG-4 video" ) )
+ set_capability( "demux", 0 )
+ set_callbacks( OpenVideo, Close )
+ add_float( "es-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, false )
+
+ add_shortcut( "m4v" )
+ add_shortcut( "mp4v" )
vlc_module_end ()
/*****************************************************************************
int64_t i_stream_offset;
+ float f_fps;
+
/* Mpga specific */
struct
{
{ 0, false, NULL, NULL, NULL }
};
+static int VideoInit( demux_t *p_demux );
+
+static const codec_t codec_m4v = {
+ VLC_CODEC_MP4V, false, "mp4 video", NULL, VideoInit
+};
+
/*****************************************************************************
* OpenCommon: initializes demux structures
*****************************************************************************/
p_sys->b_estimate_bitrate = true;
p_sys->i_bitrate_avg = 0;
p_sys->b_big_endian = false;
+ p_sys->f_fps = var_InheritFloat( p_demux, "es-fps" );
if( stream_Seek( p_demux->s, p_sys->i_stream_offset ) )
{
}
return VLC_EGENERIC;
}
+static int OpenVideo( vlc_object_t *p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+
+ /* Only m4v is supported for the moment */
+ bool b_m4v_ext = demux_IsPathExtension( p_demux, ".m4v" );
+ bool b_m4v_forced = demux_IsForced( p_demux, "m4v" ) ||
+ demux_IsForced( p_demux, "mp4v" );
+ if( !b_m4v_ext && !b_m4v_forced )
+ return VLC_EGENERIC;
+ const uint8_t *p_peek;
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
+ return VLC_EGENERIC;
+ if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 )
+ {
+ if( !b_m4v_forced)
+ return VLC_EGENERIC;
+ msg_Warn( p_demux,
+ "this doesn't look like an MPEG ES stream, continuing anyway" );
+ }
+ return OpenCommon( p_demux, VIDEO_ES, &codec_m4v, 0 );
+}
/*****************************************************************************
* Demux: reads and demuxes data packets
*****************************************************************************
if( p_sys->b_estimate_bitrate )
p_sys->i_bitrate_avg = p_sys->p_packetizer->fmt_out.i_bitrate;
}
-
- p_sys->i_pts = p_block_out->i_pts - VLC_TS_0;
+ if( p_sys->p_packetizer->fmt_out.i_cat == VIDEO_ES )
+ {
+ if( p_block_out->i_pts <= VLC_TS_INVALID &&
+ p_block_out->i_dts <= VLC_TS_INVALID )
+ p_block_out->i_dts = VLC_TS_0 + p_sys->i_pts + 1000000 / p_sys->f_fps;
+ if( p_block_out->i_dts > VLC_TS_INVALID )
+ p_sys->i_pts = p_block_out->i_dts - VLC_TS_0;
+ }
+ else
+ {
+ p_sys->i_pts = p_block_out->i_pts - VLC_TS_0;
+ }
/* Re-estimate bitrate */
if( p_sys->b_estimate_bitrate && p_sys->i_pts > INT64_C(500000) )
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * Video
+ *****************************************************************************/
+static int VideoInit( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ p_sys->i_packet_size = 4096;
+
+ return VLC_SUCCESS;
+}
+++ /dev/null
-/*****************************************************************************
- * m4v.c : MPEG-4 Video demuxer
- *****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
- * $Id$
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * 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., 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>
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
-
-#define FPS_TEXT N_("Frames per Second")
-#define FPS_LONGTEXT N_("This is the desired frame rate when " \
- "playing MPEG4 video elementary streams.")
-
-vlc_module_begin ()
- set_category( CAT_INPUT )
- set_subcategory( SUBCAT_INPUT_DEMUX )
- set_description( N_("MPEG-4 video demuxer" ) )
- set_shortname( N_("MPEG-4 V") )
- set_capability( "demux", 0 )
- set_callbacks( Open, Close )
- add_shortcut( "m4v" )
- add_shortcut( "mp4v" )
- add_float( "m4v-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, false )
-vlc_module_end ()
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-struct demux_sys_t
-{
- mtime_t i_dts;
- es_out_id_t *p_es;
- float f_fps;
-
- decoder_t *p_packetizer;
-};
-
-static int Demux( demux_t * );
-static int Control( demux_t *, int, va_list );
-
-#define M4V_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( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
-
- if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 )
- {
- if( !p_demux->b_force )
- {
- msg_Warn( p_demux, "m4v module discarded (no startcode)" );
- return VLC_EGENERIC;
- }
-
- msg_Warn( p_demux, "this doesn't look like an MPEG-4 ES stream, "
- "continuing anyway" );
- }
-
- p_demux->pf_demux = Demux;
- p_demux->pf_control= Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->p_es = NULL;
- p_sys->i_dts = 0;
-
- /* Load the mpeg4video packetizer */
- es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
- p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "mpeg4 video" );
- if( !p_sys->p_packetizer )
- {
- free( p_sys );
- return VLC_EGENERIC;
- }
-
- /* We need to wait until we get p_extra (VOL header) from the packetizer
- * before we create the output */
- p_sys->f_fps = var_CreateGetFloat( p_demux, "m4v-fps" );
-
- 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 );
- 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;
-
- if( ( p_block_in = stream_Block( p_demux->s, M4V_PACKET_SIZE ) ) == NULL )
- {
- return 0;
- }
-
- /* m4v demuxer doesn't set pts/dts at all */
- p_block_in->i_dts = VLC_TS_0 + p_sys->i_dts;
- p_block_in->i_pts = VLC_TS_INVALID;
-
- while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
- {
- while( p_block_out )
- {
- block_t *p_next = p_block_out->p_next;
-
- 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, VLC_TS_0 + p_sys->i_dts );
-
- p_block_out->p_next = NULL;
- if( p_block_out->i_pts == p_block_out->i_dts )
- {
- p_block_out->i_pts = VLC_TS_0 + p_sys->i_dts;
- }
- else
- {
- p_block_out->i_pts = VLC_TS_INVALID;
- }
- p_block_out->i_dts = VLC_TS_0 + 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 += (mtime_t)1000000 / p_sys->f_fps;
- /* FIXME FIXME FIXME FIXME */
- }
- }
- return 1;
-}
-
-/*****************************************************************************
- * Control:
- *****************************************************************************/
-static int Control( demux_t *p_demux, int i_query, va_list args )
-{
- /* demux_sys_t *p_sys = p_demux->p_sys; */
- /* FIXME calculate the bitrate */
- if( i_query == DEMUX_SET_TIME )
- return VLC_EGENERIC;
- else
- return demux_vaControlHelper( p_demux->s,
- 0, -1,
- 0, 1, i_query, args );
-}
-
projects / vlc / commitdiff