Skip to content

M
miniaudio
Commit 4e292830 authored by David Reid's avatar David Reid
Browse files
Options

Fix a bug where streamed data sources do not use custom backends.

parent 7a3d58ea
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
miniaudio.h
View file @ 4e292830
...@@ -65319,8 +65319,7 @@ static ma_result ma_resource_manager_process_job__load_data_stream(ma_resource_m ...@@ -65319,8 +65319,7 @@ static ma_result ma_resource_manager_process_job__load_data_stream(ma_resource_m
} }
/* We need to initialize the decoder first so we can determine the size of the pages. */ /* We need to initialize the decoder first so we can determine the size of the pages. */
decoderConfig = ma_decoder_config_init(pResourceManager->config.decodedFormat, pResourceManager->config.decodedChannels, pResourceManager->config.decodedSampleRate); decoderConfig = ma_resource_manager__init_decoder_config(pResourceManager);
decoderConfig.allocationCallbacks = pResourceManager->config.allocationCallbacks;
if (pJob->data.loadDataStream.pFilePath != NULL) { if (pJob->data.loadDataStream.pFilePath != NULL) {
result = ma_decoder_init_vfs(pResourceManager->config.pVFS, pJob->data.loadDataStream.pFilePath, &decoderConfig, &pDataStream->decoder); result = ma_decoder_init_vfs(pResourceManager->config.pVFS, pJob->data.loadDataStream.pFilePath, &decoderConfig, &pDataStream->decoder);
...@@ -67207,8 +67206,8 @@ static ma_result ma_node_read_pcm_frames(ma_node* pNode, ma_uint32 outputBusInde ...@@ -67207,8 +67206,8 @@ static ma_result ma_node_read_pcm_frames(ma_node* pNode, ma_uint32 outputBusInde
should be passing in a null pointer to the processing callback for when the node is should be passing in a null pointer to the processing callback for when the node is
configured with MA_NODE_FLAG_ALLOW_NULL_INPUT. configured with MA_NODE_FLAG_ALLOW_NULL_INPUT.
*/ */
if (pNodeBase->cachedFrameCountIn < frameCountIn) { if (pNodeBase->cachedFrameCountIn < (ma_uint16)frameCountIn) {
pNodeBase->cachedFrameCountIn = frameCountIn; pNodeBase->cachedFrameCountIn = (ma_uint16)frameCountIn;
} }
} else { } else {
frameCountIn = pNodeBase->cachedFrameCountIn; /* Give the processing function as much valid input data as we've got. */ frameCountIn = pNodeBase->cachedFrameCountIn; /* Give the processing function as much valid input data as we've got. */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment