X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=9c6a98ba03fb47c795806cda43af5a8ec731a15f;hb=fe087a38282e93addb25fa9598393e40ea233b09;hp=b5d58cd3995087f011862dcbbb339dd4a689cf33;hpb=0061679f0b8f7d9ab59525279cd4aa143a55d9b4;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index b5d58cd399..9c6a98ba03 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -1,8 +1,8 @@ /***************************************************************************** * cdda.c : CD digital audio input module for vlc ***************************************************************************** - * Copyright (C) 2000, 2003 VideoLAN - * $Id: cdda.c,v 1.15 2004/02/14 17:25:39 gbazin Exp $ + * Copyright (C) 2000, 2003 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * Gildas Bazin @@ -36,8 +36,8 @@ /***************************************************************************** * Module descriptior *****************************************************************************/ -static int AccessOpen ( vlc_object_t * ); -static void AccessClose( vlc_object_t * ); +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ @@ -45,14 +45,18 @@ static void AccessClose( vlc_object_t * ); "value should be set in milliseconds units." ) vlc_module_begin(); + set_shortname( _("Audio CD")); set_description( _("Audio CD input") ); + set_capability( "access2", 10 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + set_callbacks( Open, Close ); + add_usage_hint( N_("[cdda:][device][@[track]]") ); add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - - set_capability( "access", 70 ); - set_callbacks( AccessOpen, AccessClose ); add_shortcut( "cdda" ); + add_shortcut( "cddasimple" ); vlc_module_end(); @@ -66,157 +70,106 @@ vlc_module_end(); struct access_sys_t { vcddev_t *vcddev; /* vcd device descriptor */ - int i_nb_tracks; /* Nb of tracks (titles) */ - int i_track; /* Current track */ + + /* Title infos */ + int i_titles; + input_title_t *title[99]; /* No more that 99 track in a cd-audio */ + + /* Current position */ int i_sector; /* Current Sector */ int * p_sectors; /* Track sectors */ - vlc_bool_t b_end_of_track; /* If the end of track was reached */ - WAVEHEADER waveheader; /* Wave header for the output data */ - int i_header_pos; + /* Wave header for the output data */ + WAVEHEADER waveheader; + vlc_bool_t b_header; }; -static int Read ( input_thread_t *, byte_t *, size_t ); -static void Seek ( input_thread_t *, off_t ); -static int SetArea ( input_thread_t *, input_area_t * ); -static int SetProgram( input_thread_t *, pgrm_descriptor_t * ); +static block_t *Block( access_t * ); +static int Seek( access_t *, int64_t ); +static int Control( access_t *, int, va_list ); /***************************************************************************** - * AccessOpen: open cdda + * Open: open cdda *****************************************************************************/ -static int AccessOpen( vlc_object_t *p_this ) +static int Open( vlc_object_t *p_this ) { - input_thread_t * p_input = (input_thread_t *)p_this; - access_sys_t * p_sys; + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys; - char * psz_orig; - char * psz_parser; - char * psz_source; - int i; - input_area_t * p_area; - int i_title = 1; - vcddev_t *vcddev; + vcddev_t *vcddev; + char *psz_name; + int i; - /* parse the options passed in command line : */ - psz_orig = psz_parser = psz_source = strdup( p_input->psz_name ); - - if( !psz_orig ) + if( !p_access->psz_path || !*p_access->psz_path ) { - return( -1 ); - } + /* Only when selected */ + if( !p_this->b_force ) return VLC_EGENERIC; - while( *psz_parser && *psz_parser != '@' ) - { - psz_parser++; - } - - if( *psz_parser == '@' ) - { - /* Found options */ - *psz_parser = '\0'; - ++psz_parser; - - i_title = (int)strtol( psz_parser, NULL, 10 ); - i_title = i_title ? i_title : 1; - } - - if( !*psz_source ) - { - /* No source specified, so figure it out. */ - if( !p_input->psz_access ) + psz_name = var_CreateGetString( p_this, "cd-audio" ); + if( !psz_name || !*psz_name ) { - free( psz_orig ); + if( psz_name ) free( psz_name ); return VLC_EGENERIC; } - psz_source = config_GetPsz( p_input, "cd-audio" ); - if( !psz_source ) return -1; } + else psz_name = strdup( p_access->psz_path ); /* Open CDDA */ - if( !(vcddev = ioctl_Open( p_this, psz_source )) ) - { - msg_Warn( p_input, "could not open %s", psz_source ); - free( psz_source ); - return VLC_EGENERIC; - } - free( psz_source ); - - p_input->p_access_data = p_sys = malloc( sizeof(access_sys_t) ); - if( p_sys == NULL ) + if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name )) == NULL ) { - msg_Err( p_input, "out of memory" ); - free( psz_source ); + msg_Warn( p_access, "could not open %s", psz_name ); + free( psz_name ); return VLC_EGENERIC; } - + free( psz_name ); + + /* Set up p_access */ + p_access->pf_read = NULL; + p_access->pf_block = Block; + p_access->pf_control = Control; + p_access->pf_seek = Seek; + p_access->info.i_update = 0; + p_access->info.i_size = 0; + p_access->info.i_pos = 0; + p_access->info.b_eof = VLC_FALSE; + p_access->info.i_title = 0; + p_access->info.i_seekpoint = 0; + p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); + memset( p_sys, 0, sizeof( access_sys_t ) ); p_sys->vcddev = vcddev; - - p_input->i_mtu = CDDA_DATA_ONCE; + p_sys->b_header = VLC_FALSE; /* We read the Table Of Content information */ - p_sys->i_nb_tracks = ioctl_GetTracksMap( VLC_OBJECT(p_input), - p_sys->vcddev, &p_sys->p_sectors ); - if( p_sys->i_nb_tracks < 0 ) - { - msg_Err( p_input, "unable to count tracks" ); - } - else if( p_sys->i_nb_tracks <= 0 ) + p_sys->i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), + p_sys->vcddev, &p_sys->p_sectors ); + if( p_sys->i_titles < 0 ) { - msg_Err( p_input, "no audio tracks found" ); + msg_Err( p_access, "unable to count tracks" ); + goto error; } - - if( p_sys->i_nb_tracks <= 0 ) + else if( p_sys->i_titles <= 0 ) { - ioctl_Close( p_this, p_sys->vcddev ); - free( p_sys ); - return VLC_EGENERIC; + msg_Err( p_access, "no audio tracks found" ); + goto error; } - if( i_title >= p_sys->i_nb_tracks || i_title < 1 ) + /* Build title table */ + for( i = 0; i < p_sys->i_titles; i++ ) { - i_title = 1; - } + input_title_t *t = p_sys->title[i] = vlc_input_title_New(); - /* Set stream and area data */ - vlc_mutex_lock( &p_input->stream.stream_lock ); + msg_Dbg( p_access, "title[%d] start=%d", i, p_sys->p_sectors[i] ); + msg_Dbg( p_access, "title[%d] end=%d", i, p_sys->p_sectors[i+1] ); - /* Initialize ES structures */ - input_InitStream( p_input, 0 ); + asprintf( &t->psz_name, _("Track %i"), i + 1 ); + t->i_size = ( p_sys->p_sectors[i+1] - p_sys->p_sectors[i] ) * + (int64_t)CDDA_DATA_SIZE; - /* cdda input method */ - p_input->stream.i_method = INPUT_METHOD_CDDA; - - p_input->stream.b_pace_control = 1; - p_input->stream.b_seekable = 1; - p_input->stream.i_mux_rate = 44100 * 4 / 50; - -#define area p_input->stream.pp_areas - for( i = 1 ; i <= p_sys->i_nb_tracks ; i++ ) - { - input_AddArea( p_input, i, 1 ); - - /* Absolute start offset and size */ - area[i]->i_start = - (off_t)p_sys->p_sectors[i-1] * (off_t)CDDA_DATA_SIZE; - area[i]->i_size = - (off_t)(p_sys->p_sectors[i] - p_sys->p_sectors[i-1]) - * (off_t)CDDA_DATA_SIZE; + t->i_length = I64C(1000000) * t->i_size / 44100 / 4; } -#undef area - p_area = p_input->stream.pp_areas[i_title]; - - SetArea( p_input, p_area ); - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - p_input->pf_read = Read; - p_input->pf_seek = Seek; - p_input->pf_set_area = SetArea; - p_input->pf_set_program = SetProgram; - - /* Update default_pts to a suitable value for cdda access */ - p_input->i_pts_delay = config_GetInt( p_input, "cdda-caching" ) * 1000; + p_sys->i_sector = p_sys->p_sectors[0]; + p_access->info.i_size = p_sys->title[0]->i_size; /* Build a WAV header for the output data */ memset( &p_sys->waveheader, 0, sizeof(WAVEHEADER) ); @@ -232,149 +185,215 @@ static int AccessOpen( vlc_object_t *p_this ) SetWLE( &p_sys->waveheader.BytesPerSample, 2 /*Modus*/ * 16 /*BitsPerSample*/ / 8 ); SetDWLE( &p_sys->waveheader.BytesPerSec, - 16 /*BytesPerSample*/ * 44100 /*SampleFreq*/ ); + 2*16/8 /*BytesPerSample*/ * 44100 /*SampleFreq*/ ); p_sys->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a'); p_sys->waveheader.DataLength = 0; /* we just don't know */ - p_sys->i_header_pos = 0; + p_access->info.i_update |= INPUT_UPDATE_META; + + /* PTS delay */ + var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); return VLC_SUCCESS; + +error: + ioctl_Close( VLC_OBJECT(p_access), p_sys->vcddev ); + free( p_sys ); + return VLC_EGENERIC; } /***************************************************************************** - * AccessClose: closes cdda + * Close: closes cdda *****************************************************************************/ -static void AccessClose( vlc_object_t *p_this ) +static void Close( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - access_sys_t *p_sys = p_input->p_access_data; + access_t *p_access = (access_t *)p_this; + access_sys_t *p_sys = p_access->p_sys; + int i; + + for( i = 0; i < p_sys->i_titles; i++ ) + { + vlc_input_title_Delete( p_sys->title[i] ); + } ioctl_Close( p_this, p_sys->vcddev ); free( p_sys ); } /***************************************************************************** - * Read: reads from the CDDA into PES packets. - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, otherwise the number of - * bytes. + * Block: read data (CDDA_DATA_ONCE) *****************************************************************************/ -static int Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) +static block_t *Block( access_t *p_access ) { - access_sys_t *p_sys = p_input->p_access_data; - int i_blocks = i_len / CDDA_DATA_SIZE; - int i_read = 0; - int i_index; + access_sys_t *p_sys = p_access->p_sys; + int i_blocks = CDDA_BLOCKS_ONCE; + block_t *p_block; - if( !p_sys->i_header_pos ) - { - p_sys->i_header_pos = sizeof(WAVEHEADER); - i_blocks = (i_len - sizeof(WAVEHEADER)) / CDDA_DATA_SIZE; - memcpy( p_buffer, &p_sys->waveheader, sizeof(WAVEHEADER) ); - p_buffer += sizeof(WAVEHEADER); - i_read += sizeof(WAVEHEADER); - } + /* Check end of file */ + if( p_access->info.b_eof ) return NULL; - if( ioctl_ReadSectors( VLC_OBJECT(p_input), p_sys->vcddev, p_sys->i_sector, - p_buffer, i_blocks, CDDA_TYPE ) < 0 ) + if( !p_sys->b_header ) { - msg_Err( p_input, "could not read sector %d", p_sys->i_sector ); - return -1; + /* Return only the header */ + p_block = block_New( p_access, sizeof( WAVEHEADER ) ); + memcpy( p_block->p_buffer, &p_sys->waveheader, sizeof(WAVEHEADER) ); + p_sys->b_header = VLC_TRUE; + return p_block; } - for( i_index = 0; i_index < i_blocks; i_index++ ) + /* Check end of title */ + while( p_sys->i_sector >= p_sys->p_sectors[p_access->info.i_title + 1] ) { - p_sys->i_sector ++; - if( p_sys->i_sector == p_sys->p_sectors[p_sys->i_track + 1] ) + if( p_access->info.i_title + 1 >= p_sys->i_titles ) { - input_area_t *p_area; - - if ( p_sys->i_track >= p_sys->i_nb_tracks - 1 ) - { - return 0; /* EOF */ - } - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_area = p_input->stream.pp_areas[ - p_input->stream.p_selected_area->i_id + 1 ]; - - msg_Dbg( p_input, "new title" ); - - p_area->i_part = 1; - SetArea( p_input, p_area ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + p_access->info.b_eof = VLC_TRUE; + return NULL; } - i_read += CDDA_DATA_SIZE; + + p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SIZE | + INPUT_UPDATE_META; + p_access->info.i_title++; + p_access->info.i_size = p_sys->title[p_access->info.i_title]->i_size; + p_access->info.i_pos = 0; } - if ( i_len % CDDA_DATA_SIZE ) /* this should not happen */ + /* Don't read after the end of a title */ + if( p_sys->i_sector + i_blocks >= + p_sys->p_sectors[p_access->info.i_title + 1] ) { - msg_Err( p_input, "must read full sectors" ); + i_blocks = p_sys->p_sectors[p_access->info.i_title + 1 ] - + p_sys->i_sector; } - return i_read; -} - -/***************************************************************************** - * SetProgram: Does nothing since a CDDA is mono_program - *****************************************************************************/ -static int SetProgram( input_thread_t * p_input, - pgrm_descriptor_t * p_program) -{ - return VLC_EGENERIC; -} - -/***************************************************************************** - * SetArea: initialize input data for title x. - * It should be called for each user navigation request. - ****************************************************************************/ -static int SetArea( input_thread_t * p_input, input_area_t * p_area ) -{ - access_sys_t *p_sys = p_input->p_access_data; - vlc_value_t val; - - /* we can't use the interface slider until initilization is complete */ - p_input->stream.b_seekable = 0; - - if( p_area != p_input->stream.p_selected_area ) + /* Do the actual reading */ + if( !( p_block = block_New( p_access, i_blocks * CDDA_DATA_SIZE ) ) ) { - /* Change the default area */ - p_input->stream.p_selected_area = p_area; - - /* Change the current track */ - p_sys->i_track = p_area->i_id - 1; - p_sys->i_sector = p_sys->p_sectors[p_sys->i_track]; - - /* Update the navigation variables without triggering a callback */ - val.i_int = p_area->i_id; - var_Change( p_input, "title", VLC_VAR_SETVALUE, &val, NULL ); + msg_Err( p_access, "cannot get a new block of size: %i", + i_blocks * CDDA_DATA_SIZE ); + return NULL; } - p_sys->i_sector = p_sys->p_sectors[p_sys->i_track]; + if( ioctl_ReadSectors( VLC_OBJECT(p_access), p_sys->vcddev, + p_sys->i_sector, p_block->p_buffer, i_blocks, CDDA_TYPE ) < 0 ) + { + msg_Err( p_access, "cannot read sector %i", p_sys->i_sector ); + block_Release( p_block ); - p_input->stream.p_selected_area->i_tell = - (off_t)p_sys->i_sector * (off_t)CDDA_DATA_SIZE - - p_input->stream.p_selected_area->i_start; + /* Try to skip one sector (in case of bad sectors) */ + p_sys->i_sector++; + p_access->info.i_pos += CDDA_DATA_SIZE; + return NULL; + } - /* warn interface that something has changed */ - p_input->stream.b_seekable = 1; - p_input->stream.b_changed = 1; + /* Update a few values */ + p_sys->i_sector += i_blocks; + p_access->info.i_pos += p_block->i_buffer; - return 0; + return p_block; } /**************************************************************************** * Seek ****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_off ) +static int Seek( access_t *p_access, int64_t i_pos ) +{ + access_sys_t *p_sys = p_access->p_sys; + + /* Next sector to read */ + p_sys->i_sector = p_sys->p_sectors[p_access->info.i_title] + + i_pos / CDDA_DATA_SIZE; + p_access->info.i_pos = i_pos; + + return VLC_SUCCESS; +} + +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( access_t *p_access, int i_query, va_list args ) { - access_sys_t * p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; + vlc_bool_t *pb_bool; + int *pi_int; + int64_t *pi_64; + input_title_t ***ppp_title; + int i; + char *psz_title; + vlc_meta_t **pp_meta; + + switch( i_query ) + { + /* */ + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + *pb_bool = VLC_TRUE; + break; + + /* */ + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = CDDA_DATA_ONCE; + break; + + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = var_GetInteger( p_access, "cdda-caching" ) * 1000; + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + break; + + case ACCESS_GET_TITLE_INFO: + ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); + pi_int = (int*)va_arg( args, int* ); + *((int*)va_arg( args, int* )) = 1; /* Title offset */ + + /* Duplicate title infos */ + *pi_int = p_sys->i_titles; + *ppp_title = malloc(sizeof( input_title_t **) * p_sys->i_titles ); + for( i = 0; i < p_sys->i_titles; i++ ) + { + (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->title[i] ); + } + break; + + case ACCESS_SET_TITLE: + i = (int)va_arg( args, int ); + if( i != p_access->info.i_title ) + { + /* Update info */ + p_access->info.i_update |= + INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE|INPUT_UPDATE_META; + p_access->info.i_title = i; + p_access->info.i_size = p_sys->title[i]->i_size; + p_access->info.i_pos = 0; + + /* Next sector to read */ + p_sys->i_sector = p_sys->p_sectors[i]; + } + break; + + case ACCESS_GET_META: + psz_title = malloc( strlen( _("Audio CD - Track ") ) + 5 ); + snprintf( psz_title, 100, _("Audio CD - Track %i" ), + p_access->info.i_title+1 ); + pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); + *pp_meta = vlc_meta_New(); + vlc_meta_Add( *pp_meta, VLC_META_TITLE, psz_title ); + free( psz_title ); + break; + + case ACCESS_SET_SEEKPOINT: + case ACCESS_SET_PRIVATE_ID_STATE: + return VLC_EGENERIC; - p_sys->i_sector = p_sys->p_sectors[p_sys->i_track] - + i_off / (off_t)CDDA_DATA_SIZE; + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_tell = - (off_t)p_sys->i_sector * (off_t)CDDA_DATA_SIZE - - p_input->stream.p_selected_area->i_start; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + } + return VLC_SUCCESS; }