Re: [Helix-client-dev] 24bit 96khz AIFF playback

? ../datatype/aiff/fileformat/Makefile
? ../datatype/aiff/fileformat/Umakefil.upp
? ../datatype/aiff/fileformat/rel
Index: ../datatype/aiff/fileformat/aiffplin.cpp
===================================================================
RCS file: /nexus/proj/InternetRadio/cvs/helix_cayenne_20070820/datatype/aiff/fileformat/aiffplin.cpp,v
retrieving revision 1.2
diff -u -r1.2 aiffplin.cpp
--- ../datatype/aiff/fileformat/aiffplin.cpp	7 Jul 2008 16:38:59 -0000	1.2
+++ ../datatype/aiff/fileformat/aiffplin.cpp	16 Jun 2010 16:12:10 -0000
@@ -55,6 +55,18 @@
 
 #include <hlxclib/math.h>
 
+// Reciva debug
+#include "../../../../debug_control.h"
+#include <stdio.h>
+#define PFX "aiffplin.cpp:"
+#ifdef RECIVA_DEBUG_ENABLE_AIFF
+#include "hxtick.h"
+#define DBG(_x) printf("[%ld] ", GetTickCount()); ((void)(_x));
+static int iPacketSentCount =0;
+#else
+#define DBG(_x)
+#endif
+
 const char* const AIFFFileFormat::zm_pDescription    = "Helix AIFF File Format Plugin";
 const char* const AIFFFileFormat::zm_pCopyright      = HXVER_COPYRIGHT;
 const char* const AIFFFileFormat::zm_pMoreInfoURL    = HXVER_MOREINFO;
@@ -66,7 +78,11 @@
 #define COMM_CHUNK_ID 0x434f4d4d /* 'COMM' */
 #define SSND_CHUNK_ID 0x53534e44 /* 'SSND' */
 
-#define PACKETSIZE 500
+// Was 500. 24 bit files were crashing helix
+// 750 seems to almost work for 24 bit files. 
+// But there are intermittent clicks during playback at 
+// roughly 1 second intervals on average (not equally spaced)
+#define PACKETSIZE 750
 
 HX_RESULT STDAPICALLTYPE AIFFFileFormat::HXCreateInstance
 (
@@ -118,10 +134,12 @@
     m_ulLastPacketEndTime(0),
     m_state(AS_Ready)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
 }
 
 AIFFFileFormat::~AIFFFileFormat()
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     HX_RELEASE(m_pContext);
     HX_RELEASE(m_pCommonClassFactory);
     HX_RELEASE(m_pRequest);
@@ -137,6 +155,7 @@
 STDMETHODIMP
 AIFFFileFormat::QueryInterface(REFIID riid, void**ppvObj)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if(IsEqualIID(riid, IID_IUnknown))
     {
         AddRef();
@@ -175,12 +194,14 @@
 STDMETHODIMP_(UINT32)
 AIFFFileFormat::AddRef()
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     return InterlockedIncrement(&m_lRefCount);
 }
 
 STDMETHODIMP_(UINT32)
 AIFFFileFormat::Release()
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if (InterlockedDecrement(&m_lRefCount) > 0)
     {
         return m_lRefCount;
@@ -197,6 +218,7 @@
 			      REF(const char*)pMoreInfoURL,
 			      REF(ULONG32) ulVersionNumber)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     bLoadMultiple = TRUE;
 
     pDescription = zm_pDescription;
@@ -210,6 +232,7 @@
 STDMETHODIMP
 AIFFFileFormat::InitPlugin(IUnknown* pContext)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     m_pContext = pContext;
     m_pContext->AddRef();
 
@@ -227,6 +250,7 @@
 				  REF(const char**) pFileExtensions,
 				  REF(const char**)pFileOpenNames)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     pFileMimeTypes = (const char**) zm_pFileMimeTypes;
     pFileExtensions = (const char**) zm_pFileExtensions;
     pFileOpenNames = (const char**) zm_pFileOpenNames;
@@ -238,6 +262,7 @@
 			       IHXFormatResponse* pFormatResponse,
 			       IHXFileObject* pFileObject)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     m_pRequest = pRequest;
     m_pFFResponse = pFormatResponse;
     m_pFileObject = pFileObject;
@@ -263,6 +288,7 @@
 STDMETHODIMP
 AIFFFileFormat::Close()
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if(m_pRiffReader)
 	m_pRiffReader->Close();
 
@@ -278,6 +304,7 @@
 STDMETHODIMP
 AIFFFileFormat::GetFileHeader()
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     IHXValues* pHeader = 0;
     if(m_pCommonClassFactory->CreateInstance(CLSID_IHXValues,
 					     (void**)&pHeader) != HXR_OK)
@@ -305,6 +332,7 @@
 STDMETHODIMP
 AIFFFileFormat::GetStreamHeader(UINT16 unStreamNumber)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if(m_state != AS_Ready) return HXR_UNEXPECTED;
     m_state = AS_FindCommChunkPending;
     m_pRiffReader->FindChunk(COMM_CHUNK_ID, FALSE);
