summaryrefslogtreecommitdiffstats
path: root/libmpdemux/vcd_read.h
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/vcd_read.h')
-rw-r--r--libmpdemux/vcd_read.h126
1 files changed, 69 insertions, 57 deletions
diff --git a/libmpdemux/vcd_read.h b/libmpdemux/vcd_read.h
index d58946cb31..7d34d569f5 100644
--- a/libmpdemux/vcd_read.h
+++ b/libmpdemux/vcd_read.h
@@ -1,68 +1,80 @@
//=================== VideoCD ==========================
#if defined(linux) || defined(sun) || defined(__bsdi__)
+typedef struct mp_vcd_priv_st mp_vcd_priv_t;
+
#if defined(linux)
#include <linux/cdrom.h>
#elif defined(sun)
#include <sys/cdio.h>
-static int sun_vcd_read(int, int*);
+static int sun_vcd_read(mp_vcd_priv_t*, int*);
#elif defined(__bsdi__)
#include <dvd.h>
#endif
+struct mp_vcd_priv_st {
+ int fd;
+ struct cdrom_tocentry entry;
+ char buf[VCD_SECTOR_SIZE];
+};
-static struct cdrom_tocentry vcd_entry;
-
-static inline void vcd_set_msf(unsigned int sect){
- vcd_entry.cdte_addr.msf.frame=sect%75;
+static inline void vcd_set_msf(mp_vcd_priv_t* vcd, unsigned int sect){
+ vcd->entry.cdte_addr.msf.frame=sect%75;
sect=sect/75;
- vcd_entry.cdte_addr.msf.second=sect%60;
+ vcd->entry.cdte_addr.msf.second=sect%60;
sect=sect/60;
- vcd_entry.cdte_addr.msf.minute=sect;
+ vcd->entry.cdte_addr.msf.minute=sect;
}
-static inline unsigned int vcd_get_msf(){
- return vcd_entry.cdte_addr.msf.frame +
- (vcd_entry.cdte_addr.msf.second+
- vcd_entry.cdte_addr.msf.minute*60)*75;
+static inline unsigned int vcd_get_msf(mp_vcd_priv_t* vcd){
+ return vcd->entry.cdte_addr.msf.frame +
+ (vcd->entry.cdte_addr.msf.second+
+ vcd->entry.cdte_addr.msf.minute*60)*75;
}
-int vcd_seek_to_track(int fd,int track){
- vcd_entry.cdte_format = CDROM_MSF;
- vcd_entry.cdte_track = track;
- if (ioctl(fd, CDROMREADTOCENTRY, &vcd_entry)) {
- perror("ioctl dif1");
+int vcd_seek_to_track(mp_vcd_priv_t* vcd,int track){
+ vcd->entry.cdte_format = CDROM_MSF;
+ vcd->entry.cdte_track = track;
+ if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {
+ mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
return -1;
}
- return VCD_SECTOR_DATA*vcd_get_msf();
+ return VCD_SECTOR_DATA*vcd_get_msf(vcd);
}
-int vcd_get_track_end(int fd,int track){
+int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){
struct cdrom_tochdr tochdr;
- if (ioctl(fd,CDROMREADTOCHDR,&tochdr)==-1)
- { perror("read CDROM toc header: "); return -1; }
- vcd_entry.cdte_format = CDROM_MSF;
- vcd_entry.cdte_track = track<tochdr.cdth_trk1?(track+1):CDROM_LEADOUT;
- if (ioctl(fd, CDROMREADTOCENTRY, &vcd_entry)) {
- perror("ioctl dif2");
+ if (ioctl(vcd->fd,CDROMREADTOCHDR,&tochdr)==-1) {
+ mp_msg(MSGT_STREAM,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
+ return -1;
+ }
+ vcd->entry.cdte_format = CDROM_MSF;
+ vcd->entry.cdte_track = track<tochdr.cdth_trk1?(track+1):CDROM_LEADOUT;
+ if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {
+ mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
return -1;
}
- return VCD_SECTOR_DATA*vcd_get_msf();
+ return VCD_SECTOR_DATA*vcd_get_msf(vcd);
}
-void vcd_read_toc(int fd){
+mp_vcd_priv_t* vcd_read_toc(int fd){
struct cdrom_tochdr tochdr;
+ mp_vcd_priv_t* vcd;
int i;
- if (ioctl(fd,CDROMREADTOCHDR,&tochdr)==-1)
- { perror("read CDROM toc header: "); return; }
+ if (ioctl(fd,CDROMREADTOCHDR,&tochdr)==-1) {
+ mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
+ return NULL;
+ }
for (i=tochdr.cdth_trk0 ; i<=tochdr.cdth_trk1 ; i++){
struct cdrom_tocentry tocentry;
tocentry.cdte_track = i;
tocentry.cdte_format = CDROM_MSF;
- if (ioctl(fd,CDROMREADTOCENTRY,&tocentry)==-1)
- { perror("read CDROM toc entry: "); return; }
+ if (ioctl(fd,CDROMREADTOCENTRY,&tocentry)==-1) {
+ mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno));
+ return NULL;
+ }
mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d mode: %d\n",
(int)tocentry.cdte_track,
@@ -75,31 +87,31 @@ void vcd_read_toc(int fd){
(int)tocentry.cdte_datamode
);
}
+ vcd = malloc(sizeof(mp_vcd_priv_t));
+ vcd->fd = fd;
+ return vcd;
}
-
-static char vcd_buf[VCD_SECTOR_SIZE];
-
-static int vcd_read(int fd,char *mem){
+static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
#if defined(linux) || defined(__bsdi__)
- memcpy(vcd_buf,&vcd_entry.cdte_addr.msf,sizeof(struct cdrom_msf));
- if(ioctl(fd,CDROMREADRAW,vcd_buf)==-1) return 0; // EOF?
- memcpy(mem,&vcd_buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
+ memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf));
+ if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF?
+ memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
#elif defined(sun)
{
int offset;
- if (sun_vcd_read(fd, &offset) <= 0) return 0;
- memcpy(mem,&vcd_buf[offset],VCD_SECTOR_DATA);
+ if (sun_vcd_read(vcd->fd, &offset) <= 0) return 0;
+ memcpy(mem,&vcd->buf[offset],VCD_SECTOR_DATA);
}
#endif
- vcd_entry.cdte_addr.msf.frame++;
- if (vcd_entry.cdte_addr.msf.frame==75){
- vcd_entry.cdte_addr.msf.frame=0;
- vcd_entry.cdte_addr.msf.second++;
- if (vcd_entry.cdte_addr.msf.second==60){
- vcd_entry.cdte_addr.msf.second=0;
- vcd_entry.cdte_addr.msf.minute++;
+ vcd->entry.cdte_addr.msf.frame++;
+ if (vcd->entry.cdte_addr.msf.frame==75){
+ vcd->entry.cdte_addr.msf.frame=0;
+ vcd->entry.cdte_addr.msf.second++;
+ if (vcd->entry.cdte_addr.msf.second==60){
+ vcd->entry.cdte_addr.msf.second=0;
+ vcd->entry.cdte_addr.msf.minute++;
}
}
@@ -116,35 +128,35 @@ static int vcd_read(int fd,char *mem){
#define SUN_SCSIREAD 3
#define SUN_VCDREAD SUN_SCSIREAD
-static int sun_vcd_read(int fd, int *offset)
+static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset)
{
#if SUN_VCDREAD == SUN_XAREAD
struct cdrom_cdxa cdxa;
- cdxa.cdxa_addr = vcd_get_msf();
+ cdxa.cdxa_addr = vcd_get_msf(vcd);
cdxa.cdxa_length = 1;
- cdxa.cdxa_data = vcd_buf;
+ cdxa.cdxa_data = vcd->buf;
cdxa.cdxa_format = CDROM_XA_SECTOR_DATA;
if(ioctl(fd,CDROMCDXA,&cdxa)==-1) {
- perror("CDROMCDXA");
+ mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMCDXA: %s\n",strerror(errno));
return 0;
}
*offset = 0;
#elif SUN_VCDREAD == SUN_MODE2READ
struct cdrom_read cdread;
- cdread.cdread_lba = 4*vcd_get_msf();
- cdread.cdread_bufaddr = vcd_buf;
+ cdread.cdread_lba = 4*vcd_get_msf(vcd);
+ cdread.cdread_bufaddr = vcd->buf;
cdread.cdread_buflen = 2336;
if(ioctl(fd,CDROMREADMODE2,&cdread)==-1) {
- perror("CDROMREADMODE2");
+ mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMREADMODE2: %s\n",strerror(errno));
return 0;
}
*offset = 8;
#elif SUN_VCDREAD == SUN_SCSIREAD
struct uscsi_cmd sc;
union scsi_cdb cdb;
- int lba = vcd_get_msf();
+ int lba = vcd_get_msf(vcd);
int blocks = 1;
int sector_type;
int sync, header_code, user_data, edc_ecc, error_field;
@@ -179,16 +191,16 @@ static int sun_vcd_read(int fd, int *offset)
sc.uscsi_cdb = (caddr_t)&cdb;
sc.uscsi_cdblen = 12;
- sc.uscsi_bufaddr = vcd_buf;
+ sc.uscsi_bufaddr = vcd->buf;
sc.uscsi_buflen = 2336;
sc.uscsi_flags = USCSI_ISOLATE | USCSI_READ;
sc.uscsi_timeout = 20;
if (ioctl(fd, USCSICMD, &sc)) {
- perror("USCSICMD: READ CD");
+ mp_msg(MSGT_STREAM,MSGL_ERR,"USCSICMD: READ CD: %s\n",strerror(errno));
return -1;
}
if (sc.uscsi_status) {
- fprintf(stderr, "scsi command failed with status %d\n", sc.uscsi_status);
+ mp_msg(MSGT_STREAM,MSGL_ERR,"scsi command failed with status %d\n", sc.uscsi_status);
return -1;
}
*offset = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:51:27 +0000