Mercurial > mplayer.hg
view libmpdemux/vcd_read_darwin.h @ 17279:600d0b740940
"Currently mplayer looks for only one MP3 frame sync. The attached
patch makes it to look for two consecutive valid MP3 frame headers,
reducing the probability of false positives, which causes Bug 380.
Funny that the fix is so simple. Seems that someone has forgotten to
initialize MP3_resync correctly.
Also this is the recommended way to sync MP3 frames. See
http://www.dv.co.yu/mpgscript/mpeghdr.htm. "
Original thread:
Date: Dec 31, 2005 10:15 AM
Subject: [MPlayer-dev-eng] [PATCH] Try twice when searching for MP3 frame header, fixes Bug 380
author | gpoirier |
---|---|
date | Sat, 31 Dec 2005 18:56:35 +0000 |
parents | aa15d627a00b |
children | 4231482179b6 |
line wrap: on
line source
#include <sys/types.h> #include <CoreFoundation/CFBase.h> #include <IOKit/IOKitLib.h> #include <IOKit/storage/IOCDTypes.h> #include <IOKit/storage/IOCDMedia.h> #include <IOKit/storage/IOCDMediaBSDClient.h> //=================== VideoCD ========================== #define CDROM_LEADOUT 0xAA typedef struct { uint8_t sync [12]; uint8_t header [4]; uint8_t subheader [8]; uint8_t data [2324]; uint8_t spare [4]; } cdsector_t; typedef struct mp_vcd_priv_st { int fd; dk_cd_read_track_info_t entry; CDMSF msf; cdsector_t buf; } mp_vcd_priv_t; static inline void vcd_set_msf(mp_vcd_priv_t* vcd, unsigned int sect) { vcd->msf.frame=sect%75; sect=sect/75; vcd->msf.second=sect%60; sect=sect/60; vcd->msf.minute=sect; } static inline unsigned int vcd_get_msf(mp_vcd_priv_t* vcd) { return vcd->msf.frame + (vcd->msf.second+ vcd->msf.minute*60)*75; return 0; } int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track) { dk_cd_read_track_info_t tocentry; struct CDTrackInfo entry; memset( &vcd->entry, 0, sizeof(vcd->entry)); vcd->entry.addressType = kCDTrackInfoAddressTypeTrackNumber; vcd->entry.address = track; vcd->entry.bufferLength = sizeof(entry); vcd->entry.buffer = &entry; if (ioctl(vcd->fd, DKIOCCDREADTRACKINFO, &vcd->entry)) { mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno)); return -1; } return VCD_SECTOR_DATA*vcd_get_msf(vcd); return -1; } int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) { dk_cd_read_disc_info_t tochdr; struct CDDiscInfo hdr; dk_cd_read_track_info_t tocentry; struct CDTrackInfo entry; //read toc header memset(&tochdr, 0, sizeof(tochdr)); tochdr.buffer = &hdr; tochdr.bufferLength = sizeof(hdr); if (ioctl(vcd->fd, DKIOCCDREADDISCINFO, &tochdr) < 0) { mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno)); return NULL; } //read track info memset( &vcd->entry, 0, sizeof(vcd->entry)); vcd->entry.addressType = kCDTrackInfoAddressTypeTrackNumber; vcd->entry.address = track<(hdr.lastTrackNumberInLastSessionLSB+1)?(track):CDROM_LEADOUT; vcd->entry.bufferLength = sizeof(entry); vcd->entry.buffer = &entry; if (ioctl(vcd->fd, DKIOCCDREADTRACKINFO, &vcd->entry)) { mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno)); return -1; } return VCD_SECTOR_DATA*vcd_get_msf(vcd); return -1; } mp_vcd_priv_t* vcd_read_toc(int fd) { dk_cd_read_disc_info_t tochdr; struct CDDiscInfo hdr; dk_cd_read_track_info_t tocentry; struct CDTrackInfo entry; CDMSF trackMSF; mp_vcd_priv_t* vcd; int i, min = 0, sec = 0, frame = 0; //read toc header memset(&tochdr, 0, sizeof(tochdr)); tochdr.buffer = &hdr; tochdr.bufferLength = sizeof(hdr); if (ioctl(fd, DKIOCCDREADDISCINFO, &tochdr) < 0) { mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno)); return NULL; } //print all track info if (identify) { mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", hdr.firstTrackNumberInLastSessionLSB); mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", hdr.lastTrackNumberInLastSessionLSB); } for (i=hdr.firstTrackNumberInLastSessionLSB ; i<=hdr.lastTrackNumberInLastSessionLSB + 1; i++) { memset( &tocentry, 0, sizeof(tocentry)); tocentry.addressType = kCDTrackInfoAddressTypeTrackNumber; tocentry.address = i<=hdr.lastTrackNumberInLastSessionLSB ? i : CDROM_LEADOUT; tocentry.bufferLength = sizeof(entry); tocentry.buffer = &entry; if (ioctl(fd,DKIOCCDREADTRACKINFO,&tocentry)==-1) { mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno)); return NULL; } trackMSF = CDConvertLBAToMSF(entry.trackStartAddress); //mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n", if (i<=hdr.lastTrackNumberInLastSessionLSB) mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d: format=%d %02d:%02d:%02d\n", (int)tocentry.address, //(int)tocentry.entry.addr_type, //(int)tocentry.entry.control, (int)tocentry.addressType, (int)trackMSF.minute, (int)trackMSF.second, (int)trackMSF.frame ); if (identify) { if (i > hdr.firstTrackNumberInLastSessionLSB) { min = trackMSF.minute - min; sec = trackMSF.second - sec; frame = trackMSF.frame - frame; if ( frame < 0 ) { frame += 75; sec --; } if ( sec < 0 ) { sec += 60; min --; } mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame); } min = trackMSF.minute; sec = trackMSF.second; frame = trackMSF.frame; } } vcd = malloc(sizeof(mp_vcd_priv_t)); vcd->fd = fd; vcd->msf = trackMSF; return vcd; return NULL; } static int vcd_read(mp_vcd_priv_t* vcd,char *mem) { if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE) != VCD_SECTOR_SIZE) return 0; // EOF? vcd->msf.frame++; if (vcd->msf.frame==75) { vcd->msf.frame=0; vcd->msf.second++; if (vcd->msf.second==60) { vcd->msf.second=0; vcd->msf.minute++; } } memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); return VCD_SECTOR_DATA; return 0; }