X-Git-Url: https://git.sesse.net/?p=vlc;a=blobdiff_plain;f=modules%2Faccess%2Fsdi.cpp;h=9d42eae79aec9faac93f216cb0ac5ab270d55ac2;hp=c48c5b825d58a7a47d4e334bae80606acc172c41;hb=354bf997e0392b175aa791bb74245d9a6e007ab4;hpb=9cefd57da162f2f3f5ddc24d4fc9fcf176580765 diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp index c48c5b825d..9d42eae79a 100644 --- a/modules/access/sdi.cpp +++ b/modules/access/sdi.cpp @@ -17,25 +17,79 @@ #include #include -#include "DeckLinkAPI.h" -#include "DeckLinkAPIDispatch.cpp" +#include + +#include +#include static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); +#define CARD_INDEX_TEXT N_("Input card to use") +#define CARD_INDEX_LONGTEXT N_( \ + "SDI capture card to use, if multiple exist. " \ + "The cards are numbered from 0." ) + +#define MODE_TEXT N_("Desired input video mode") +#define MODE_LONGTEXT N_( \ + "Desired input video mode for SDI captures. " \ + "This value should be a FOURCC code in textual " \ + "form, e.g. \"ntsc\"." ) + #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ "Caching value for SDI captures. This " \ "value should be set in milliseconds." ) +#define AUDIO_CONNECTION_TEXT N_("Audio connection") +#define AUDIO_CONNECTION_LONGTEXT N_( \ + "Audio connection to use for SDI captures. " \ + "Valid choices: embedded, aesebu, analog. " \ + "Leave blank for card default." ) + +#define RATE_TEXT N_("Audio sampling rate in Hz") +#define RATE_LONGTEXT N_( \ + "Audio sampling rate (in hertz) for SDI captures. " \ + "0 disables audio input." ) + +#define CHANNELS_TEXT N_("Number of audio channels") +#define CHANNELS_LONGTEXT N_( \ + "Number of input audio channels for SDI captures. " \ + "Must be 2, 8 or 16. 0 disables audio input." ) + +#define VIDEO_CONNECTION_TEXT N_("Video connection") +#define VIDEO_CONNECTION_LONGTEXT N_( \ + "Video connection to use for SDI captures. " \ + "Valid choices: sdi, hdmi, opticalsdi, component, " \ + "composite, svideo. " \ + "Leave blank for card default." ) + +#define ASPECT_RATIO_TEXT N_("Aspect ratio") +#define ASPECT_RATIO_LONGTEXT N_( \ + "Aspect ratio (4:3, 16:9). Default assumes square pixels." ) + vlc_module_begin () set_shortname( N_("SDI") ) set_description( N_("BlackMagic SDI input") ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) - + + add_integer( "sdi-card-index", 0, NULL, + CARD_INDEX_TEXT, CARD_INDEX_LONGTEXT, true ) + add_string( "sdi-mode", "pal ", NULL, + MODE_TEXT, MODE_LONGTEXT, true ) add_integer( "sdi-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) + add_string( "sdi-audio-connection", 0, NULL, + AUDIO_CONNECTION_TEXT, AUDIO_CONNECTION_LONGTEXT, true ) + add_integer( "sdi-audio-rate", 48000, NULL, + RATE_TEXT, RATE_LONGTEXT, true ) + add_integer( "sdi-audio-channels", 2, NULL, + CHANNELS_TEXT, CHANNELS_LONGTEXT, true ) + add_string( "sdi-video-connection", 0, NULL, + VIDEO_CONNECTION_TEXT, VIDEO_CONNECTION_LONGTEXT, true ) + add_string( "sdi-aspect-ratio", NULL, NULL, + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ) add_shortcut( "sdi" ) set_capability( "access_demux", 10 ) @@ -52,27 +106,52 @@ struct demux_sys_t IDeckLink *p_card; IDeckLinkInput *p_input; DeckLinkCaptureDelegate *p_delegate; - es_out_id_t *p_es; + + es_out_id_t *p_video_es; + es_out_id_t *p_audio_es; + bool b_first_frame; + int i_last_pts; + + int i_width, i_height, i_fps_num, i_fps_den; + uint32_t i_dominance_flags; + + int i_rate, i_channels; vlc_mutex_t frame_lock; - block_t *p_frame; // protected by - vlc_cond_t has_frame; // related to + block_t *p_video_frame; /* protected by */ + block_t *p_audio_frame; /* protected by */ + vlc_cond_t has_frame; /* related to */ }; class DeckLinkCaptureDelegate : public IDeckLinkInputCallback { public: - DeckLinkCaptureDelegate( demux_t *p_demux ) : p_demux_(p_demux) {} + DeckLinkCaptureDelegate( demux_t *p_demux ) : m_ref_(1), p_demux_(p_demux) {} - // FIXME: These leak. virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } - virtual ULONG STDMETHODCALLTYPE AddRef(void) { return 1; } - virtual ULONG STDMETHODCALLTYPE Release(void) { return 1; } + + /* Note: AddRef() and Release() here are not thread safe. */ + + virtual ULONG STDMETHODCALLTYPE AddRef(void) + { + return ++m_ref_; + } + + virtual ULONG STDMETHODCALLTYPE Release(void) + { + if ( --m_ref_ == 0 ) + { + delete this; + return 0; + } + return m_ref_; + } virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags); virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*); private: + int m_ref_; demux_t *p_demux_; }; @@ -85,35 +164,84 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFormatChanged(BMDVideoInputFormatChan HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame* videoFrame, IDeckLinkAudioInputPacket* audioFrame) { demux_sys_t *p_sys = p_demux_->p_sys; + block_t *p_video_frame = NULL; + block_t *p_audio_frame = NULL; - if(videoFrame) + if( videoFrame ) { - if(videoFrame->GetFlags() & bmdFrameHasNoInputSource) + if( videoFrame->GetFlags() & bmdFrameHasNoInputSource ) { msg_Warn( p_demux_, "No input signal detected" ); return S_OK; } - msg_Dbg( p_demux_, "Received a frame" ); + const int i_width = videoFrame->GetWidth(); + const int i_height = videoFrame->GetHeight(); + const int i_stride = videoFrame->GetRowBytes(); + const int i_bpp = 2; - block_t *p_frame; - p_frame = block_New( p_demux_, 720 * 576 * 3 ); - if( !p_frame ) + p_video_frame = block_New( p_demux_, i_width * i_height * i_bpp ); + if( !p_video_frame ) { - msg_Err( p_demux_, "Could not allocate memory for frame" ); + msg_Err( p_demux_, "Could not allocate memory for video frame" ); return S_OK; } void *frame_bytes; videoFrame->GetBytes( &frame_bytes ); - memcpy( p_frame->p_buffer, frame_bytes, 720 * 576 * 3 ); + for( int y = 0; y < i_height; ++y ) + { + const uint8_t *src = (const uint8_t *)frame_bytes + i_stride * y; + uint8_t *dst = (uint8_t *)p_video_frame->p_buffer + i_width * i_bpp * y; + memcpy( dst, src, i_width * i_bpp ); + } BMDTimeValue stream_time, frame_duration; - videoFrame->GetStreamTime( &stream_time, &frame_duration, 1000000 ); - p_frame->i_pts = stream_time; + videoFrame->GetStreamTime( &stream_time, &frame_duration, CLOCK_FREQ ); + p_video_frame->i_flags = BLOCK_FLAG_TYPE_I | p_sys->i_dominance_flags; + if( p_sys->b_first_frame ) + { + p_video_frame->i_flags |= BLOCK_FLAG_DISCONTINUITY; + p_sys->b_first_frame = false; + } + p_video_frame->i_pts = p_video_frame->i_dts = VLC_TS_0 + stream_time; + } + + if( audioFrame ) + { + const int i_bytes = audioFrame->GetSampleFrameCount() * sizeof(int16_t) * p_sys->i_channels; + + p_audio_frame = block_New( p_demux_, i_bytes ); + if( !p_audio_frame ) + { + msg_Err( p_demux_, "Could not allocate memory for audio frame" ); + return S_OK; + } + + void *frame_bytes; + audioFrame->GetBytes( &frame_bytes ); + memcpy( p_audio_frame->p_buffer, frame_bytes, i_bytes ); + + BMDTimeValue packet_time; + audioFrame->GetPacketTime( &packet_time, CLOCK_FREQ ); + p_audio_frame->i_pts = p_audio_frame->i_dts = VLC_TS_0 + packet_time; + } + if( p_video_frame || p_audio_frame ) + { vlc_mutex_lock( &p_sys->frame_lock ); - p_sys->p_frame = p_frame; // FIXME: leak + if( p_video_frame ) + { + if( p_sys->p_video_frame ) + block_Release( p_sys->p_video_frame ); + p_sys->p_video_frame = p_video_frame; + } + if( p_audio_frame ) + { + if( p_sys->p_audio_frame ) + block_Release( p_sys->p_audio_frame ); + p_sys->p_audio_frame = p_audio_frame; + } vlc_cond_signal( &p_sys->has_frame ); vlc_mutex_unlock( &p_sys->frame_lock ); } @@ -142,60 +270,332 @@ static int Open( vlc_object_t *p_this ) vlc_mutex_init( &p_sys->frame_lock ); vlc_cond_init( &p_sys->has_frame ); - p_sys->p_frame = NULL; + p_sys->b_first_frame = true; IDeckLinkIterator *decklink_iterator = CreateDeckLinkIteratorInstance(); if( !decklink_iterator ) { msg_Err( p_demux, "DeckLink drivers not found." ); - // FIXME: Leak here and several other error paths. + decklink_iterator->Release(); + Close( p_this ); return VLC_EGENERIC; } HRESULT result; - result = decklink_iterator->Next( &p_sys->p_card ); + + int i_card_index = var_CreateGetInteger( p_demux, "sdi-card-index" ); + for( int i = 0; i <= i_card_index; ++i ) + { + if( p_sys->p_card ) + p_sys->p_card->Release(); + result = decklink_iterator->Next( &p_sys->p_card ); + if( result != S_OK ) + break; + } + + decklink_iterator->Release(); if( result != S_OK ) { - msg_Err( p_demux, "No DeckLink PCI cards found" ); + msg_Err( p_demux, "DeckLink PCI card %d not found", i_card_index ); + Close( p_this ); return VLC_EGENERIC; } - if( p_sys->p_card->QueryInterface(IID_IDeckLinkInput, (void**)&p_sys->p_input) != S_OK ) + const char *psz_model_name; + result = p_sys->p_card->GetModelName( &psz_model_name ); + + if( result != S_OK ) + { + msg_Err( p_demux, "Could not get model name" ); + Close( p_this ); + return VLC_EGENERIC; + } + + msg_Dbg( p_demux, "Opened DeckLink PCI card %d (%s)", i_card_index, psz_model_name ); + + if( p_sys->p_card->QueryInterface( IID_IDeckLinkInput, (void**)&p_sys->p_input) != S_OK ) { msg_Err( p_demux, "Card has no inputs" ); + Close( p_this ); return VLC_EGENERIC; } + + /* Set up the video and audio sources. */ + IDeckLinkConfiguration *p_config; + if( p_sys->p_card->QueryInterface( IID_IDeckLinkConfiguration, (void**)&p_config) != S_OK ) + { + msg_Err( p_demux, "Failed to get configuration interface" ); + Close( p_this ); + return VLC_EGENERIC; + } + + char *psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-video-connection" ); + if( psz_tmp ) + { + BMDVideoConnection conn; + if ( !strcmp( psz_tmp, "sdi" ) ) + conn = bmdVideoConnectionSDI; + else if ( !strcmp( psz_tmp, "hdmi" ) ) + conn = bmdVideoConnectionHDMI; + else if ( !strcmp( psz_tmp, "opticalsdi" ) ) + conn = bmdVideoConnectionOpticalSDI; + else if ( !strcmp( psz_tmp, "component" ) ) + conn = bmdVideoConnectionComponent; + else if ( !strcmp( psz_tmp, "composite" ) ) + conn = bmdVideoConnectionComposite; + else if ( !strcmp( psz_tmp, "svideo" ) ) + conn = bmdVideoConnectionSVideo; + else + { + msg_Err( p_demux, "Invalid --sdi-video-connection specified; choose one of " \ + "sdi, hdmi, opticalsdi, component, composite, or svideo." ); + p_config->Release(); + free( psz_tmp ); + Close( p_this ); + return VLC_EGENERIC; + } + free( psz_tmp ); - p_sys->p_delegate = new DeckLinkCaptureDelegate( p_demux ); - p_sys->p_input->SetCallback( p_sys->p_delegate ); + msg_Dbg( p_demux, "Setting video input format to 0x%x", conn); + result = p_config->SetVideoInputFormat( conn ); + if( result != S_OK ) + { + msg_Err( p_demux, "Failed to set video input connection" ); + p_config->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + } + + psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-audio-connection" ); + if( psz_tmp ) + { + BMDAudioConnection conn; + if ( !strcmp( psz_tmp, "embedded" ) ) + conn = bmdAudioConnectionEmbedded; + else if ( !strcmp( psz_tmp, "aesebu" ) ) + conn = bmdAudioConnectionAESEBU; + else if ( !strcmp( psz_tmp, "analog" ) ) + conn = bmdAudioConnectionAnalog; + else + { + msg_Err( p_demux, "Invalid --sdi-audio-connection specified; choose one of " \ + "embedded, aesebu, or analog." ); + free( psz_tmp ); + p_config->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + free( psz_tmp ); + + msg_Dbg( p_demux, "Setting audio input format to 0x%x", conn); + result = p_config->SetAudioInputFormat( conn ); + if( result != S_OK ) + { + msg_Err( p_demux, "Failed to set audio input connection" ); + p_config->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + } + + p_config->Release(); - result = p_sys->p_input->EnableVideoInput(bmdModePAL, bmdFormat8BitYUV, 0); + /* Get the list of display modes. */ + IDeckLinkDisplayModeIterator *p_display_iterator; + result = p_sys->p_input->GetDisplayModeIterator( &p_display_iterator ); + if( result != S_OK ) + { + msg_Err( p_demux, "Failed to enumerate display modes" ); + p_display_iterator->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + + char *psz_display_mode = var_CreateGetString( p_demux, "sdi-mode" ); + if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) { + msg_Err( p_demux, "Missing or invalid --sdi-mode string" ); + free( psz_display_mode ); + p_display_iterator->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + + /* + * Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal" + * without having to add the trailing space. + */ + char sz_display_mode_padded[5]; + strcpy(sz_display_mode_padded, " "); + for( int i = 0; i < strlen( psz_display_mode ); ++i ) + sz_display_mode_padded[i] = psz_display_mode[i]; + + free( psz_display_mode ); + + BMDDisplayMode wanted_mode_id; + memcpy( &wanted_mode_id, &sz_display_mode_padded, sizeof(wanted_mode_id) ); + + bool b_found_mode = false; + + for (;;) + { + IDeckLinkDisplayMode *p_display_mode; + result = p_display_iterator->Next( &p_display_mode ); + if( result != S_OK || !p_display_mode ) + break; + + char sz_mode_id_text[5] = {0}; + BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() ); + memcpy( sz_mode_id_text, &mode_id, sizeof(mode_id) ); + + const char *psz_mode_name; + result = p_display_mode->GetName( &psz_mode_name ); + if( result != S_OK ) + { + msg_Err( p_demux, "Failed to get display mode name" ); + p_display_mode->Release(); + p_display_iterator->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + + BMDTimeValue frame_duration, time_scale; + result = p_display_mode->GetFrameRate( &frame_duration, &time_scale ); + if( result != S_OK ) + { + msg_Err( p_demux, "Failed to get frame rate" ); + p_display_mode->Release(); + p_display_iterator->Release(); + Close( p_this ); + return VLC_EGENERIC; + } + + const char *psz_field_dominance; + uint32_t i_dominance_flags = 0; + switch( p_display_mode->GetFieldDominance() ) + { + case bmdProgressiveFrame: + psz_field_dominance = ""; + break; + case bmdProgressiveSegmentedFrame: + psz_field_dominance = ", segmented"; + break; + case bmdLowerFieldFirst: + psz_field_dominance = ", interlaced [BFF]"; + i_dominance_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST; + break; + case bmdUpperFieldFirst: + psz_field_dominance = ", interlaced [TFF]"; + i_dominance_flags = BLOCK_FLAG_TOP_FIELD_FIRST; + break; + case bmdUnknownFieldDominance: + default: + psz_field_dominance = ", unknown field dominance"; + break; + } + + msg_Dbg( p_demux, "Found mode '%s': %s (%dx%d, %.3f fps%s)", + sz_mode_id_text, psz_mode_name, + p_display_mode->GetWidth(), p_display_mode->GetHeight(), + double(time_scale) / frame_duration, psz_field_dominance ); + + if( wanted_mode_id == mode_id ) + { + b_found_mode = true; + p_sys->i_width = p_display_mode->GetWidth(); + p_sys->i_height = p_display_mode->GetHeight(); + p_sys->i_fps_num = time_scale; + p_sys->i_fps_den = frame_duration; + p_sys->i_dominance_flags = i_dominance_flags; + } + + p_display_mode->Release(); + } + + p_display_iterator->Release(); + + if( !b_found_mode ) + { + msg_Err( p_demux, "Unknown SDI mode specified. " \ + "Run VLC with -v --verbose-objects=-all,+sdi " \ + "to get a list of supported modes." ); + Close( p_this ); + return VLC_EGENERIC; + } + + result = p_sys->p_input->EnableVideoInput( htonl( wanted_mode_id ), bmdFormat8BitYUV, 0 ); if( result != S_OK ) { msg_Err( p_demux, "Failed to enable video input" ); + Close( p_this ); return VLC_EGENERIC; } + + /* Set up audio. */ + p_sys->i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" ); + p_sys->i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" ); + if( p_sys->i_rate > 0 && p_sys->i_channels > 0 ) + { + result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels ); + if( result != S_OK ) + { + msg_Err( p_demux, "Failed to enable audio input" ); + Close( p_this ); + return VLC_EGENERIC; + } + } + + p_sys->p_delegate = new DeckLinkCaptureDelegate( p_demux ); + p_sys->p_input->SetCallback( p_sys->p_delegate ); - // FIXME: add audio result = p_sys->p_input->StartStreams(); if( result != S_OK ) { msg_Err( p_demux, "Failed to start streams" ); + Close( p_this ); return VLC_EGENERIC; } - /*eDeclare elementary streams */ - es_format_t fmt; - es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_UYVY ); - fmt.video.i_width = 720; - fmt.video.i_height = 576; - fmt.video.i_sar_num = 16 * fmt.video.i_height; - fmt.video.i_sar_den = 9 * fmt.video.i_width; + /* Declare elementary streams */ + es_format_t video_fmt; + es_format_Init( &video_fmt, VIDEO_ES, VLC_CODEC_UYVY ); + video_fmt.video.i_width = p_sys->i_width; + video_fmt.video.i_height = p_sys->i_height; + video_fmt.video.i_sar_num = 1; + video_fmt.video.i_sar_den = 1; + video_fmt.video.i_frame_rate = p_sys->i_fps_num; + video_fmt.video.i_frame_rate_base = p_sys->i_fps_den; + video_fmt.i_bitrate = video_fmt.video.i_width * video_fmt.video.i_height * video_fmt.video.i_frame_rate * 2 * 8; + + psz_tmp = var_CreateGetNonEmptyString( p_demux, "sdi-aspect-ratio" ); + if( psz_tmp ) + { + char *psz_denominator = strchr( psz_tmp, ':' ); + if( psz_denominator ) + { + *psz_denominator++ = '\0'; + video_fmt.video.i_sar_num = atoi( psz_tmp ) * video_fmt.video.i_height; + video_fmt.video.i_sar_den = atoi( psz_denominator ) * video_fmt.video.i_width; + } + free( psz_tmp ); + } msg_Dbg( p_demux, "added new video es %4.4s %dx%d", - (char*)&fmt.i_codec, fmt.video.i_width, fmt.video.i_height ); - p_sys->p_es = es_out_Add( p_demux->out, &fmt ); + (char*)&video_fmt.i_codec, video_fmt.video.i_width, video_fmt.video.i_height ); + p_sys->p_video_es = es_out_Add( p_demux->out, &video_fmt ); + + es_format_t audio_fmt; + es_format_Init( &audio_fmt, AUDIO_ES, VLC_CODEC_S16N ); + audio_fmt.audio.i_channels = p_sys->i_channels; + audio_fmt.audio.i_rate = p_sys->i_rate; + audio_fmt.audio.i_bitspersample = 16; + audio_fmt.audio.i_blockalign = audio_fmt.audio.i_channels * audio_fmt.audio.i_bitspersample / 8; + audio_fmt.i_bitrate = audio_fmt.audio.i_channels * audio_fmt.audio.i_rate * audio_fmt.audio.i_bitspersample; + + msg_Dbg( p_demux, "added new audio es %4.4s %dHz %dbpp %dch", + (char*)&audio_fmt.i_codec, audio_fmt.audio.i_rate, audio_fmt.audio.i_bitspersample, audio_fmt.audio.i_channels); + p_sys->p_audio_es = es_out_Add( p_demux->out, &audio_fmt ); /* Update default_pts to a suitable value for access */ var_Create( p_demux, "sdi-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); @@ -208,11 +608,30 @@ 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; + if( p_sys->p_input ) + { + p_sys->p_input->StopStreams(); + p_sys->p_input->Release(); + } + + if( p_sys->p_card ) + p_sys->p_card->Release(); + + if( p_sys->p_delegate ) + p_sys->p_delegate->Release(); + + if( p_sys->p_video_frame ) + block_Release( p_sys->p_video_frame ); + + if( p_sys->p_audio_frame ) + block_Release( p_sys->p_audio_frame ); + free( p_sys ); } static int Control( demux_t *p_demux, int i_query, va_list args ) { + demux_sys_t *p_sys = p_demux->p_sys; bool *pb; int64_t *pi64; @@ -233,7 +652,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_TIME: pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = mdate(); // FIXME + *pi64 = p_sys->i_last_pts; return VLC_SUCCESS; /* TODO implement others */ @@ -247,21 +666,37 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - block_t *p_block; + block_t *p_video_block = NULL; + block_t *p_audio_block = NULL; vlc_mutex_lock( &p_sys->frame_lock ); - while( !p_sys->p_frame ) + while( !p_sys->p_video_frame && !p_sys->p_audio_frame ) vlc_cond_wait( &p_sys->has_frame, &p_sys->frame_lock ); - p_block = p_sys->p_frame; - p_sys->p_frame = NULL; + p_video_block = p_sys->p_video_frame; + p_sys->p_video_frame = NULL; + + p_audio_block = p_sys->p_audio_frame; + p_sys->p_audio_frame = NULL; vlc_mutex_unlock( &p_sys->frame_lock ); - msg_Dbg( p_demux, "Sending frame" ); - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); - es_out_Send( p_demux->out, p_sys->p_es, p_block ); + if( p_video_block ) + { + if( p_video_block->i_pts > p_sys->i_last_pts ) + p_sys->i_last_pts = p_video_block->i_pts; + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_video_block->i_pts ); + es_out_Send( p_demux->out, p_sys->p_video_es, p_video_block ); + } + + if( p_audio_block ) + { + if( p_audio_block->i_pts > p_sys->i_last_pts ) + p_sys->i_last_pts = p_audio_block->i_pts; + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_audio_block->i_pts ); + es_out_Send( p_demux->out, p_sys->p_audio_es, p_audio_block ); + } return 1; }