@@ -314,6 +342,7 @@
 STDMETHODIMP
 AIFFFileFormat::GetPacket(UINT16 unStreamNumber)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if(m_state != AS_Ready) return HXR_UNEXPECTED;
 
     if(!m_bHeaderSent) return HXR_UNEXPECTED;
@@ -333,6 +362,7 @@
 STDMETHODIMP
 AIFFFileFormat::Seek(UINT32 ulOffset)
 {
+    DBG(printf(PFX "%s o=%d\n", __FUNCTION__, ulOffset));
     m_ulLastPacketEndTime = 0;
     m_ulSeekOffset = ulOffset;
     m_state = AS_SeekFindChunkPending;
@@ -345,6 +375,7 @@
 			  REF(IHXBuffer*)pStatusDesc,
 			  REF(UINT16) ulPercentDone)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     HX_RESULT hResult = HXR_OK;
     IHXPendingStatus* pFileSystemStatus = NULL;
 
@@ -371,6 +402,7 @@
 STDMETHODIMP
 AIFFFileFormat::RIFFOpenDone(HX_RESULT status)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if(m_state != AS_InitPending) return HXR_UNEXPECTED;
 
     m_state = AS_Ready;
@@ -381,12 +413,15 @@
 STDMETHODIMP
 AIFFFileFormat::RIFFCloseDone(HX_RESULT status)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     return HXR_OK;
 }
 
 HX_RESULT
 AIFFFileFormat::RIFFFindChunkDone(HX_RESULT status, UINT32 len)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
+    char *pcMimeType = "";
     UINT32 ulByteRate = 0;
     switch(m_state)
     {
@@ -442,8 +477,17 @@
 	    ULONG32 ulLenPacked;
 	    m_AudioPCMHEADER.pack((UINT8*)&audioPCMHEADER, ulLenPacked);
 
-	    pMimeType->Set((const UINT8*)"audio/x-pn-wav",
-			   strlen("audio/x-pn-wav") + 1);
+            if (m_AudioPCMHEADER.usBitsPerSample == 24)
+              pcMimeType = "audio/L24";
+            else
+              pcMimeType = "audio/x-pn-wav";
+
+            DBG(printf(PFX "SSND chunk\n"));
+            DBG(printf(PFX "  MimeType=%s\n", pcMimeType));
+            DBG(printf(PFX "  BitsPerSample=%d\n", m_AudioPCMHEADER.usBitsPerSample));
+            DBG(printf(PFX "  SamplesPerSec=%d\n", m_AudioPCMHEADER.ulSamplesPerSec));
+
+	    pMimeType->Set((const UINT8*)pcMimeType, strlen(pcMimeType) + 1);
 	    pOpaque->Set((UINT8*)&audioPCMHEADER, ulLenPacked);
 	    pHeader->SetPropertyBuffer("OpaqueData", pOpaque);
 	    pHeader->SetPropertyULONG32("StreamNumber", 0);
@@ -455,6 +499,8 @@
 	    pHeader->SetPropertyULONG32("Preroll", 1000);
 	    pHeader->SetPropertyULONG32("Duration", m_ulDuration);
 	    pHeader->SetPropertyCString("MimeType", pMimeType);
+	    pHeader->SetPropertyULONG32("BitsPerSample", (UINT32)m_AudioPCMHEADER.usBitsPerSample);
+	    pHeader->SetPropertyULONG32("SamplesPerSecond", (UINT32)m_AudioPCMHEADER.ulSamplesPerSec);
 
 	    m_bHeaderSent = TRUE;
 	    m_state = AS_Ready;
@@ -487,18 +533,21 @@
 STDMETHODIMP
 AIFFFileFormat::RIFFDescendDone(HX_RESULT status)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     return HXR_UNEXPECTED;
 }
 
 STDMETHODIMP
 AIFFFileFormat::RIFFAscendDone(HX_RESULT status)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     return HXR_UNEXPECTED;
 }
 
 STDMETHODIMP
 AIFFFileFormat::RIFFReadDone(HX_RESULT status, IHXBuffer* pBuffer)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     UCHAR* buf;
     UINT32 len;
 
@@ -524,6 +573,10 @@
 	    m_AudioPCMHEADER.usSampleEndianness = 1;  // AIFF is big endian
 	    m_AudioPCMHEADER.usFormatTag = 2; // 2's complement
 
+            DBG(printf(PFX "COMM chunk\n"));
+            DBG(printf(PFX "  BitsPerSample=%d\n", m_AudioPCMHEADER.usBitsPerSample));
+            DBG(printf(PFX "  SamplesPerSec=%d\n", m_AudioPCMHEADER.ulSamplesPerSec));
+
             UINT32 ulNumberOfSamples = getlong(&buf[2]);
             // To compute duration, we must modularlize the
             // computation to avoid 32-bit overflow
@@ -591,6 +644,7 @@
 STDMETHODIMP
 AIFFFileFormat::RIFFSeekDone(HX_RESULT status)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     if(m_state != AS_SeekPending)
 	return HXR_UNEXPECTED;
 
@@ -604,5 +658,6 @@
 				 UINT32 chunkType,
 				 IHXBuffer* pBuffer)
 {
+    DBG(printf(PFX "%s\n", __FUNCTION__));
     return HXR_NOTIMPL;
 }