X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdemux%2Frawdv.c;h=77dc254586388865b7849e462ddbdc20421950ad;hb=0c1a0ba99505bb17b86c1cbc02807c11453ec126;hp=e17764e85977233f9094deb8a8ebedafd922bbeb;hpb=768b2ea25a22f26d73e01ddea7bae60cd44f2278;p=vlc diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c index e17764e859..77dc254586 100644 --- a/modules/demux/rawdv.c +++ b/modules/demux/rawdv.c @@ -1,46 +1,69 @@ /***************************************************************************** - * rawdv.c : raw dv input module for vlc + * 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 $ + * Copyright (C) 2001-2007 VLC authors and VideoLAN + * $Id$ * * Authors: Gildas Bazin + * Paul Corke * - * 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 + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * You should have received a copy of the GNU Lesser 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 *****************************************************************************/ -#include /* malloc(), free() */ -#include /* strdup() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include "rawdv.h" + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +#define HURRYUP_TEXT N_( "Hurry up" ) +#define HURRYUP_LONGTEXT N_( "The demuxer will advance timestamps if the " \ + "input can't keep up with the rate." ) + +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); -#include +vlc_module_begin () + set_shortname( "DV" ) + set_description( N_("DV (Digital Video) demuxer") ) + set_capability( "demux", 3 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + add_bool( "rawdv-hurry-up", false, HURRYUP_TEXT, HURRYUP_LONGTEXT, false ) + set_callbacks( Open, Close ) + add_shortcut( "rawdv" ) +vlc_module_end () -#include /* BITMAPINFOHEADER, WAVEFORMATEX */ /***************************************************************************** A little bit of background information (copied over from libdv glossary). - DIF block: A block of 80 bytes. This is the basic data framing unit of the DVC tape format, analogous to sectors of hard disc. - + - Video Section: Each DIF sequence contains a video section, consisting of 135 DIF blocks, which are further subdivided into Video Segments. @@ -49,13 +72,6 @@ *****************************************************************************/ - -/***************************************************************************** - * Constants - *****************************************************************************/ -#define DV_PAL_FRAME_SIZE 144000 -#define DV_NTSC_FRAME_SIZE 122000 - /***************************************************************************** * Definitions of structures used by this plugin *****************************************************************************/ @@ -81,77 +97,58 @@ struct demux_sys_t { int frame_size; - es_descriptor_t *p_video_es; - es_descriptor_t *p_audio_es; + es_out_id_t *p_es_video; + es_format_t fmt_video; - /* codec specific stuff */ - BITMAPINFOHEADER *p_bih; + es_out_id_t *p_es_audio; + es_format_t fmt_audio; + int i_dsf; double f_rate; int i_bitrate; /* program clock reference (in units of 90kHz) */ mtime_t i_pcr; + bool b_hurry_up; }; /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Activate ( vlc_object_t * ); -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_capability( "demux", 2 ); - set_callbacks( Activate, NULL ); - add_shortcut( "rawdv" ); -vlc_module_end(); +static int Demux( demux_t * ); +static int Control( demux_t *, int i_query, va_list args ); /***************************************************************************** - * Activate: initializes raw dv demux structures + * Open: initializes raw DV demux structures *****************************************************************************/ -static int Activate( vlc_object_t * p_this ) +static int Open( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - byte_t *p_peek; - uint32_t i_dword; - demux_sys_t *p_rawdv; - dv_header_t dv_header; - dv_id_t dv_id; - char *psz_ext; - - /* It isn't easy to recognize a raw dv stream. The chances that we'll - * mistake a stream from another type for a raw dv stream are too high, so + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + + const uint8_t *p_peek, *p_peek_backup; + + uint32_t i_dword; + dv_header_t dv_header; + dv_id_t dv_id; + + /* It isn't easy to recognize a raw DV stream. The chances that we'll + * mistake a stream from another type for a raw DV stream are too high, so * we'll rely on the file extension to trigger this demux. Alternatively, * it is possible to force this demux. */ - /* Check for dv file extension */ - psz_ext = strrchr ( p_input->psz_name, '.' ); - if( ( !psz_ext || strcasecmp( psz_ext, ".dv") )&& - ( !p_input->psz_demux || strcmp(p_input->psz_demux, "rawdv") ) ) - { - return -1; - } + /* Check for DV file extension */ + if( !demux_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force ) + return VLC_EGENERIC; - p_input->pf_demux = Demux; - - /* Have a peep at the show. */ - if( input_Peek(p_input, &p_peek, DV_PAL_FRAME_SIZE) < DV_NTSC_FRAME_SIZE ) + if( stream_Peek( p_demux->s, &p_peek, DV_PAL_FRAME_SIZE ) < + DV_NTSC_FRAME_SIZE ) { /* Stream too short ... */ - msg_Err( p_input, "cannot peek()" ); - return -1; + msg_Err( p_demux, "cannot peek()" ); + return VLC_EGENERIC; } + p_peek_backup = p_peek; /* fill in the dv_id_t structure */ i_dword = GetDWBE( p_peek ); p_peek += 4; @@ -166,8 +163,8 @@ static int Activate( vlc_object_t * p_this ) if( dv_id.sct != 0 ) { - msg_Warn( p_input, "not a raw dv stream header" ); - return -1; + msg_Warn( p_demux, "not a raw DV stream header" ); + return VLC_EGENERIC; } /* fill in the dv_header_t structure */ @@ -175,8 +172,8 @@ static int Activate( vlc_object_t * p_this ) i_dword <<= 1; if( i_dword >> (32 - 1) ) /* incorrect bit */ { - msg_Warn( p_input, "incorrect bit" ); - return -1; + msg_Warn( p_demux, "incorrect bit" ); + return VLC_EGENERIC; } i_dword = GetDWBE( p_peek ); p_peek += 4; @@ -197,100 +194,53 @@ static int Activate( vlc_object_t * p_this ) p_peek += 72; /* skip rest of DIF block */ + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; - /* Setup the structures for our demuxer */ - if( !( p_rawdv = malloc( sizeof( demux_sys_t ) ) ) ) - { - msg_Err( p_input, "out of memory" ); - return -1; - } - memset( p_rawdv, 0, sizeof( demux_sys_t ) ); - p_rawdv->p_bih = NULL; - p_input->p_demux_data = p_rawdv; + p_sys->b_hurry_up = var_CreateGetBool( p_demux, "rawdv-hurry-up" ); + msg_Dbg( p_demux, "Realtime DV Source: %s", (p_sys->b_hurry_up)?"Yes":"No" ); - p_rawdv->p_bih = (BITMAPINFOHEADER *) malloc( sizeof(BITMAPINFOHEADER) ); - if( !p_rawdv->p_bih ) - { - msg_Err( p_input, "out of memory" ); - goto error; - } - p_rawdv->p_bih->biSize = sizeof(BITMAPINFOHEADER); - p_rawdv->p_bih->biCompression = VLC_FOURCC( 'd','v','s','d' ); - p_rawdv->p_bih->biSize = 40; - p_rawdv->p_bih->biWidth = 720; - p_rawdv->p_bih->biHeight = dv_header.dsf ? 576 : 480; - p_rawdv->p_bih->biPlanes = 1; - p_rawdv->p_bih->biBitCount = 24; - p_rawdv->p_bih->biSizeImage = - p_rawdv->p_bih->biWidth * p_rawdv->p_bih->biHeight - * (p_rawdv->p_bih->biBitCount >> 3); - - /* Properties of our video */ - if( dv_header.dsf ) - { - p_rawdv->frame_size = 12 * 150 * 80; - p_rawdv->f_rate = 25; - } - else - { - p_rawdv->frame_size = 10 * 150 * 80; - p_rawdv->f_rate = 29.97; - } + p_sys->i_dsf = dv_header.dsf; + p_sys->frame_size = dv_header.dsf ? DV_PAL_FRAME_SIZE + : DV_NTSC_FRAME_SIZE; + p_sys->f_rate = dv_header.dsf ? 25 : 29.97; - /* necessary because input_SplitBuffer() will only get - * INPUT_DEFAULT_BUFSIZE bytes at a time. */ - p_input->i_bufsize = p_rawdv->frame_size; + p_sys->i_pcr = 0; + p_sys->p_es_video = NULL; + p_sys->p_es_audio = NULL; - /* Create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); - goto error; - } - if( input_AddProgram( p_input, 0, 0) == NULL ) + p_sys->i_bitrate = 0; + + es_format_Init( &p_sys->fmt_video, VIDEO_ES, VLC_CODEC_DV ); + p_sys->fmt_video.video.i_width = 720; + p_sys->fmt_video.video.i_height= dv_header.dsf ? 576 : 480;; + + p_sys->p_es_video = es_out_Add( p_demux->out, &p_sys->fmt_video ); + + /* Audio stuff */ + p_peek = p_peek_backup + 80*6+80*16*3 + 3; /* beginning of AAUX pack */ + if( *p_peek == 0x50 ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot add program" ); - goto error; + dv_get_audio_format( &p_sys->fmt_audio, &p_peek[1] ); + p_sys->p_es_audio = es_out_Add( p_demux->out, &p_sys->fmt_audio ); } - p_input->stream.p_selected_program = p_input->stream.pp_programs[0]; - p_input->stream.i_mux_rate = p_rawdv->frame_size * p_rawdv->f_rate; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - /* Add video stream */ - 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 ); - 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 ); - - /* Init pcr */ - p_rawdv->i_pcr = 0; - - return 0; - - error: - if( p_rawdv->p_bih ) free( p_rawdv->p_bih ); - Deactivate( (vlc_object_t *)p_input ); - return -1; + + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + return VLC_SUCCESS; } /***************************************************************************** - * Deactivate: frees unused data + * Close: frees unused data *****************************************************************************/ -static void Deactivate( vlc_object_t *p_this ) +static void Close( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_rawdv = (demux_sys_t *)p_input->p_demux_data; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; - free( p_rawdv ); + var_Destroy( p_demux, "rawdv-hurry-up"); + free( p_sys ); } /***************************************************************************** @@ -298,71 +248,64 @@ static void Deactivate( vlc_object_t *p_this ) ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int Demux( input_thread_t * p_input ) +static int Demux( demux_t *p_demux ) { - 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; - data_packet_t *p_data; - ssize_t i_read; - - if( p_fifo == NULL ) - { - return -1; - } + demux_sys_t *p_sys = p_demux->p_sys; + block_t *p_block; + bool b_audio = false; - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) + if( p_sys->b_hurry_up ) { - off_t i_pos; - - msg_Warn( p_input, "synchro reinit" ); - - /* If the user tried to seek in the stream, we need to make sure - * the new position is at a DIF block boundary. */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - i_pos= p_input->stream.p_selected_area->i_tell; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - if( (i_pos % p_rawdv->frame_size) && - p_input->stream.b_seekable && - p_input->stream.i_method == INPUT_METHOD_FILE ) - { - p_input->pf_seek( p_input, (i_pos / p_rawdv->frame_size) - * p_rawdv->frame_size ); - input_AccessReinit( p_input ); - } + /* 3 frames */ + p_sys->i_pcr = mdate() + (p_sys->i_dsf ? 120000 : 90000); } /* Call the pace control */ - input_ClockManageRef( p_input, p_input->stream.p_selected_program, - p_rawdv->i_pcr ); - - i_read = input_SplitBuffer( p_input, &p_data, p_rawdv->frame_size ); - if( i_read <= 0 ) + es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr ); + p_block = stream_Block( p_demux->s, p_sys->frame_size ); + if( p_block == NULL ) { - return i_read; + /* EOF */ + return 0; } - p_pes = input_NewPES( p_input->p_method_data ); - if( p_pes == NULL ) + if( p_sys->p_es_audio ) { - msg_Err( p_input, "out of memory" ); - input_DeletePacket( p_input->p_method_data, p_data ); - return -1; + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, + p_sys->p_es_audio, &b_audio ); } - 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_block->i_dts = + p_block->i_pts = VLC_TS_0 + p_sys->i_pcr; - input_DecodePES( p_fifo, p_pes ); + if( b_audio ) + { + block_t *p_audio_block = dv_extract_audio( p_block ); + if( p_audio_block ) + es_out_Send( p_demux->out, p_sys->p_es_audio, p_audio_block ); + } - p_rawdv->i_pcr += ( 90000 / p_rawdv->f_rate ); + es_out_Send( p_demux->out, p_sys->p_es_video, p_block ); + + if( !p_sys->b_hurry_up ) + { + p_sys->i_pcr += ( INT64_C(1000000) / p_sys->f_rate ); + } 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; + + /* XXX: DEMUX_SET_TIME is precise here */ + return demux_vaControlHelper( p_demux->s, + 0, -1, + p_sys->frame_size * p_sys->f_rate * 8, + p_sys->frame_size, i_query, args ); +} +