FCL/sf/mw/mmmw: comparison khronosfws/openmax_al/src/engine/xaaudioiodevicecapabilitiesitf.c

equal deleted inserted replaced

-:80975da52420
+:43d09473c595
 #include <assert.h>
 #include <string.h>
 #include "xaglobals.h"
 #include "xaaudioiodevicecapabilitiesitf.h"
-#ifdef _GSTREAMER_BACKEND_
+#include "xacapabilitiesmgr.h"
-#include "XAStaticCapsAdaptation.h"
-#endif
 static XAchar deviceName1[] = "Default Mic";
 /* XAAudIODevCapaItfImpl* GetImpl
 * Description: Validate interface pointer and cast it to implementation pointer.
 DEBUG_ERR("XA_RESULT_BUFFER_INSUFFICIENT");
 res = XA_RESULT_BUFFER_INSUFFICIENT;
 }
 else
 {
-#ifdef _GSTREAMER_BACKEND_
 XAuint32 i;
-XAStaticCapsData temp;
+XACapabilities temp;
 for( i=0; i<impl->numInputDevices; i++ )
 {
 /* query device id from adaptation using index value */
-res = XAStaticCapsAdapt_GetCapsByIdx(XACAP_DEVSRC|XACAP_AUDIO, i, &temp);
+res = XACapabilitiesMgr_GetCapsByIdx(impl->capslist, (XACapsType)(XACAP_DEVSRC|XACAP_AUDIO), i, &temp);
 pInputDeviceIDs[i] = temp.xaid;
 }
