* rawdv.c : raw dv input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: rawdv.c,v 1.3 2003/01/23 09:00:36 fenrir Exp $
+ * $Id: rawdv.c,v 1.10 2003/09/07 22:48:29 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
/* codec specific stuff */
BITMAPINFOHEADER *p_bih;
+ WAVEFORMATEX *p_wf;
double f_rate;
int i_bitrate;
static void Deactivate( vlc_object_t * );
static int Demux ( input_thread_t * );
-static uint32_t GetDWBE( uint8_t *p_buff )
-{
- return (uint32_t)p_buff[3] | ( ((uint32_t)p_buff[2]) << 8 ) |
- ( ((uint32_t)p_buff[1]) << 16 ) | ( ((uint32_t)p_buff[0]) << 24 );
-}
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("raw dv demux") );
+ set_description( _("raw dv demuxer") );
set_capability( "demux", 2 );
set_callbacks( Activate, NULL );
add_shortcut( "rawdv" );
static int Activate( vlc_object_t * p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
- byte_t *p_peek;
+ byte_t *p_peek, *p_peek_backup;
uint32_t i_dword;
demux_sys_t *p_rawdv;
dv_header_t dv_header;
}
p_input->pf_demux = Demux;
+ p_input->pf_demux_control = demux_vaControlDefault;
/* Have a peep at the show. */
if( input_Peek(p_input, &p_peek, DV_PAL_FRAME_SIZE) < DV_NTSC_FRAME_SIZE )
msg_Err( p_input, "cannot peek()" );
return -1;
}
+ p_peek_backup = p_peek;
/* fill in the dv_id_t structure */
i_dword = GetDWBE( p_peek ); p_peek += 4;
}
memset( p_rawdv, 0, sizeof( demux_sys_t ) );
p_rawdv->p_bih = NULL;
+ p_rawdv->p_wf = NULL;
p_input->p_demux_data = p_rawdv;
p_rawdv->p_bih = (BITMAPINFOHEADER *) malloc( sizeof(BITMAPINFOHEADER) );
p_rawdv->f_rate = 29.97;
}
+ /* Audio stuff */
+#if 0
+ p_peek = p_peek_backup + 80*6+80*16*3 + 3; /* beginning of AAUX pack */
+
+ if( *p_peek != 0x50 || *p_peek != 0x51 )
+ {
+ msg_Err( p_input, "AAUX should begin with 0x50" );
+ }
+#endif
+
+ p_rawdv->p_wf = (WAVEFORMATEX *)malloc( sizeof(WAVEFORMATEX) );
+ if( !p_rawdv->p_wf )
+ {
+ msg_Err( p_input, "out of memory" );
+ goto error;
+ }
+
+ p_rawdv->p_wf->wFormatTag = 0;
+ p_rawdv->p_wf->nChannels = 2;
+ p_rawdv->p_wf->nSamplesPerSec = 44100; /* FIXME */
+ p_rawdv->p_wf->nAvgBytesPerSec = p_rawdv->f_rate * p_rawdv->frame_size;
+ p_rawdv->p_wf->nBlockAlign = p_rawdv->frame_size;
+ p_rawdv->p_wf->wBitsPerSample = 16;
+ p_rawdv->p_wf->cbSize = 0;
+
+
/* necessary because input_SplitBuffer() will only get
* INPUT_DEFAULT_BUFSIZE bytes at a time. */
p_input->i_bufsize = p_rawdv->frame_size;
vlc_mutex_lock( &p_input->stream.stream_lock );
p_rawdv->p_video_es = input_AddES( p_input,
p_input->stream.p_selected_program,
- 1, 0 );
+ 1, VIDEO_ES, NULL, 0 );
p_rawdv->p_video_es->i_stream_id = 0;
p_rawdv->p_video_es->i_fourcc = VLC_FOURCC( 'd','v','s','d' );
- p_rawdv->p_video_es->i_cat = VIDEO_ES;
p_rawdv->p_video_es->p_bitmapinfoheader = (void *)p_rawdv->p_bih;
input_SelectES( p_input, p_rawdv->p_video_es );
vlc_mutex_unlock( &p_input->stream.stream_lock );
+ /* Add audio stream */
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ p_rawdv->p_audio_es = input_AddES( p_input,
+ p_input->stream.p_selected_program,
+ 2, AUDIO_ES, NULL, 0 );
+ p_rawdv->p_audio_es->i_stream_id = 1;
+ p_rawdv->p_audio_es->i_fourcc = VLC_FOURCC( 'd','v','a','u' );
+ p_rawdv->p_audio_es->p_waveformatex = (void *)p_rawdv->p_wf;
+ input_SelectES( p_input, p_rawdv->p_audio_es );
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
/* Init pcr */
p_rawdv->i_pcr = 0;
error:
if( p_rawdv->p_bih ) free( p_rawdv->p_bih );
+ if( p_rawdv->p_wf ) free( p_rawdv->p_wf );
Deactivate( (vlc_object_t *)p_input );
return -1;
}
static int Demux( input_thread_t * p_input )
{
demux_sys_t *p_rawdv = (demux_sys_t *)p_input->p_demux_data;
- decoder_fifo_t *p_fifo =
- p_input->stream.p_selected_program->pp_es[0]->p_decoder_fifo;
- pes_packet_t *p_pes;
+ pes_packet_t *p_pes = NULL;
+ pes_packet_t *p_audio_pes = NULL;
data_packet_t *p_data;
ssize_t i_read;
- if( p_fifo == NULL )
- {
- return -1;
- }
-
if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
{
off_t i_pos;
return i_read;
}
- p_pes = input_NewPES( p_input->p_method_data );
- if( p_pes == NULL )
+ /* Build video PES packet */
+ if( p_rawdv->p_video_es->p_decoder_fifo )
{
- msg_Err( p_input, "out of memory" );
- input_DeletePacket( p_input->p_method_data, p_data );
- return -1;
+ p_pes = input_NewPES( p_input->p_method_data );
+ if( p_pes == NULL )
+ {
+ msg_Err( p_input, "out of memory" );
+ input_DeletePacket( p_input->p_method_data, p_data );
+ return -1;
+ }
+
+ p_pes->i_rate = p_input->stream.control.i_rate;
+ p_pes->p_first = p_pes->p_last = p_data;
+ p_pes->i_pes_size = i_read;
+ p_pes->i_nb_data = 1;
+ p_pes->i_pts =
+ input_ClockGetTS( p_input, p_input->stream.p_selected_program,
+ p_rawdv->i_pcr );
}
- p_pes->i_rate = p_input->stream.control.i_rate;
- p_pes->p_first = p_pes->p_last = p_data;
- p_pes->i_pes_size = i_read;
- p_pes->i_nb_data = 1;
- p_pes->i_pts =
- input_ClockGetTS( p_input, p_input->stream.p_selected_program,
- p_rawdv->i_pcr );
+ /* Do the same for audio */
+ if( p_rawdv->p_audio_es->p_decoder_fifo )
+ {
+ p_audio_pes = input_NewPES( p_input->p_method_data );
+ if( p_audio_pes == NULL )
+ {
+ msg_Err( p_input, "out of memory" );
+ input_DeletePacket( p_input->p_method_data, p_data );
+ return -1;
+ }
+ p_audio_pes->i_rate = p_input->stream.control.i_rate;
+
+ if( p_rawdv->p_video_es->p_decoder_fifo )
+ p_audio_pes->p_first = p_audio_pes->p_last =
+ input_ShareBuffer( p_input->p_method_data, p_data->p_buffer );
+ else
+ p_audio_pes->p_first = p_audio_pes->p_last = p_data;
+
+ p_audio_pes->p_first->p_next = p_data->p_next;
+ p_audio_pes->p_first->p_payload_start = p_data->p_payload_start;
+ p_audio_pes->p_first->p_payload_end = p_data->p_payload_end;
+ p_audio_pes->i_pes_size = i_read;
+ p_audio_pes->i_nb_data = 1;
+ p_audio_pes->i_pts =
+ input_ClockGetTS( p_input, p_input->stream.p_selected_program,
+ p_rawdv->i_pcr );
+ }
- input_DecodePES( p_fifo, p_pes );
+ /* Decode PES packets if stream is selected */
+ if( p_rawdv->p_video_es->p_decoder_fifo )
+ input_DecodePES( p_rawdv->p_video_es->p_decoder_fifo, p_pes );
+ if( p_rawdv->p_audio_es->p_decoder_fifo )
+ input_DecodePES( p_rawdv->p_audio_es->p_decoder_fifo, p_audio_pes );
p_rawdv->i_pcr += ( 90000 / p_rawdv->f_rate );
+ if( !p_rawdv->p_video_es->p_decoder_fifo &&
+ !p_rawdv->p_audio_es->p_decoder_fifo )
+ input_DeletePacket( p_input->p_method_data, p_data );
+
return 1;
}
projects / vlc / blobdiff