Changeset 66197 in vbox for trunk/src

Timestamp:

Mar 22, 2017 2:23:28 PM (8 years ago)

Author:

vboxsync

Message:

Storage/CUE: Fixes, convert endianness for audio tracks to big endian

File:

• trunk/src/VBox/Storage/CUE.cpp (modified) (9 diffs)

trunk/src/VBox/Storage/CUE.cpp

@@ -27 +27 @@
 #include <VBox/scsiinline.h>
 #include <iprt/assert.h>
+#include <iprt/asm.h>
 #include <iprt/alloc.h>
 #include <iprt/cdefs.h>
@@ -72 +73 @@
     /** BINARY */
     CUEKEYWORD_BINARY,
+    /** MOTOROLA */
+    CUEKEYWORD_MOTOROLA,
     /** WAVE */
     CUEKEYWORD_WAVE,
@@ -210 +213 @@
     /** Pointer to our internal region list. */
     PVDREGIONLIST       pRegionList;
+    /** Flag whether the backing file is little (BINARY) or big (MOTOROLA) endian. */
+    bool                fLittleEndian;
 } CUEIMAGE, *PCUEIMAGE;
 
@@ -1029 +1034 @@
             {
                 if (cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_BINARY))
+                {
+                    pThis->fLittleEndian = true;
                     rc = cueParseTrackList(pThis, pTokenizer);
+                }
+                else if (cueTokenizerSkipIfIsKeywordEqual(pTokenizer, CUEKEYWORD_MOTOROLA))
+                {
+                    pThis->fLittleEndian = false;
+                    rc = cueParseTrackList(pThis, pTokenizer);
+                }
                 else
                     rc = vdIfError(pThis->pIfError, VERR_NOT_SUPPORTED, RT_SRC_POS,
@@ -1133 +1146 @@
         {
             cTracks++;
-            pRegionPrev->cRegionBlocksOrBytes = pRegionPrev->cbBlock * pRegion->offRegion;
+            uint64_t cBlocks = pRegion->offRegion - (pRegionPrev->offRegion / pRegionPrev->cbBlock);
+            pRegionPrev->cRegionBlocksOrBytes = pRegionPrev->cbBlock * cBlocks;
             offDisk += pRegionPrev->cRegionBlocksOrBytes;
 
@@ -1491 +1505 @@
         Assert(!(cbToRead % pRegion->cbBlock));
 
-        rc = vdIfIoIntFileReadUser(pThis->pIfIo, pThis->pStorageData, uOffset,
-                                   pIoCtx, cbToRead);
-        if (RT_SUCCESS(rc))
+        /* Need to convert audio data samples to big endian. */
+        if (   pRegion->enmDataForm == VDREGIONDATAFORM_CDDA
+            && pThis->fLittleEndian)
+        {
             *pcbActuallyRead = cbToRead;
+
+            while (cbToRead)
+            {
+                RTSGSEG Segment;
+                unsigned cSegments = 1;
+                size_t cbSeg = 0;
+
+                cbSeg = vdIfIoIntIoCtxSegArrayCreate(pThis->pIfIo, pIoCtx, &Segment,
+                                                     &cSegments, cbToRead);
+
+                rc = vdIfIoIntFileReadSync(pThis->pIfIo, pThis->pStorageData, uOffset, Segment.pvSeg, cbSeg);
+                if (RT_FAILURE(rc))
+                    break;
+
+                uint16_t *pu16Buf = (uint16_t *)Segment.pvSeg;
+                for (uint32_t i = 0; i < cbSeg / sizeof(uint16_t); i++)
+                {
+                    *pu16Buf = RT_BSWAP_U16(*pu16Buf);
+                    pu16Buf++;
+                }
+
+                cbToRead -= RT_MIN(cbToRead, cbSeg);
+                uOffset += cbSeg;
+            }
+        }
+        else
+        {
+            rc = vdIfIoIntFileReadUser(pThis->pIfIo, pThis->pStorageData, uOffset,
+                                       pIoCtx, cbToRead);
+            if (RT_SUCCESS(rc))
+                *pcbActuallyRead = cbToRead;
+        }
     }
     else
@@ -1561 +1608 @@
     LogFlowFunc(("pBackendData=%#p\n", pBackendData));
     PCUEIMAGE pThis = (PCUEIMAGE)pBackendData;
-    uint64_t cb = 0;
 
     AssertPtrReturn(pThis, 0);
+
+    PCVDREGIONDESC pRegion = &pThis->pRegionList->aRegions[pThis->pRegionList->cRegions - 1];
+    uint64_t cb = pRegion->offRegion + pRegion->cRegionBlocksOrBytes;
 
     LogFlowFunc(("returns %llu\n", cb));
@@ -1580 +1629 @@
     if (pThis->pStorage)
     {
-        int rc = vdIfIoIntFileGetSize(pThis->pIfIo, pThis->pStorage, &cbFile);
+        int rc = vdIfIoIntFileGetSize(pThis->pIfIo, pThis->pStorageData, &cbFile);
         if (RT_FAILURE(rc))
             cbFile = 0; /* Make sure it is 0 */
@@ -1941 +1990 @@
     "CUE",
     /* uBackendCaps */
-    VD_CAP_FILE | VD_CAP_ASYNC | VD_CAP_VFS,
+    VD_CAP_FILE | VD_CAP_VFS,
     /* paFileExtensions */
     s_aCueFileExtensions,