-#endif
 pInputDeviceIDs[0] = 0xAD7E5001;
 }
 }
 *pNumInputs = impl->numInputDevices;
 }
 XAAudioIODeviceCapabilitiesItf self,
 XAuint32 deviceId,
 XAAudioInputDescriptor* pDescriptor)
 {
 XAAudIODevCapaItfImpl* impl = GetImpl(self);
+XACapabilities temp;
 XAresult res = XA_RESULT_SUCCESS;
 DEBUG_API("->XAAudIODevCapaItfImpl_QueryAudioInputCapabilities");
 if( !impl || !pDescriptor )
 {
 res = XA_RESULT_PARAMETER_INVALID;
 }
 else
 {
 memset(pDescriptor,0,sizeof(XAAudioInputDescriptor));
-#ifdef _GSTREAMER_BACKEND_
 /* query capabilities from adaptation using device id */
-XAStaticCapsData temp;
-res = XAStaticCapsAdapt_GetCapsById(XACAP_DEVSRC|XACAP_AUDIO, deviceId, &temp);
+res = XACapabilitiesMgr_GetCapsById(impl->capslist, (XACapsType)(XACAP_DEVSRC|XACAP_AUDIO), deviceId, &temp);
 if( res == XA_RESULT_SUCCESS )
 {
+XAAudioInputDescriptor* desc = ((XAAudioInputDescriptor*)(temp.pEntry));
 /* map applicable values to XAAudioCodecCapabilities */
-pDescriptor->maxChannels=temp.maxCh;
+pDescriptor->maxChannels=desc->maxChannels;
-pDescriptor->minSampleRate=temp.minSR*1000; /* milliHz */
+pDescriptor->minSampleRate=desc->minSampleRate*1000; /* milliHz */
-if (temp.maxSR < (0xFFFFFFFF / 1000))
+if (desc->maxSampleRate < (0xFFFFFFFF / 1000))
 {
-pDescriptor->maxSampleRate = temp.maxSR*1000;
+pDescriptor->maxSampleRate = desc->maxSampleRate*1000;
 }
 else
 {
 pDescriptor->maxSampleRate = 0xFFFFFFFF;
 }
 pDescriptor->deviceScope = XA_DEVSCOPE_ENVIRONMENT;
 pDescriptor->deviceLocation = XA_DEVLOCATION_HANDSET;
 pDescriptor->deviceName = temp.adaptId;
 /* other caps undefined */
 }
-#endif
 switch (deviceId)
 {
 case 0xAD7E5001:
 {
 impl->sampleRateArray[0] = 8000000;
 res = XA_RESULT_BUFFER_INSUFFICIENT;
 }
 else
 {
-#ifdef _GSTREAMER_BACKEND_
 XAuint32 i = 0;
-XAStaticCapsData temp;
+XACapabilities temp;
 for( i=0; i<impl->numOutputDevices; i++ )
 {
 /* query device id from adaptation using index value */
-res = XAStaticCapsAdapt_GetCapsByIdx(XACAP_DEVSNK|XACAP_AUDIO, i, &temp);
+res = XACapabilitiesMgr_GetCapsByIdx(impl->capslist, (XACapsType)(XACAP_DEVSNK|XACAP_AUDIO), i, &temp);
 pOutputDeviceIDs[i] = temp.xaid;
 }
-#endif
 pOutputDeviceIDs[0] = 0xAD7E5002;
 }
 }
 *pNumOutputs = impl->numOutputDevices;
 }
 XAAudioOutputDescriptor* pDescriptor)
 {
 XAAudIODevCapaItfImpl* impl = GetImpl(self);
 XAresult res = XA_RESULT_SUCCESS;
+XACapabilities temp;
 DEBUG_API("->XAAudIODevCapaItfImpl_QueryAudioOutputCapabilities");
 if( !impl || !pDescriptor )
 {
 DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
 }
 else
 {
 memset(pDescriptor,0,sizeof(XAAudioOutputDescriptor));
 /* query capabilities from adaptation using device id */
-#ifdef _GSTREAMER_BACKEND_
-XAStaticCapsData temp;
-res = XAStaticCapsAdapt_GetCapsById(XACAP_DEVSNK|XACAP_AUDIO, deviceId, &temp);
+res = XACapabilitiesMgr_GetCapsById(impl->capslist, (XACapsType)(XACAP_DEVSNK|XACAP_AUDIO), deviceId, &temp);
 if( res == XA_RESULT_SUCCESS )
 {
+XAAudioOutputDescriptor* desc = ((XAAudioOutputDescriptor*)(temp.pEntry));
 /* map applicable values to XAAudioCodecCapabilities */
-pDescriptor->maxChannels=temp.maxCh;
+pDescriptor->maxChannels=desc->maxChannels;
-pDescriptor->minSampleRate=temp.minSR*1000; /* milliHz */
+pDescriptor->minSampleRate=desc->minSampleRate*1000; /* milliHz */
-if (temp.maxSR < (0xFFFFFFFF / 1000))
+if (desc->maxSampleRate < (0xFFFFFFFF / 1000))
 {
-pDescriptor->maxSampleRate = temp.maxSR*1000;
+pDescriptor->maxSampleRate = desc->maxSampleRate*1000;
 }
 else
 {
 pDescriptor->maxSampleRate = 0xFFFFFFFF;
 }
 pDescriptor->deviceScope = XA_DEVSCOPE_ENVIRONMENT;
 pDescriptor->deviceLocation = XA_DEVLOCATION_HANDSET;
 pDescriptor->pDeviceName = temp.adaptId;
 /* other caps undefined */
 }
-#endif
 switch (deviceId)
 {
 case 0xAD7E5002:
 {
 DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
 res = XA_RESULT_PARAMETER_INVALID;
 }
 else
 {
-#ifdef _GSTREAMER_BACKEND_
-XAStaticCapsData temp;
+XACapabilities temp;
 XAuint32 associatedCount = 0;
 XAuint32 i = 0;
 for( i=0; i<impl->numInputDevices; i++ )
 {
 /* query device id from adaptation using index value */
-res = XAStaticCapsAdapt_GetCapsByIdx(XACAP_DEVSRC|XACAP_AUDIO, i, &temp);
+res = XACapabilitiesMgr_GetCapsByIdx(impl->capslist, (XACapsType)(XACAP_DEVSRC|XACAP_AUDIO), i, &temp);
 if (temp.xaid != deviceId)
 {
 associatedCount++;
 }
 }
 }
 for( i=0, associatedCount = 0; i<impl->numInputDevices; i++ )
 {
 /* query device id from adaptation using index value */
-res = XAStaticCapsAdapt_GetCapsByIdx(XACAP_DEVSRC|XACAP_AUDIO, i, &temp);
+res = XACapabilitiesMgr_GetCapsByIdx(impl->capslist, (XACapsType)(XACAP_DEVSRC|XACAP_AUDIO), i, &temp);
 if (temp.xaid != deviceId)
 {
 pAudioInputDeviceIDs[associatedCount++] = temp.xaid;
 }
 }
 }
 *pNumAudioInputs = associatedCount;
-#endif
 if(!pAudioInputDeviceIDs)
 {
 switch(deviceId)
 {
 DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
 res = XA_RESULT_PARAMETER_INVALID;
 }
 else
 {
-#ifdef _GSTREAMER_BACKEND_
-XAStaticCapsData temp;
+XACapabilities temp;
 XAuint32 associatedCount = 0;
 XAuint32 i = 0;
 for( i=0; i<impl->numOutputDevices; i++ )
 {
 /* query device id from adaptation using index value */
-res = XAStaticCapsAdapt_GetCapsByIdx(XACAP_DEVSNK|XACAP_AUDIO, i, &temp);
+res = XACapabilitiesMgr_GetCapsByIdx(impl->capslist, (XACapsType)(XACAP_DEVSNK|XACAP_AUDIO), i, &temp);
 if (temp.xaid != deviceId)
 {
 associatedCount++;
 }
 }
 }
 for( i=0, associatedCount = 0; i<impl->numOutputDevices; i++ )
 {
 /* query device id from adaptation using index value */
-res = XAStaticCapsAdapt_GetCapsByIdx(XACAP_DEVSNK|XACAP_AUDIO, i, &temp);
+res = XACapabilitiesMgr_GetCapsByIdx(impl->capslist, (XACapsType)(XACAP_DEVSNK|XACAP_AUDIO), i, &temp);
 if (temp.xaid != deviceId)
 {
 pAudioOutputDeviceIDs[associatedCount++] = temp.xaid;
 }
 }
 }
 *pNumAudioOutputs = associatedCount;
-#endif
 if(!pAudioOutputDeviceIDs)
 {
 switch(deviceId)
 {
 DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
 res = XA_RESULT_PARAMETER_INVALID;
 }
 else
 {
-#ifdef _GSTREAMER_BACKEND_
-XAStaticCapsData temp;
+/*        XACapabilities temp;
-res = XAStaticCapsAdapt_GetCapsById(XACAP_DEVSNK|XACAP_AUDIO,
+res = XACapabilitiesMgr_GetCapsById(NULL, (XACapsType)(XACAP_DEVSNK|XACAP_AUDIO),
 deviceId, &temp);
-/* deviceid can be either input or output*/
+deviceid can be either input or output
 if( res == XA_RESULT_FEATURE_UNSUPPORTED )
 {
-res = XAStaticCapsAdapt_GetCapsById(XACAP_DEVSRC|XACAP_AUDIO,
+res = XACapabilitiesMgr_GetCapsById(NULL, (XACapsType)(XACAP_DEVSRC|XACAP_AUDIO),
 deviceId, &temp);
 }
 if( res == XA_RESULT_SUCCESS )
 {
+XAAudioOutputDescriptor* desc = ((XAAudioOutputDescriptor*)(temp.pEntry));
 XAuint32 count = 0, i = 0;
 for (i=0; i < sizeof(temp.pcmProfilesSupported)*8; i++)
 count+=temp.pcmProfilesSupported>>i&0x1;
 if(pSampleFormats)
 if (temp.pcmProfilesSupported & XA_ADAPT_PCMSAMPLEFORMAT_SUPPORTED_32) {
 pSampleFormats[insertCount++] = XA_PCMSAMPLEFORMAT_FIXED_20; }
 }
 }
 *pNumOfSampleFormats = count;
-}
+}*/
-#endif
 if(!pSampleFormats)
 {
 *pNumOfSampleFormats = 1;
 }
 **/
 /* XAAudIODevCapaItfImpl_Create
 * Description: Allocate and initialize XAAudIODevCapaItfImpl
 */
-XAAudIODevCapaItfImpl* XAAudIODevCapaItfImpl_Create()
+XAAudIODevCapaItfImpl* XAAudIODevCapaItfImpl_Create(XACapabilities* caps)
 {
 XAAudIODevCapaItfImpl* self = (XAAudIODevCapaItfImpl*)
 calloc(1,sizeof(XAAudIODevCapaItfImpl));
 DEBUG_API("->XAAudIODevCapaItfImpl_Create");
 XAAudIODevCapaItfImpl_RegisterAvailableAudioInputsChangedCallback;
 self->itf.RegisterAvailableAudioOutputsChangedCallback =
 XAAudIODevCapaItfImpl_RegisterAvailableAudioOutputsChangedCallback;
 self->itf.RegisterDefaultDeviceIDMapChangedCallback =
 XAAudIODevCapaItfImpl_RegisterDefaultDeviceIDMapChangedCallback;
-#ifdef _GSTREAMER_BACKEND_
+self->capslist = caps;
 /* init variables */
-assert( XAStaticCapsAdapt_GetCapsCount( XACAP_DEVSNK|XACAP_AUDIO,
+XACapabilitiesMgr_GetCapsCount( caps, (XACapsType)(XACAP_DEVSNK|XACAP_AUDIO),
-&(self->numOutputDevices) ) == XA_RESULT_SUCCESS );
+&(self->numOutputDevices) );
-assert( XAStaticCapsAdapt_GetCapsCount( XACAP_DEVSRC|XACAP_AUDIO,
+XACapabilitiesMgr_GetCapsCount( caps, (XACapsType)(XACAP_DEVSRC|XACAP_AUDIO),
-&(self->numInputDevices) ) == XA_RESULT_SUCCESS );
+&(self->numInputDevices) );
-#endif
+/*TODO: Remove this later*/
+XACapabilitiesMgr_QueryColorFormats(caps, NULL, NULL);
 self->inputCbPtrToSelf = NULL;
 self->outputCbPtrToSelf = NULL;
 self->deviceMapCbPtrToSelf = NULL;
 self->numInputDevices = 1;
 self->numOutputDevices = 1;

changeset 16	43d09473c595
parent 12	5a06f39ad45b
child 25	6f7ceef7b1d1