ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CHD: Check for extra frames 

If the frame count is not dividable by 4, there are extra frames added to keep a padding.
This is true for F355 (450 frames -> 2 extra frames) and others.

Also move CD_TRACK_PADDING to chd.cpp to work around problems with including from C and C++.
This commit is contained in:
Christoph "baka0815" Schwerdtfeger 2018-09-22 15:27:08 +02:00
parent 14260594ea
commit 1d7ecda2af
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/deps/chdr/cdrom.h
View File

@ -20,9 +20,6 @@
CONSTANTS CONSTANTS
***************************************************************************/ ***************************************************************************/
/* tracks are padded to a multiple of this many frames */
extern const uint32_t CD_TRACK_PADDING;
#define CD_MAX_TRACKS (99) /* AFAIK the theoretical limit */ #define CD_MAX_TRACKS (99) /* AFAIK the theoretical limit */
#define CD_MAX_SECTOR_DATA (2352) #define CD_MAX_SECTOR_DATA (2352)
#define CD_MAX_SUBCODE_DATA (96) #define CD_MAX_SUBCODE_DATA (96)

28
core/imgread/chd.cpp
View File

@ -2,6 +2,9 @@
#include "deps/chdr/chd.h" #include "deps/chdr/chd.h"
/* tracks are padded to a multiple of this many frames */
const uint32_t CD_TRACK_PADDING = 4;
struct CHDDisc : Disc struct CHDDisc : Disc
{ {
chd_file* chd; chd_file* chd;
@ -91,10 +94,11 @@ bool CHDDisc::TryOpen(const wchar* file)
u8 flags; u8 flags;
char temp[512]; char temp[512];
u32 temp_len; u32 temp_len;
u32 total_frames=150; u32 total_frames = 150;
u32 total_secs=0; u32 total_secs = 0;
u32 total_hunks=0; u32 total_hunks = 0;
int extraframes = 0;
for(;;) for(;;)
{ {
@ -137,15 +141,17 @@ bool CHDDisc::TryOpen(const wchar* file)
} }
printf("%s\n",temp); printf("%s\n",temp);
Track t; Track t;
t.StartFAD=total_frames; t.StartFAD = total_frames + extraframes;
total_frames+=frames; int padded = (frames + CD_TRACK_PADDING - 1) / CD_TRACK_PADDING;
t.EndFAD=total_frames-1; extraframes += (padded * CD_TRACK_PADDING) - frames;
t.ADDR=0; total_frames += frames;
t.CTRL=strcmp(type,"AUDIO")==0?0:4; t.EndFAD = total_frames - 1 + extraframes;
t.file = new CHDTrack(this,t.StartFAD,total_hunks,strcmp(type,"MODE1")?2352:2048); t.ADDR = 0;
t.CTRL = strcmp(type,"AUDIO") == 0 ? 0 : 4;
t.file = new CHDTrack(this, t.StartFAD, total_hunks, strcmp(type,"MODE1") ? 2352 : 2048);
total_hunks+=frames/sph; total_hunks += frames / sph;
if (frames%sph) if (frames % sph)
total_hunks++; total_hunks++;
tracks.push_back(t); tracks.push_back(t);