Commit c56944cb authored by Jon Lech Johansen's avatar Jon Lech Johansen

* coreaudio: Fix (not tested) for the no audio on A52 over SPDIF issue.

parent 053a3a7c
...@@ -603,12 +603,12 @@ static OSStatus IOCallback( AudioDeviceID inDevice, ...@@ -603,12 +603,12 @@ static OSStatus IOCallback( AudioDeviceID inDevice,
p_buffer = aout_OutputNextBuffer( p_aout, current_date, B_SPDI ); p_buffer = aout_OutputNextBuffer( p_aout, current_date, B_SPDI );
#undef B_SPDI #undef B_SPDI
#define BUFFER outOutputData->mBuffers[ p_sys->i_stream_index ]
if( p_buffer != NULL ) if( p_buffer != NULL )
{ {
/* move data into output data buffer */ /* move data into output data buffer */
p_aout->p_vlc->pf_memcpy( outOutputData->mBuffers[ p_sys->i_stream_index ].mData, p_aout->p_vlc->pf_memcpy( BUFFER.mData,
p_buffer->p_buffer, p_sys->i_bufframe_size * p_buffer->p_buffer, p_buffer->i_nb_bytes );
p_sys->stream_format.mBytesPerFrame );
aout_BufferFree( p_buffer ); aout_BufferFree( p_buffer );
} }
...@@ -618,7 +618,7 @@ static OSStatus IOCallback( AudioDeviceID inDevice, ...@@ -618,7 +618,7 @@ static OSStatus IOCallback( AudioDeviceID inDevice,
{ {
UInt32 i, i_size = p_sys->i_bufframe_size * UInt32 i, i_size = p_sys->i_bufframe_size *
p_sys->stream_format.mChannelsPerFrame; p_sys->stream_format.mChannelsPerFrame;
float * p = (float *)outOutputData->mBuffers[ p_sys->i_stream_index ].mData; float * p = (float *)BUFFER.mData;
for( i = 0; i < i_size; i++ ) for( i = 0; i < i_size; i++ )
{ {
...@@ -627,11 +627,10 @@ static OSStatus IOCallback( AudioDeviceID inDevice, ...@@ -627,11 +627,10 @@ static OSStatus IOCallback( AudioDeviceID inDevice,
} }
else else
{ {
memset( outOutputData->mBuffers[ p_sys->i_stream_index ].mData, p_aout->p_vlc->pf_memset( BUFFER.mData, 0, BUFFER.mDataByteSize );
0, p_sys->i_bufframe_size *
p_sys->stream_format.mBytesPerFrame );
} }
} }
#undef BUFFER
return( noErr ); return( noErr );
} }
......
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