Changeset 87048 in vbox for trunk/src/VBox

Timestamp:

Dec 7, 2020 2:44:34 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141794

Message:

CUE, DevATA: Added support for MODE2/2352 tracks in CUE sheets and IDE/ATAPI emulation (see bugref:6975).

Location:

trunk/src/VBox

Files:

• Devices/Storage/DevATA.cpp (modified) (3 diffs)
• Storage/CUE.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -2003 +2003 @@
     int rc;
     uint64_t cbBlockRegion = 0;
+    VDREGIONDATAFORM enmDataForm;
 
     Assert(s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE);
@@ -2016 +2017 @@
 
     rc = pDevR3->pDrvMedia->pfnQueryRegionPropertiesForLba(pDevR3->pDrvMedia, iATAPILBA, NULL, NULL,
-                                                      &cbBlockRegion, NULL);
+                                                      &cbBlockRegion, &enmDataForm);
     if (RT_SUCCESS(rc))
     {
@@ -2069 +2070 @@
                 {
                     uint8_t abTmp[2352];
+                    uint8_t cbSkip;
+
                     rc = pDevR3->pDrvMedia->pfnRead(pDevR3->pDrvMedia, (uint64_t)i * 2352, &abTmp[0], 2352);
                     if (RT_FAILURE(rc))
                         break;
 
-                    memcpy(pbBuf, &abTmp[16], 2048);
+                    /* Mode 2 has an additional subheader before user data; we need to
+                     * skip 16 bytes for Mode 1 (sync + header) and 20 bytes for Mode 2       +
+                     * (sync + header + subheader).
+                     */
+                    switch (enmDataForm) {
+                    case VDREGIONDATAFORM_MODE2_2352:
+                    case VDREGIONDATAFORM_XA_2352:
+                        cbSkip = 24;
+                        break;
+                    case VDREGIONDATAFORM_MODE1_2352:
+                        cbSkip = 16;
+                        break;
+                    default:
+                        AssertMsgFailed(("Unexpected region form (%#u), using default skip value\n", enmDataForm));
+                        cbSkip = 16;
+                    }
+                    memcpy(pbBuf, &abTmp[cbSkip], 2048);
                     pbBuf += 2048;
                 }

trunk/src/VBox/Storage/CUE.cpp

@@ -96 +96 @@
     CUEKEYWORD_MODE1_2048,
     CUEKEYWORD_MODE1_2352,
+    CUEKEYWORD_MODE2_2352,
     CUEKEYWORD_AUDIO,
     CUEKEYWORD_REM
@@ -253 +254 @@
     {RT_STR_TUPLE("MODE1/2048"), CUEKEYWORD_MODE1_2048},
     {RT_STR_TUPLE("MODE1/2352"), CUEKEYWORD_MODE1_2352},
+    {RT_STR_TUPLE("MODE2/2352"), CUEKEYWORD_MODE2_2352},
     {RT_STR_TUPLE("AUDIO"),      CUEKEYWORD_AUDIO},
     {RT_STR_TUPLE("REM"),        CUEKEYWORD_REM}
@@ -960 +962 @@
                 if (   cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_AUDIO)
                     || cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_MODE1_2048)
-                    || cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_MODE1_2352))
+                    || cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_MODE1_2352)
+                    || cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_MODE2_2352))
                 {
                     /*
@@ -981 +984 @@
                                 pRegion->cbBlock     = 2352;
                                 pRegion->enmDataForm = VDREGIONDATAFORM_MODE1_2352;
+                            }
+                            else if (enmDataMode == CUEKEYWORD_MODE2_2352)
+                            {
+                                pRegion->cbBlock     = 2352;
+                                pRegion->enmDataForm = VDREGIONDATAFORM_MODE2_2352;
                             }
                             else if (enmDataMode == CUEKEYWORD_AUDIO)