Navigation

Changeset 006c849913eaf70055a988fefc96cc8bd3b09d05

Timestamp:

21/04/07 21:09:23 (2 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1177182563 +0000

git-parent:

[a5ed885fd7c592522266bfb8d86aea31de54042b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1177182563 +0000

Message:

* modules/demux/mpeg/m4v.c: new m4v-fps config option.

Files:

rd3fe7f2	r006c849
36	36	static int Open ( vlc_object_t * );
37	37	static void Close( vlc_object_t * );
	38
	39	#define FPS_TEXT N_("Frames per Second")
	40	#define FPS_LONGTEXT N_("This is the desired frame rate when " \
	41	"playing MPEG4 video elementary streams.")
38	42
39	43	vlc_module_begin();
…	…
45	49	add_shortcut( "m4v" );
46	50	add_shortcut( "mp4v" );
	51	add_float( "m4v-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE );
47	52	vlc_module_end();
48	53
…	…
54	59	mtime_t i_dts;
55	60	es_out_id_t *p_es;
	61	float f_fps;
56	62
57	63	decoder_t *p_packetizer;
…	…
71	77	demux_sys_t *p_sys;
72	78	uint8_t *p_peek;
	79	vlc_value_t val;
73	80
74	81	if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
…	…
100	107	/* We need to wait until we get p_extra (VOL header) from the packetizer
101	108	* before we create the output */
	109
	110	var_Create( p_demux, "m4v-fps", VLC_VAR_FLOAT \| VLC_VAR_DOINHERIT );
	111	var_Get( p_demux, "m4v-fps", &val );
	112	p_sys->f_fps = val.f_float;
102	113
103	114	return VLC_SUCCESS;
…	…
166	177
167	178	/* FIXME FIXME FIXME FIXME */
168		p_sys->i_dts += (mtime_t)1000000 / 25;
	179	p_sys->i_dts += (mtime_t)1000000 / p_sys->f_fps;
169	180	/* FIXME FIXME FIXME FIXME */
170	181	}