mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-23 16:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some const errors and add ma_decoder_get_encoding_format().

Browse Source
This commit is contained in:
David Reid
2024-03-01 07:57:13 +10:00
parent f07c4cd3a1
commit 7c90311f5d
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+20 -3
View File
@@ -10069,7 +10069,7 @@ typedef struct
ma_allocation_callbacks allocationCallbacks; ma_allocation_callbacks allocationCallbacks;
ma_encoding_format encodingFormat; ma_encoding_format encodingFormat;
ma_uint32 seekPointCount; /* When set to > 0, specifies the number of seek points to use for the generation of a seek table. Not all decoding backends support this. */ ma_uint32 seekPointCount; /* When set to > 0, specifies the number of seek points to use for the generation of a seek table. Not all decoding backends support this. */
ma_decoding_backend_vtable** ppBackendVTables; const ma_decoding_backend_vtable** ppBackendVTables;
void** ppBackendUserData; void** ppBackendUserData;
ma_uint32 backendCount; ma_uint32 backendCount;
} ma_decoder_config; } ma_decoder_config;
@@ -10176,6 +10176,14 @@ returned.
*/ */
MA_API ma_result ma_decoder_get_available_frames(ma_decoder* pDecoder, ma_uint64* pAvailableFrames); MA_API ma_result ma_decoder_get_available_frames(ma_decoder* pDecoder, ma_uint64* pAvailableFrames);
/*
Retrieves the encoding format of the given decoder.
This is just a hint, and some decoding backends may return `ma_encoding_format_unknown`. This is not an error as
it may just mean the decoding backend is a format not recognized by the enumeration in miniaudio.
*/
MA_API ma_encoding_format ma_decoder_get_encoding_format(const ma_decoder* pDecoder);
/* /*
Helper for opening and decoding a file into a heap allocated block of memory. Free the returned pointer with ma_free(). On input, Helper for opening and decoding a file into a heap allocated block of memory. Free the returned pointer with ma_free(). On input,
pConfig should be set to what you want. On output it will be set to what you got. pConfig should be set to what you want. On output it will be set to what you got.
@@ -10581,7 +10589,7 @@ typedef struct
ma_uint32 jobQueueCapacity; /* The maximum number of jobs that can fit in the queue at a time. Defaults to MA_JOB_TYPE_RESOURCE_MANAGER_QUEUE_CAPACITY. Cannot be zero. */ ma_uint32 jobQueueCapacity; /* The maximum number of jobs that can fit in the queue at a time. Defaults to MA_JOB_TYPE_RESOURCE_MANAGER_QUEUE_CAPACITY. Cannot be zero. */
ma_uint32 flags; ma_uint32 flags;
ma_vfs* pVFS; /* Can be NULL in which case defaults will be used. */ ma_vfs* pVFS; /* Can be NULL in which case defaults will be used. */
ma_decoding_backend_vtable** ppDecodingBackendVTables; const ma_decoding_backend_vtable** ppDecodingBackendVTables;
ma_uint32 decodingBackendCount; ma_uint32 decodingBackendCount;
void** ppDecodingBackendUserData; void** ppDecodingBackendUserData;
} ma_resource_manager_config; } ma_resource_manager_config;
@@ -65143,6 +65151,15 @@ MA_API ma_result ma_decoder_get_available_frames(ma_decoder* pDecoder, ma_uint64
return MA_SUCCESS; return MA_SUCCESS;
} }
MA_API ma_encoding_format ma_decoder_get_encoding_format(const ma_decoder* pDecoder)
{
if (pDecoder == NULL || pDecoder->pBackendVTable == NULL || pDecoder->pBackendVTable->onGetEncodingFormat == NULL) {
return ma_encoding_format_unknown;
}
return pDecoder->pBackendVTable->onGetEncodingFormat(pDecoder->pBackendUserData, pDecoder->pBackend);
}
static ma_result ma_decoder__full_decode_and_uninit(ma_decoder* pDecoder, ma_decoder_config* pConfigOut, ma_uint64* pFrameCountOut, void** ppPCMFramesOut) static ma_result ma_decoder__full_decode_and_uninit(ma_decoder* pDecoder, ma_decoder_config* pConfigOut, ma_uint64* pFrameCountOut, void** ppPCMFramesOut)
{ {
@@ -67508,7 +67525,7 @@ MA_API ma_result ma_resource_manager_init(const ma_resource_manager_config* pCon
vtableUserDataSizeInBytes = 0; /* No vtable user data present. No need for an allocation. */ vtableUserDataSizeInBytes = 0; /* No vtable user data present. No need for an allocation. */
} }
pResourceManager->config.ppDecodingBackendVTables = (ma_decoding_backend_vtable**)ma_malloc(vtableSizeInBytes + vtableUserDataSizeInBytes, &pResourceManager->config.allocationCallbacks); pResourceManager->config.ppDecodingBackendVTables = (const ma_decoding_backend_vtable**)ma_malloc(vtableSizeInBytes + vtableUserDataSizeInBytes, &pResourceManager->config.allocationCallbacks);
if (pResourceManager->config.ppDecodingBackendVTables == NULL) { if (pResourceManager->config.ppDecodingBackendVTables == NULL) {
ma_job_queue_uninit(&pResourceManager->jobQueue, &pResourceManager->config.allocationCallbacks); ma_job_queue_uninit(&pResourceManager->jobQueue, &pResourceManager->config.allocationCallbacks);
return MA_OUT_OF_MEMORY; return MA_OUT_OF_MEMORY;