[MPlayer-cvslog] r25439 - in trunk/stream: vcd_read.h vcd_read_fbsd.h

[ulion]

Author: ulion
Date: Mon Dec 17 16:24:40 2007
New Revision: 25439

Log:
Caching toc header in vcd private structure for later use.


Modified:
   trunk/stream/vcd_read.h
   trunk/stream/vcd_read_fbsd.h

Modified: trunk/stream/vcd_read.h
==============================================================================
--- trunk/stream/vcd_read.h	(original)
+++ trunk/stream/vcd_read.h	Mon Dec 17 16:24:40 2007
@@ -17,6 +17,7 @@ struct mp_vcd_priv_st {
   int fd;
   struct cdrom_tocentry entry;
   char buf[VCD_SECTOR_SIZE];
+  struct cdrom_tochdr tochdr;
 };
 
 static inline void vcd_set_msf(mp_vcd_priv_t* vcd, unsigned int sect){
@@ -45,13 +46,8 @@ int vcd_seek_to_track(mp_vcd_priv_t* vcd
 }
 
 int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){
-  struct cdrom_tochdr tochdr;
-  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;
+  vcd->entry.cdte_track  = track<vcd->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;
@@ -118,6 +114,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
     }
   vcd = malloc(sizeof(mp_vcd_priv_t));
   vcd->fd = fd;
+  vcd->tochdr = tochdr;
   return vcd;
 }
 

Modified: trunk/stream/vcd_read_fbsd.h
==============================================================================
--- trunk/stream/vcd_read_fbsd.h	(original)
+++ trunk/stream/vcd_read_fbsd.h	Mon Dec 17 16:24:40 2007
@@ -40,6 +40,7 @@ typedef struct mp_vcd_priv_st {
 #else
   cdsector_t buf;
 #endif
+  struct ioc_toc_header tochdr;
 } mp_vcd_priv_t;
 
 static inline void
@@ -120,13 +121,8 @@ vcd_seek_to_track(mp_vcd_priv_t* vcd, in
 int
 vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
 {
-  struct ioc_toc_header tochdr;
-  if (ioctl(vcd->fd, CDIOREADTOCHEADER, &tochdr) == -1) {
-    mp_msg(MSGT_STREAM,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
-    return -1;
-  }
   if (!read_toc_entry(vcd,
-          track < tochdr.ending_track ? track + 1 : CDROM_LEADOUT))
+          track < vcd->tochdr.ending_track ? track + 1 : CDROM_LEADOUT))
     return -1;
   return VCD_SECTOR_DATA * vcd_get_msf(vcd);
 }
@@ -145,6 +141,7 @@ vcd_read_toc(int fd)
   mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
   vcd = malloc(sizeof(mp_vcd_priv_t));
   vcd->fd = fd;
+  vcd->tochdr = tochdr;
   for (i = tochdr.starting_track; i <= tochdr.ending_track + 1; i++) {
     if (!read_toc_entry(vcd,
           i <= tochdr.ending_track ? i : CDROM_LEADOUT)) {