# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_access.h>
#ifdef HAVE_UNISTD_H
#include "cdrom_internals.h"
#include "cdrom.h"
#include <vlc_charset.h>
+#include <vlc_meta.h>
/*****************************************************************************
* ioctl_Open: Opens a VCD device or file and returns an opaque handle
/*
* Initialize structure with default values
*/
- p_vcddev = (vcddev_t *)malloc( sizeof(vcddev_t) );
+ p_vcddev = malloc( sizeof(*p_vcddev) );
if( p_vcddev == NULL )
- {
- msg_Err( p_this, "out of memory" );
return NULL;
- }
p_vcddev->i_vcdimage_handle = -1;
p_vcddev->psz_dev = NULL;
b_is_file = 1;
if( p_vcddev->i_device_handle != -1 )
close( p_vcddev->i_device_handle );
#endif
+ free( p_vcddev );
}
/*****************************************************************************
if( pp_sectors )
{
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
memcpy( *pp_sectors, p_vcddev->p_sectors,
- (i_tracks + 1) * sizeof(int) );
+ (i_tracks + 1) * sizeof(**pp_sectors) );
}
return i_tracks;
CDTOCDescriptor *pTrackDescriptors;
u_char track;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
{
- msg_Err( p_this, "out of memory" );
darwin_freeTOC( pTOC );
return 0;
}
{
HANDLE hEvent;
struct SRB_ExecSCSICmd ssc;
- byte_t p_tocheader[ 4 ];
+ uint8_t p_tocheader[ 4 ];
/* Create the transfer completion event */
hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
if( pp_sectors )
{
int i, i_toclength;
- byte_t *p_fulltoc;
+ uint8_t *p_fulltoc;
i_toclength = 4 /* header */ + p_tocheader[0] +
((unsigned int)p_tocheader[1] << 8);
p_fulltoc = malloc( i_toclength );
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL || p_fulltoc == NULL )
{
free( *pp_sectors );
free( p_fulltoc );
- msg_Err( p_this, "out of memory" );
CloseHandle( hEvent );
return 0;
}
{
int i;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
for( i = 0 ; i <= i_tracks ; i++ )
{
{
int i;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
toc_entries.address_format = CD_LBA_FORMAT;
toc_entries.starting_track = 0;
malloc( toc_entries.data_len );
if( toc_entries.data == NULL )
{
- msg_Err( p_this, "out of memory" );
free( *pp_sectors );
return 0;
}
{
int i;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
/* Fill the p_sectors structure with the track/sector matches */
for( i = 0 ; i <= i_tracks ; i++ )
* ioctl_ReadSector: Read VCD or CDDA sectors
****************************************************************************/
int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
- int i_sector, byte_t * p_buffer, int i_nb, int i_type )
+ int i_sector, uint8_t *p_buffer, int i_nb, int i_type )
{
- byte_t *p_block;
+ uint8_t *p_block;
int i;
- if( i_type == VCD_TYPE ) p_block = malloc( VCD_SECTOR_SIZE * i_nb );
- else p_block = p_buffer;
+ if( i_type == VCD_TYPE )
+ p_block = malloc( VCD_SECTOR_SIZE * i_nb );
+ else
+ p_block = p_buffer;
if( p_vcddev->i_vcdimage_handle != -1 )
{
}
if( sc.retsts || sc.error )
{
- msg_Err( p_this, "SCSI command failed: status %d error %d\n",
+ msg_Err( p_this, "SCSI command failed: status %d error %d",
sc.retsts, sc.error );
if( i_type == VCD_TYPE ) free( p_block );
return -1;
char *psz_vcdfile = NULL;
char *psz_cuefile = NULL;
FILE *cuefile = NULL;
+ int *p_sectors = NULL;
char line[1024];
+ bool b_found = false;
/* Check if we are dealing with a .cue file */
p_pos = strrchr( psz_dev, '.' );
{
/* psz_dev must be the cue file. Let's assume there's a .bin
* file with the same filename */
- if( p_pos )
- {
- psz_vcdfile = malloc( p_pos - psz_dev + 5 /* ".bin" */ );
- strncpy( psz_vcdfile, psz_dev, p_pos - psz_dev );
- strcpy( psz_vcdfile + (p_pos - psz_dev), ".bin");
- }
- else
- {
- psz_vcdfile = malloc( strlen(psz_dev) + 5 /* ".bin" */ );
- sprintf( psz_vcdfile, "%s.bin", psz_dev );
- }
+ psz_vcdfile = malloc( p_pos - psz_dev + 5 /* ".bin" */ );
+ strncpy( psz_vcdfile, psz_dev, p_pos - psz_dev );
+ strcpy( psz_vcdfile + (p_pos - psz_dev), ".bin");
psz_cuefile = strdup( psz_dev );
}
else
}
else
{
- psz_cuefile = malloc( strlen(psz_dev) + 5 /* ".cue" */ );
- sprintf( psz_cuefile, "%s.cue", psz_dev );
+ if( asprintf( &psz_cuefile, "%s.cue", psz_dev ) == -1 )
+ psz_cuefile = NULL;
}
/* If we need to look up the .cue file, then we don't have to look for the vcd */
psz_vcdfile = strdup( psz_dev );
cuefile = utf8_fopen( psz_cuefile, "rt" );
if( cuefile == NULL )
{
- i_ret = -1;
msg_Dbg( p_this, "could not find .cue file" );
goto error;
}
- msg_Dbg( p_this,"using vcd image file: %s", psz_vcdfile );
+ msg_Dbg( p_this,"guessing vcd image file: %s", psz_vcdfile );
p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
O_RDONLY | O_NONBLOCK | O_BINARY, 0666 );
- if( p_vcddev->i_vcdimage_handle == -1 &&
- fscanf( cuefile, "FILE %c", line ) &&
- fgets( line, 1024, cuefile ) )
+ while( fgets( line, 1024, cuefile ) && !b_found )
{
/* We have a cue file, but no valid vcd file yet */
- free( psz_vcdfile );
- p_pos = strchr( line, '"' );
- if( p_pos )
+ char filename[1024];
+ char type[16];
+ int i_temp = sscanf( line, "FILE \"%1023[^\"]\" %15s", filename, type );
+ *p_pos = 0;
+ switch( i_temp )
{
- *p_pos = 0;
-
- /* Take care of path standardization */
- if( *line != '/' && ((p_pos = strrchr( psz_cuefile, '/' ))
- || (p_pos = strrchr( psz_cuefile, '\\' ) )) )
- {
- psz_vcdfile = malloc( strlen(line) +
+ case 2:
+ msg_Dbg( p_this, "the cue file says the data file is %s", type );
+ if( strcasecmp( type, "BINARY" ) )
+ goto error; /* Error if not binary, otherwise treat as case 1 */
+ case 1:
+ if( p_vcddev->i_vcdimage_handle == -1 )
+ {
+ msg_Dbg( p_this, "we could not find the data file, but we found a new path" );
+ free( psz_vcdfile);
+ if( *filename != '/' && ((p_pos = strrchr( psz_cuefile, '/' ))
+ || (p_pos = strrchr( psz_cuefile, '\\' ) )) )
+ {
+ psz_vcdfile = malloc( strlen(filename) +
(p_pos - psz_cuefile + 1) + 1 );
- strncpy( psz_vcdfile, psz_cuefile, (p_pos - psz_cuefile + 1) );
- strcpy( psz_vcdfile + (p_pos - psz_cuefile + 1), line );
- }
- else psz_vcdfile = strdup( line );
- }
- msg_Dbg( p_this,"using vcd image file: %s", psz_vcdfile );
- p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
+ strncpy( psz_vcdfile, psz_cuefile, (p_pos - psz_cuefile + 1) );
+ strcpy( psz_vcdfile + (p_pos - psz_cuefile + 1), filename );
+ } else psz_vcdfile = strdup( filename );
+ msg_Dbg( p_this,"using vcd image file: %s", psz_vcdfile );
+ p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
O_RDONLY | O_NONBLOCK | O_BINARY, 0666 );
+ }
+ b_found = true;
+ default:
+ break;
+ }
}
if( p_vcddev->i_vcdimage_handle == -1)
- {
- i_ret = -1;
goto error;
- }
- else i_ret = 0;
/* Try to parse the i_tracks and p_sectors info so we can just forget
* about the cuefile */
- if( i_ret == 0 )
+ size_t i_tracks = 0;
+
+ while( fgets( line, 1024, cuefile ) )
{
- int p_sectors[100];
- int i_tracks = 0;
- int i_num;
- char psz_dummy[10];
+ /* look for a TRACK line */
+ char psz_dummy[9];
+ if( !sscanf( line, "%9s", psz_dummy ) || strcmp(psz_dummy, "TRACK") )
+ continue;
+ /* look for an INDEX line */
while( fgets( line, 1024, cuefile ) )
{
- /* look for a TRACK line */
- if( !sscanf( line, "%9s", psz_dummy ) ||
- strcmp(psz_dummy, "TRACK") )
- continue;
-
- /* look for an INDEX line */
- while( fgets( line, 1024, cuefile ) )
- {
- int i_min, i_sec, i_frame;
+ int i_num, i_min, i_sec, i_frame;
- if( (sscanf( line, "%9s %2u %2u:%2u:%2u", psz_dummy, &i_num,
- &i_min, &i_sec, &i_frame ) != 5) || (i_num != 1) )
- continue;
+ if( (sscanf( line, "%*9s %2u %2u:%2u:%2u", &i_num,
+ &i_min, &i_sec, &i_frame ) != 4) || (i_num != 1) )
+ continue;
- i_tracks++;
- p_sectors[i_tracks - 1] = MSF_TO_LBA(i_min, i_sec, i_frame);
- msg_Dbg( p_this, "vcd track %i begins at sector:%i",
- i_tracks - 1, p_sectors[i_tracks - 1] );
- break;
- }
+ int *buf = realloc (p_sectors, (i_tracks + 1) * sizeof (int));
+ if (buf == NULL)
+ goto error;
+ p_sectors = buf;
+ p_sectors[i_tracks] = MSF_TO_LBA(i_min, i_sec, i_frame);
+ msg_Dbg( p_this, "vcd track %i begins at sector:%i",
+ (int)i_tracks, (int)p_sectors[i_tracks] );
+ i_tracks++;
+ break;
}
-
- /* fill in the last entry */
- p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END)
- / VCD_SECTOR_SIZE;
- msg_Dbg( p_this, "vcd track %i, begins at sector:%i",
- i_tracks, p_sectors[i_tracks] );
- p_vcddev->i_tracks = i_tracks;
- p_vcddev->p_sectors = malloc( (i_tracks + 1) * sizeof(int) );
- memcpy( p_vcddev->p_sectors, p_sectors, (i_tracks + 1) * sizeof(int) );
-
}
+ /* fill in the last entry */
+ int *buf = realloc (p_sectors, (i_tracks + 1) * sizeof (int));
+ if (buf == NULL)
+ goto error;
+ p_sectors = buf;
+ p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END)
+ / VCD_SECTOR_SIZE;
+ msg_Dbg( p_this, "vcd track %i, begins at sector:%i",
+ (int)i_tracks, (int)p_sectors[i_tracks] );
+ p_vcddev->i_tracks = ++i_tracks;
+ p_vcddev->p_sectors = p_sectors;
+ i_ret = 0;
+
error:
if( cuefile ) fclose( cuefile );
+ free( p_sectors );
free( psz_cuefile );
free( psz_vcdfile );
****************************************************************************/
static void CloseVCDImage( vlc_object_t * p_this, vcddev_t *p_vcddev )
{
+ VLC_UNUSED( p_this );
if( p_vcddev->i_vcdimage_handle != -1 )
close( p_vcddev->i_vcdimage_handle );
else
buf_len = CFDataGetLength( data ) + 1;
range = CFRangeMake( 0, buf_len );
- if( ( pTOC = (CDTOC *)malloc( buf_len ) ) != NULL )
+ if( ( pTOC = malloc( buf_len ) ) != NULL )
{
CFDataGetBytes( data, range, (u_char *)pTOC );
}
}
#endif /* WIN32 */
+
+/* */
+static void astrcat( char **ppsz_dst, char *psz_src )
+{
+ char *psz_old = *ppsz_dst;
+
+ if( !psz_old )
+ {
+ *ppsz_dst = strdup( psz_src );
+ }
+ else if( psz_src )
+ {
+ if( asprintf( ppsz_dst, "%s%s", psz_old, psz_src ) < 0 )
+ *ppsz_dst = psz_old;
+ else
+ free( psz_old );
+ }
+}
+
+/* */
+static int CdTextParse( vlc_meta_t ***ppp_tracks, int *pi_tracks,
+ const uint8_t *p_buffer, int i_buffer )
+{
+ char *pppsz_info[128][0x10];
+ int i_track_last = -1;
+ if( i_buffer < 4 )
+ return -1;
+
+ memset( pppsz_info, 0, sizeof(pppsz_info) );
+
+ for( int i = 0; i < (i_buffer-4)/18; i++ )
+ {
+ const uint8_t *p_block = &p_buffer[4 + 18*i];
+ char psz_text[12+1];
+
+ const int i_pack_type = p_block[0];
+ if( i_pack_type < 0x80 || i_pack_type > 0x8f )
+ continue;
+
+ const int i_track_number = (p_block[1] >> 0)&0x7f;
+ const int i_extension_flag = ( p_block[1] >> 7)& 0x01;
+ if( i_extension_flag )
+ continue;
+
+ //const int i_sequence_number = p_block[2];
+ //const int i_charater_position = (p_block[3] >> 0) &0x0f;
+ //const int i_block_number = (p_block[3] >> 4) &0x07;
+ /* TODO unicode support
+ * I need a sample */
+ //const int i_unicode = ( p_block[3] >> 7)&0x01;
+ //const int i_crc = (p_block[4+12] << 8) | (p_block[4+13] << 0);
+
+ /* */
+ memcpy( psz_text, &p_block[4], 12 );
+ psz_text[12] = '\0';
+
+ /* */
+ int i_track = i_track_number;
+ char *psz_track = &psz_text[0];
+ while( i_track <= 127 && psz_track < &psz_text[12] )
+ {
+ //fprintf( stderr, "t=%d psz_track=%p end=%p", i_track, psz_track, &psz_text[12] );
+ if( *psz_track )
+ {
+ astrcat( &pppsz_info[i_track][i_pack_type-0x80], psz_track );
+ i_track_last = __MAX( i_track_last, i_track );
+ }
+
+ i_track++;
+ psz_track += 1 + strlen(psz_track);
+ }
+ }
+
+ if( i_track_last < 0 )
+ return -1;
+
+ vlc_meta_t **pp_tracks = calloc( i_track_last+1, sizeof(*pp_tracks) );
+ if( !pp_tracks )
+ goto exit;
+
+ for( int j = 0; j < 0x10; j++ )
+ {
+ for( int i = 0; i <= i_track_last; i++ )
+ {
+ /* */
+ EnsureUTF8( pppsz_info[i][j] );
+
+ /* */
+ const char *psz_default = pppsz_info[0][j];
+ const char *psz_value = pppsz_info[i][j];
+
+ if( !psz_value && !psz_default )
+ continue;
+ vlc_meta_t *p_track = pp_tracks[i];
+ if( !p_track )
+ {
+ p_track = pp_tracks[i] = vlc_meta_New();
+ if( !p_track )
+ continue;
+ }
+ switch( j )
+ {
+ case 0x00: /* Album/Title */
+ if( i == 0 )
+ {
+ vlc_meta_SetAlbum( p_track, psz_value );
+ }
+ else
+ {
+ if( psz_value )
+ vlc_meta_SetTitle( p_track, psz_value );
+ if( psz_default )
+ vlc_meta_SetAlbum( p_track, psz_default );
+ }
+ break;
+ case 0x01: /* Performer */
+ vlc_meta_SetArtist( p_track, psz_value ?: psz_default );
+ break;
+ case 0x05: /* Messages */
+ vlc_meta_SetDescription( p_track, psz_value ?: psz_default );
+ break;
+ case 0x07: /* Genre */
+ vlc_meta_SetGenre( p_track, psz_value ?: psz_default );
+ break;
+ /* FIXME unsupported:
+ * 0x02: songwriter
+ * 0x03: composer
+ * 0x04: arrenger
+ * 0x06: disc id */
+ }
+ }
+ }
+ /* */
+exit:
+ for( int j = 0; j < 0x10; j++ )
+ for( int i = 0; i <= i_track_last; i++ )
+ free( pppsz_info[i][j] );
+
+ *ppp_tracks = pp_tracks;
+ *pi_tracks = i_track_last+1;
+ return pp_tracks ? 0 : -1;
+}
+
+#if defined( __APPLE__ ) || \
+ defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H ) || \
+ defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
+static int CdTextRead( vlc_object_t *p_object, const vcddev_t *p_vcddev,
+ uint8_t **pp_buffer, int *pi_buffer )
+{
+ VLC_UNUSED( p_object );
+ return -1;
+}
+#elif defined( WIN32 )
+static int CdTextRead( vlc_object_t *p_object, const vcddev_t *p_vcddev,
+ uint8_t **pp_buffer, int *pi_buffer )
+{
+ if( p_vcddev->hASPI )
+ {
+ msg_Err( p_object, "mode ASPI unsupported for CD-TEXT" );
+ return -1;
+ }
+
+ CDROM_READ_TOC_EX TOCEx;
+ memset(&TOCEx, 0, sizeof(TOCEx));
+ TOCEx.Format = CDROM_READ_TOC_EX_FORMAT_CDTEXT;
+
+ const int i_header_size = __MAX( 4, MINIMUM_CDROM_READ_TOC_EX_SIZE );
+ uint8_t header[i_header_size];
+ DWORD i_read;
+ if( !DeviceIoControl( p_vcddev->h_device_handle, IOCTL_CDROM_READ_TOC_EX,
+ &TOCEx, sizeof(TOCEx), header, i_header_size, &i_read, 0 ) )
+ return -1;
+
+ const int i_text = 2 + (header[0] << 8) + header[1];
+ if( i_text <= 4 )
+ return -1;
+
+ /* Read complete CD-TEXT */
+ uint8_t *p_text = calloc( 1, i_text );
+ if( !p_text )
+ return VLC_EGENERIC;
+
+ if( !DeviceIoControl( p_vcddev->h_device_handle, IOCTL_CDROM_READ_TOC_EX,
+ &TOCEx, sizeof(TOCEx), p_text, i_text, &i_read, 0 ) )
+ {
+ free( p_text );
+ return VLC_EGENERIC;
+ }
+
+ /* */
+ *pp_buffer = p_text;
+ *pi_buffer = i_text;
+ return VLC_SUCCESS;
+}
+#else
+static int CdTextRead( vlc_object_t *p_object, const vcddev_t *p_vcddev,
+ uint8_t **pp_buffer, int *pi_buffer )
+{
+ VLC_UNUSED( p_object );
+
+ if( p_vcddev->i_device_handle == -1 )
+ return -1;
+
+ struct cdrom_generic_command gc;
+ uint8_t header[4];
+
+ /* Read CD-TEXT size */
+ memset( header, 0, sizeof(header) );
+ memset( &gc, 0, sizeof(gc) );
+ gc.cmd[0] = 0x43; /* Read TOC */
+ gc.cmd[1] = 0x02; /* MSF */
+ gc.cmd[2] = 5; /* CD-Text */
+ gc.cmd[7] = ( sizeof(header) >> 8 ) & 0xff;
+ gc.cmd[8] = ( sizeof(header) >> 0 ) & 0xff;
+
+ gc.buflen = sizeof(header);
+ gc.buffer = header;
+ gc.data_direction = CGC_DATA_READ;
+ gc.timeout = 1000;
+
+ if( ioctl( p_vcddev->i_device_handle, CDROM_SEND_PACKET, &gc ) == -1 )
+ return VLC_EGENERIC;
+
+ /* If the size is less than 4 it is an error, if it 4 then
+ * it means no text data */
+ const int i_text = 2 + (header[0] << 8) + header[1];
+ if( i_text <= 4 )
+ return VLC_EGENERIC;
+
+ /* Read complete CD-TEXT */
+ uint8_t *p_text = calloc( 1, i_text );
+ if( !p_text )
+ return VLC_EGENERIC;
+
+ memset( &gc, 0, sizeof(gc) );
+ gc.cmd[0] = 0x43; /* Read TOC */
+ gc.cmd[1] = 0x02; /* MSF */
+ gc.cmd[2] = 5; /* CD-Text */
+ gc.cmd[7] = ( i_text >> 8 ) & 0xff;
+ gc.cmd[8] = ( i_text >> 0 ) & 0xff;
+
+ gc.buflen = i_text;
+ gc.buffer = p_text;
+ gc.data_direction = CGC_DATA_READ;
+ gc.timeout = 1000;
+
+ if( ioctl( p_vcddev->i_device_handle, CDROM_SEND_PACKET, &gc ) == -1 )
+ {
+ free( p_text );
+ return VLC_EGENERIC;
+ }
+
+ /* */
+ *pp_buffer = p_text;
+ *pi_buffer = i_text;
+ return VLC_SUCCESS;
+}
+#endif
+
+int ioctl_GetCdText( vlc_object_t *p_object, const vcddev_t *p_vcddev,
+ vlc_meta_t ***ppp_tracks, int *pi_tracks )
+{
+ uint8_t *p_text;
+ int i_text;
+
+ if( p_vcddev->i_vcdimage_handle != -1 )
+ return -1;
+
+ if( CdTextRead( p_object, p_vcddev, &p_text, &i_text ) )
+ return -1;
+
+ CdTextParse( ppp_tracks, pi_tracks, p_text, i_text );
+ free( p_text );
+ return 0;
+}
+
projects / vlc / blobdiff