Skip to content

V
vlc-2-2
Commit e6a8cb4f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* mpga: fixed. (using es_out_Send with PES)

parent 621e5f40
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
modules/demux/mpeg/mpga.c
View file @ e6a8cb4f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpga.c : MPEG-I/II Audio input module for vlc * mpga.c : MPEG-I/II Audio input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: mpga.c,v 1.9 2003/11/16 22:54:12 gbazin Exp $ * $Id: mpga.c,v 1.10 2003/11/21 16:07:20 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -342,7 +342,7 @@ error: ...@@ -342,7 +342,7 @@ error:
static int Demux( input_thread_t * p_input ) static int Demux( input_thread_t * p_input )
{ {
demux_sys_t *p_sys = p_input->p_demux_data; demux_sys_t *p_sys = p_input->p_demux_data;
pes_packet_t *p_pes; block_t *p_frame;
uint32_t header; uint32_t header;
uint8_t *p_peek; uint8_t *p_peek;
...@@ -389,19 +389,19 @@ static int Demux( input_thread_t * p_input ) ...@@ -389,19 +389,19 @@ static int Demux( input_thread_t * p_input )
p_input->stream.p_selected_program, p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 ); p_sys->i_time * 9 / 100 );
if( ( p_pes = stream_PesPacket( p_input->s, mpga_frame_size( header ) ) ) if( ( p_frame = stream_Block( p_input->s, mpga_frame_size( header ) ) ) == NULL )
== NULL )
{ {
msg_Warn( p_input, "cannot read data" ); msg_Warn( p_input, "cannot read data" );
return 0; return 0;
} }
p_pes->i_dts = p_frame->i_dts =
p_pes->i_pts = input_ClockGetTS( p_input, p_frame->i_pts =
p_input->stream.p_selected_program, input_ClockGetTS( p_input,
p_sys->i_time * 9 / 100 ); p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 );
es_out_Send( p_input->p_es_out, p_sys->p_es, p_pes ); es_out_Send( p_input->p_es_out, p_sys->p_es, p_frame );
p_sys->i_time += (mtime_t)1000000 * p_sys->i_time += (mtime_t)1000000 *
(mtime_t)mpga_frame_samples( header ) / (mtime_t)mpga_frame_samples( header ) /
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment