Skip to content

V
vlc
Commit fb397dc0 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Backport of the Mac OS X audio fixes to 0.8.4a (fixes #456)

parent b759e185
Expand all Show whitespace changes
Inline Side-by-side
Showing with 947 additions and 528 deletions
Makefile.am
View file @ fb397dc0
...@@ -577,8 +577,6 @@ VLC-release.app: vlc ...@@ -577,8 +577,6 @@ VLC-release.app: vlc
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/audio_output
cp $(srcdir)/modules/audio_output/coreaudio.c \
$(top_builddir)/tmp/modules/audio_output/coreaudio.c
mkdir -p $(top_builddir)/tmp/modules/gui/macosx mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \ for i in \
about.h \ about.h \
...@@ -691,8 +689,6 @@ VLC.app: vlc ...@@ -691,8 +689,6 @@ VLC.app: vlc
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/audio_output
cp $(srcdir)/modules/audio_output/coreaudio.c \
$(top_builddir)/tmp/modules/audio_output/coreaudio.c
mkdir -p $(top_builddir)/tmp/modules/gui/macosx mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \ for i in \
about.h \ about.h \
......
configure.ac
View file @ fb397dc0
...@@ -3627,14 +3627,14 @@ fi ...@@ -3627,14 +3627,14 @@ fi
dnl dnl
dnl CoreAudio plugin dnl CoreAudio plugin
dnl dnl
AC_ARG_ENABLE(coreaudio, AC_ARG_ENABLE(macosx-audio,
[ --enable-coreaudio CoreAudio module (default enabled on MacOS X)]) [ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)])
if test "${enable_coreaudio}" != "no" && if test "${enable_macosx-audio}" != "no" &&
(test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes") (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes")
then then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_BUILTINS([coreaudio auhal]) [ VLC_ADD_BUILTINS([auhal])
VLC_ADD_LDFLAGS([coreaudio auhal],[-framework CoreAudio -framework AudioUnit -framework AudioToolbox]) VLC_ADD_LDFLAGS([auhal],[-framework CoreAudio -framework AudioUnit -framework AudioToolbox])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi fi
......
include/audio_output.h
View file @ fb397dc0
...@@ -41,14 +41,17 @@ ...@@ -41,14 +41,17 @@
# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','b') # define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','b')
# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','b') # define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','b')
# define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','b') # define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','b')
# define AOUT_FMT_SPDIF_NE VLC_FOURCC('s','p','d','b')
#else #else
# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','l') # define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','l')
# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','l') # define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','l')
# define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','l') # define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','l')
# define AOUT_FMT_SPDIF_NE VLC_FOURCC('s','p','d','i')
#endif #endif
#define AOUT_FMT_NON_LINEAR( p_format ) \ #define AOUT_FMT_NON_LINEAR( p_format ) \
( ((p_format)->i_format == VLC_FOURCC('s','p','d','i')) \ ( ((p_format)->i_format == VLC_FOURCC('s','p','d','i')) \
|| ((p_format)->i_format == VLC_FOURCC('s','p','d','b')) \
|| ((p_format)->i_format == VLC_FOURCC('a','5','2',' ')) \ || ((p_format)->i_format == VLC_FOURCC('a','5','2',' ')) \
|| ((p_format)->i_format == VLC_FOURCC('d','t','s',' ')) ) || ((p_format)->i_format == VLC_FOURCC('d','t','s',' ')) )
......
modules/audio_filter/converter/a52tospdif.c
View file @ fb397dc0
...@@ -62,8 +62,9 @@ static int Create( vlc_object_t *p_this ) ...@@ -62,8 +62,9 @@ static int Create( vlc_object_t *p_this )
{ {
aout_filter_t * p_filter = (aout_filter_t *)p_this; aout_filter_t * p_filter = (aout_filter_t *)p_this;
if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ') if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ') ||
|| p_filter->output.i_format != VLC_FOURCC('s','p','d','i') ) ( p_filter->output.i_format != VLC_FOURCC('s','p','d','b') &&
p_filter->output.i_format != VLC_FOURCC('s','p','d','i') ) )
{ {
return -1; return -1;
} }
...@@ -80,43 +81,49 @@ static int Create( vlc_object_t *p_this ) ...@@ -80,43 +81,49 @@ static int Create( vlc_object_t *p_this )
static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf ) aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{ {
/* It is not entirely clear which endianness the AC3 stream should have. /* AC3 is natively big endian. Most SPDIF devices have the native
* I have been told endianness does not matter, AC3 can be both endian. * endianness of the computersystem.
* But then, I could not get it to work on Mac OS X and a JVC RX-6000R * On MAc OS X however, little endian devices are also common.
* decoder without using little endian. So right now, I convert to little
* endian.
*/ */
static const uint8_t p_sync_le[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 };
static const uint8_t p_sync[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 }; static const uint8_t p_sync_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 };
#ifndef HAVE_SWAB #ifndef HAVE_SWAB
byte_t * p_tmp; byte_t * p_tmp;
uint16_t i; uint16_t i;
#endif #endif
uint16_t i_length = p_in_buf->i_nb_bytes; uint16_t i_frame_size = p_in_buf->i_nb_bytes / 2;
uint8_t * pi_length;
byte_t * p_in = p_in_buf->p_buffer; byte_t * p_in = p_in_buf->p_buffer;
byte_t * p_out = p_out_buf->p_buffer; byte_t * p_out = p_out_buf->p_buffer;
/* Copy the S/PDIF headers. */ /* Copy the S/PDIF headers. */
memcpy( p_out, p_sync, 6 ); if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
pi_length = (p_out + 6); {
*pi_length = (i_length * 8) & 0xff; p_filter->p_vlc->pf_memcpy( p_out, p_sync_be, 6 );
*(pi_length + 1) = (i_length * 8) >> 8; p_out[4] = p_in[5] & 0x7; /* bsmod */
p_out[6] = (i_frame_size >> 4) & 0xff;
p_out[7] = (i_frame_size << 4) & 0xff;
p_filter->p_vlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 );
}
else
{
p_filter->p_vlc->pf_memcpy( p_out, p_sync_le, 6 );
p_out[5] = p_in[5] & 0x7; /* bsmod */
p_out[6] = (i_frame_size << 4) & 0xff;
p_out[7] = (i_frame_size >> 4) & 0xff;
#ifdef HAVE_SWAB #ifdef HAVE_SWAB
swab( p_in, p_out + 8, i_length ); swab( p_in, &p_out[8], i_frame_size * 2 );
#else #else
p_tmp = p_out + 8; p_tmp = &p_out[8];
for ( i = i_length / 2 ; i-- ; ) for( i = i_frame_size; i-- ; )
{ {
p_tmp[0] = p_in[1]; p_tmp[0] = p_in[1];
p_tmp[1] = p_in[0]; p_tmp[1] = p_in[0];
p_tmp += 2; p_in += 2; p_tmp += 2; p_in += 2;
} }
#endif #endif
}
p_filter->p_vlc->pf_memset( p_out + 8 + i_length, 0, p_filter->p_vlc->pf_memset( p_out + 8 + i_frame_size * 2, 0,
AOUT_SPDIF_SIZE - i_length - 8 ); AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 );
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
p_out_buf->i_nb_bytes = AOUT_SPDIF_SIZE; p_out_buf->i_nb_bytes = AOUT_SPDIF_SIZE;
......
modules/audio_filter/converter/dtstospdif.c
View file @ fb397dc0
...@@ -79,8 +79,9 @@ static int Create( vlc_object_t *p_this ) ...@@ -79,8 +79,9 @@ static int Create( vlc_object_t *p_this )
{ {
aout_filter_t * p_filter = (aout_filter_t *)p_this; aout_filter_t * p_filter = (aout_filter_t *)p_this;
if ( p_filter->input.i_format != VLC_FOURCC('d','t','s',' ') if( p_filter->input.i_format != VLC_FOURCC('d','t','s',' ') ||
|| p_filter->output.i_format != VLC_FOURCC('s','p','d','i') ) ( p_filter->output.i_format != VLC_FOURCC('s','p','d','i') &&
p_filter->output.i_format != VLC_FOURCC('s','p','d','b') ) )
{ {
return -1; return -1;
} }
...@@ -117,9 +118,11 @@ static void Close( vlc_object_t * p_this ) ...@@ -117,9 +118,11 @@ static void Close( vlc_object_t * p_this )
static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf ) aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{ {
uint32_t i_ac5_spdif_type = 0;
uint16_t i_fz = p_in_buf->i_nb_samples * 4; uint16_t i_fz = p_in_buf->i_nb_samples * 4;
uint16_t i_frame, i_length = p_in_buf->i_nb_bytes; uint16_t i_frame, i_length = p_in_buf->i_nb_bytes;
static const uint8_t p_sync[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x00, 0x00 }; static const uint8_t p_sync_le[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x00, 0x00 };
static const uint8_t p_sync_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x00 };
if( p_in_buf->i_nb_bytes != p_filter->p_sys->i_frame_size ) if( p_in_buf->i_nb_bytes != p_filter->p_sys->i_frame_size )
{ {
...@@ -156,23 +159,35 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -156,23 +159,35 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
byte_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz); byte_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz);
byte_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length); byte_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length);
/* Copy the S/PDIF headers. */
memcpy( p_out, p_sync, 6 );
switch( p_in_buf->i_nb_samples ) switch( p_in_buf->i_nb_samples )
{ {
case 512: *(p_out + 4) = 0x0B; break; case 512: i_ac5_spdif_type = 0x0B; break;
case 1024: *(p_out + 4) = 0x0C; break; case 1024: i_ac5_spdif_type = 0x0C; break;
case 2048: *(p_out + 4) = 0x0D; break; case 2048: i_ac5_spdif_type = 0x0D; break;
} }
*(p_out + 6) = (i_length * 8) & 0xff; /* Copy the S/PDIF headers. */
*(p_out + 7) = (i_length * 8) >> 8; if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
{
p_filter->p_vlc->pf_memcpy( p_out, p_sync_be, 6 );
p_out[5] = i_ac5_spdif_type;
p_out[6] = (( i_length ) >> 5 ) & 0xFF;
p_out[7] = ( i_length << 3 ) & 0xFF;
}
else
{
p_filter->p_vlc->pf_memcpy( p_out, p_sync_le, 6 );
p_out[4] = i_ac5_spdif_type;
p_out[6] = ( i_length << 3 ) & 0xFF;
p_out[7] = (( i_length ) >> 5 ) & 0xFF;
}
if( p_in[0] == 0x1f || p_in[0] == 0x7f ) if( ( (p_in[0] == 0x1F || p_in[0] == 0x7F) && p_filter->output.i_format == VLC_FOURCC('s','p','d','i') ) ||
( (p_in[0] == 0xFF || p_in[0] == 0xFE) && p_filter->output.i_format == VLC_FOURCC('s','p','d','b') ) )
{ {
/* We are dealing with a big endian bitstream. /* We are dealing with a big endian bitstream and a little endian output
* Convert to little endian */ * or a little endian bitstream and a big endian output.
* Byteswap the stream */
#ifdef HAVE_SWAB #ifdef HAVE_SWAB
swab( p_in, p_out + 8, i_length ); swab( p_in, p_out + 8, i_length );
#else #else
...@@ -190,8 +205,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -190,8 +205,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
} }
else else
{ {
/* Little endian */ p_filter->p_vlc->pf_memcpy( p_out + 8, p_in, i_length );
memcpy( p_out + 8, p_in, i_length );
} }
if( i_fz > i_length + 8 ) if( i_fz > i_length + 8 )
......
modules/audio_filter/resampler/Modules.am
View file @ fb397dc0
...@@ -2,4 +2,3 @@ SOURCES_trivial_resampler = trivial.c ...@@ -2,4 +2,3 @@ SOURCES_trivial_resampler = trivial.c
SOURCES_ugly_resampler = ugly.c SOURCES_ugly_resampler = ugly.c
SOURCES_linear_resampler = linear.c SOURCES_linear_resampler = linear.c
SOURCES_bandlimited_resampler = bandlimited.c bandlimited.h SOURCES_bandlimited_resampler = bandlimited.c bandlimited.h
SOURCES_coreaudio_resampler = coreaudio.c
modules/audio_filter/resampler/coreaudio.c deleted 100644 → 0
View file @ b759e185
This diff is collapsed.
modules/audio_output/Modules.am
View file @ fb397dc0
SOURCES_alsa = alsa.c SOURCES_alsa = alsa.c
SOURCES_arts = arts.c SOURCES_arts = arts.c
SOURCES_coreaudio = coreaudio.c
SOURCES_aout_directx = directx.c SOURCES_aout_directx = directx.c
SOURCES_esd = esd.c SOURCES_esd = esd.c
SOURCES_aout_file = file.c SOURCES_aout_file = file.c
......
modules/audio_output/auhal.c
View file @ fb397dc0
This diff is collapsed.
modules/audio_output/coreaudio.c
View file @ fb397dc0
...@@ -158,6 +158,7 @@ struct aout_sys_t ...@@ -158,6 +158,7 @@ struct aout_sys_t
UInt32 i_stream_index; UInt32 i_stream_index;
AudioStreamBasicDescription stream_format; AudioStreamBasicDescription stream_format;
UInt32 b_dev_alive; UInt32 b_dev_alive;
pid_t i_hog_pid;
vlc_bool_t b_revert_sfmt; vlc_bool_t b_revert_sfmt;
AudioStreamBasicDescription sfmt_revert; AudioStreamBasicDescription sfmt_revert;
...@@ -253,6 +254,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -253,6 +254,7 @@ static int Open( vlc_object_t * p_this )
p_aout->output.p_sys = p_sys; p_aout->output.p_sys = p_sys;
p_aout->output.pf_play = Play; p_aout->output.pf_play = Play;
p_sys->i_hog_pid = -1;
vlc_mutex_init( p_aout, &p_sys->lock ); vlc_mutex_init( p_aout, &p_sys->lock );
...@@ -281,7 +283,6 @@ static int Open( vlc_object_t * p_this ) ...@@ -281,7 +283,6 @@ static int Open( vlc_object_t * p_this )
/* get starting channel for the selected stream */ /* get starting channel for the selected stream */
p_option = &p_sys->p_options[p_sys->i_sel_opt]; p_option = &p_sys->p_options[p_sys->i_sel_opt];
i_param_size = sizeof( UInt32 ); i_param_size = sizeof( UInt32 );
err = AudioStreamGetProperty( p_option->i_sid, 0, err = AudioStreamGetProperty( p_option->i_sid, 0,
kAudioStreamPropertyStartingChannel, kAudioStreamPropertyStartingChannel,
...@@ -420,6 +421,9 @@ static int Open( vlc_object_t * p_this ) ...@@ -420,6 +421,9 @@ static int Open( vlc_object_t * p_this )
case 'IAC3': case 'IAC3':
case kAudioFormat60958AC3: case kAudioFormat60958AC3:
if( p_sys->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian )
p_aout->output.output.i_format = VLC_FOURCC('s','p','d','b');
else
p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE; p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE;
p_aout->output.output.i_frame_length = A52_FRAME_NB; p_aout->output.output.i_frame_length = A52_FRAME_NB;
...@@ -584,35 +588,30 @@ static OSStatus IOCallback( AudioDeviceID inDevice, ...@@ -584,35 +588,30 @@ static OSStatus IOCallback( AudioDeviceID inDevice,
void * threadGlobals ) void * threadGlobals )
{ {
aout_buffer_t * p_buffer; aout_buffer_t * p_buffer;
AudioTimeStamp host_time;
mtime_t current_date; mtime_t current_date;
aout_instance_t * p_aout = (aout_instance_t *)threadGlobals; aout_instance_t * p_aout = (aout_instance_t *)threadGlobals;
struct aout_sys_t * p_sys = p_aout->output.p_sys; struct aout_sys_t * p_sys = p_aout->output.p_sys;
host_time.mFlags = kAudioTimeStampHostTimeValid;
AudioDeviceTranslateTime( inDevice, inOutputTime, &host_time );
#if 1 #if 1
p_sys->clock_diff = - (mtime_t) p_sys->clock_diff = - (mtime_t)
AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; AudioConvertHostTimeToNanos( inNow->mHostTime ) / 1000;
p_sys->clock_diff += mdate(); p_sys->clock_diff += mdate();
#endif #endif
current_date = p_sys->clock_diff + current_date = p_sys->clock_diff +
AudioConvertHostTimeToNanos( host_time.mHostTime ) / 1000; AudioConvertHostTimeToNanos( inOutputTime->mHostTime ) / 1000;
#define B_SPDI (p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i')) #define B_SPDI (p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i') || p_aout->output.output.i_format == VLC_FOURCC('s','p','d','b') )
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 ] #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( BUFFER.mData, p_aout->p_vlc->pf_memcpy( BUFFER.mData,
p_buffer->p_buffer, p_buffer->i_nb_bytes ); p_buffer->p_buffer, p_buffer->i_nb_bytes );
aout_BufferFree( p_buffer ); aout_BufferFree( p_buffer );
} }
else else
...@@ -993,7 +992,6 @@ static int InitStreamInfo( UInt32 i_dev, aout_instance_t * p_aout, ...@@ -993,7 +992,6 @@ static int InitStreamInfo( UInt32 i_dev, aout_instance_t * p_aout,
msg_Err( p_aout, "GetStreamID(%ld, %ld) failed", i_dev, i_idx ); msg_Err( p_aout, "GetStreamID(%ld, %ld) failed", i_dev, i_idx );
return( VLC_EGENERIC ); return( VLC_EGENERIC );
} }
err = AudioStreamGetPropertyInfo( i_sid, 0, err = AudioStreamGetPropertyInfo( i_sid, 0,
kAudioStreamPropertyPhysicalFormats, kAudioStreamPropertyPhysicalFormats,
&i_param_size, NULL ); &i_param_size, NULL );
...@@ -1214,6 +1212,81 @@ static int InitDevice( aout_instance_t * p_aout ) ...@@ -1214,6 +1212,81 @@ static int InitDevice( aout_instance_t * p_aout )
vlc_mutex_lock( &w.lock ); vlc_mutex_lock( &w.lock );
/* If we do AC3 over SPDIF, take hog mode and non mixable mode */
if( P_STREAMS[i_stream].mFormatID == kAudioFormat60958AC3 ||
P_STREAMS[i_stream].mFormatID == 'IAC3' )
{
UInt32 b_mix;
i_param_size = sizeof( p_sys->i_hog_pid );
err = AudioDeviceGetProperty( p_dev->devid, 0, FALSE, kAudioDevicePropertyHogMode,
&i_param_size, &p_sys->i_hog_pid );
if( !err )
{
msg_Dbg( p_aout, "Current status of hog mode: pid=%d vlc pid=%d\n", (int)p_sys->i_hog_pid, (int)getpid() );
if( p_sys->i_hog_pid != getpid() ) {
p_sys->i_hog_pid = getpid() ;
err = AudioDeviceSetProperty( p_dev->devid, 0, 0, FALSE,
kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid );
if( !err )
{
msg_Dbg( p_aout, "Successfully set hog mode - new pid=%d!\n", (int)p_sys->i_hog_pid );
err = AudioDeviceGetProperty( p_dev->devid, 0, FALSE,
kAudioDevicePropertyHogMode, &i_param_size, &p_sys->i_hog_pid );
if( !err )
{
msg_Dbg( p_aout, "Checking new status of hog mode: pid=%d vlc pid=%d\n",
(int)p_sys->i_hog_pid, (int)getpid() );
}
}
}
}
if( err != noErr )
{
msg_Err( p_aout, "failed to set hogmode: : [%4.4s]", (char *)&err );
FreeDevice( p_aout );
FreeHardwareInfo( p_aout );
vlc_mutex_destroy( &p_sys->lock );
free( (void *)p_sys );
return( VLC_EGENERIC );
}
/*
i_param_size = sizeof( b_mix );
err = AudioDeviceGetProperty( p_dev->devid, 0, FALSE, kAudioDevicePropertySupportsMixing,
&i_param_size, &b_mix );
if( !err )
{
msg_Dbg( p_aout, "Current status of mix mode: %i\n", (int)b_mix );
b_mix = 0;
err = AudioDeviceSetProperty( p_dev->devid, 0, 0, FALSE,
kAudioDevicePropertySupportsMixing, i_param_size, &b_mix );
if( !err )
{
msg_Dbg( p_aout, "Successfully set mix mode - new mix=%d!\n", (int)b_mix );
err = AudioDeviceGetProperty( p_dev->devid, 0, FALSE,
kAudioDevicePropertySupportsMixing, &i_param_size, &b_mix );
if( !err )
{
msg_Dbg( p_aout, "Checking new status of mix mode: %d\n", (int)b_mix );
}
}
}
if( err != noErr )
{
msg_Err( p_aout, "failed to set mixmode: : [%4.4s]", (char *)&err );
FreeDevice( p_aout );
FreeHardwareInfo( p_aout );
vlc_mutex_destroy( &p_sys->lock );
free( (void *)p_sys );
return( VLC_EGENERIC );
}*/
}
msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting format", msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting format",
P_STREAMS[i_stream] ) ); P_STREAMS[i_stream] ) );
...@@ -1325,6 +1398,29 @@ static void FreeDevice( aout_instance_t * p_aout ) ...@@ -1325,6 +1398,29 @@ static void FreeDevice( aout_instance_t * p_aout )
msg_Err( p_aout, "AudioStreamSetProperty revert format failed: [%4.4s]", msg_Err( p_aout, "AudioStreamSetProperty revert format failed: [%4.4s]",
(char *)&err ); (char *)&err );
} }
}
if( (int)p_sys->i_hog_pid != -1 )
{
/*UInt32 b_mix = 1;
err = AudioDeviceSetProperty( p_sys->devid, 0, 0, FALSE,
kAudioDevicePropertySupportsMixing, sizeof(b_mix), &b_mix );
if( err != noErr )
{
msg_Err( p_aout, "Resetting mix mode failed: [%4.4s]",
(char *)&err );
}
*/
p_sys->i_hog_pid = (pid_t) -1;
err = AudioDeviceSetProperty( p_sys->devid, 0, 0, FALSE,
kAudioDevicePropertyHogMode, sizeof(p_sys->i_hog_pid), &p_sys->i_hog_pid );
if( err != noErr )
{
msg_Err( p_aout, "Releasing hog mode failed: [%4.4s]",
(char *)&err );
}
} }
} }
...@@ -1440,8 +1536,9 @@ static OSStatus StreamListener( AudioStreamID inStream, ...@@ -1440,8 +1536,9 @@ static OSStatus StreamListener( AudioStreamID inStream,
void * inClientData ) void * inClientData )
{ {
OSStatus err = noErr; OSStatus err = noErr;
struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData; struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData;
aout_instance_t * p_aout = (aout_instance_t *)inClientData;
struct aout_sys_t * p_sys = p_aout->output.p_sys;
switch( inPropertyID ) switch( inPropertyID )
{ {
...@@ -1454,7 +1551,6 @@ static OSStatus StreamListener( AudioStreamID inStream, ...@@ -1454,7 +1551,6 @@ static OSStatus StreamListener( AudioStreamID inStream,
default: default:
break; break;
} }
return( err ); return( err );
} }
......
src/audio_output/common.c
View file @ fb397dc0
...@@ -142,6 +142,7 @@ void aout_FormatPrepare( audio_sample_format_t * p_format ) ...@@ -142,6 +142,7 @@ void aout_FormatPrepare( audio_sample_format_t * p_format )
break; break;
case VLC_FOURCC('s','p','d','i'): case VLC_FOURCC('s','p','d','i'):
case VLC_FOURCC('s','p','d','b'): /* Big endian spdif output */
case VLC_FOURCC('a','5','2',' '): case VLC_FOURCC('a','5','2',' '):
case VLC_FOURCC('d','t','s',' '): case VLC_FOURCC('d','t','s',' '):
case VLC_FOURCC('m','p','g','a'): case VLC_FOURCC('m','p','g','a'):
......
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