diff options
author | Eric Laurent <elaurent@google.com> | 2012-04-18 09:24:29 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2012-04-18 15:04:46 -0700 |
commit | 0ca3cf94c0dfc173ad7886ae162c4b67067539f6 (patch) | |
tree | bc156e7822e663626b78ec2ad09ef3970fbb48c5 | |
parent | ee685f6d19a6cc3b0bf02e69eb5dea11a2aeb601 (diff) | |
download | frameworks_av-0ca3cf94c0dfc173ad7886ae162c4b67067539f6.zip frameworks_av-0ca3cf94c0dfc173ad7886ae162c4b67067539f6.tar.gz frameworks_av-0ca3cf94c0dfc173ad7886ae162c4b67067539f6.tar.bz2 |
rename audio policy output flags
Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
-rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
-rw-r--r-- | include/media/AudioTrack.h | 14 | ||||
-rw-r--r-- | include/media/IAudioFlinger.h | 2 | ||||
-rw-r--r-- | include/media/IAudioPolicyService.h | 2 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp | 2 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPlayer.cpp | 2 | ||||
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 2 | ||||
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 30 | ||||
-rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 4 | ||||
-rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 6 | ||||
-rw-r--r-- | media/libmedia/JetPlayer.cpp | 2 | ||||
-rw-r--r-- | media/libmedia/SoundPool.cpp | 4 | ||||
-rw-r--r-- | media/libmedia/ToneGenerator.cpp | 2 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 10 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 6 | ||||
-rw-r--r-- | services/audioflinger/AudioPolicyService.h | 4 |
19 files changed, 51 insertions, 51 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 471f462..f73a317 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -185,7 +185,7 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = AUDIO_CHANNEL_OUT_STEREO, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE); + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE); static status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0); diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 6de6486..4906bd3 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -139,7 +139,7 @@ public: * latency of the track. The actual size selected by the AudioTrack could be * larger if the requested size is not compatible with current audio HAL * latency. - * flags: See comments on audio_policy_output_flags_t in <system/audio_policy.h>. + * flags: See comments on audio_output_flags_t in <system/audio.h>. * cbf: Callback function. If not null, this function is called periodically * to request new PCM data. * user: Context for use by the callback receiver. @@ -155,7 +155,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -167,7 +167,7 @@ public: int format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - uint32_t flags = (uint32_t) AUDIO_POLICY_OUTPUT_FLAG_NONE, + uint32_t flags = (uint32_t) AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = 0, void* user = 0, int notificationFrames = 0, @@ -187,7 +187,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, const sp<IMemory>& sharedBuffer = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -211,7 +211,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, int channelMask = 0, int frameCount = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE, + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -476,7 +476,7 @@ protected: audio_format_t format, uint32_t channelMask, int frameCount, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output); void flush_l(); @@ -517,7 +517,7 @@ protected: uint32_t mNewPosition; uint32_t mUpdatePeriod; bool mFlushed; // FIXME will be made obsolete by making flush() synchronous - audio_policy_output_flags_t mFlags; + audio_output_flags_t mFlags; int mSessionId; int mAuxEffectId; mutable Mutex mLock; diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 9e938d1..04ac3ee 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -133,7 +133,7 @@ public: audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) = 0; + audio_output_flags_t flags) = 0; virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2) = 0; virtual status_t closeOutput(audio_io_handle_t output) = 0; diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 04c927a..e160d70 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -52,7 +52,7 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE) = 0; + audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE) = 0; virtual status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0) = 0; diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp index d0ee51b..797686c 100755 --- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp @@ -537,7 +537,7 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { (numChannels == 2) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO, - 0, AUDIO_POLICY_OUTPUT_FLAG_NONE, &AudioCallback, this, 0); + 0, AUDIO_OUTPUT_FLAG_NONE, &AudioCallback, this, 0); if ((err = mAudioTrack->initCheck()) != OK) { delete mAudioTrack; diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp index 1ba1f44..c9cff81 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp @@ -442,7 +442,7 @@ status_t VideoEditorPlayer::VeAudioOutput::open( format, channelMask, frameCount, - AUDIO_POLICY_OUTPUT_FLAG_NONE, + AUDIO_OUTPUT_FLAG_NONE, CallbackWrapper, this); } else { diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 2596f07..4c41ba5 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -589,7 +589,7 @@ audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream, uint32_t samplingRate, audio_format_t format, uint32_t channels, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return 0; diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 6dc6c41..092b516 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -92,7 +92,7 @@ AudioTrack::AudioTrack( audio_format_t format, int channelMask, int frameCount, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, callback_t cbf, void* user, int notificationFrames, @@ -124,7 +124,7 @@ AudioTrack::AudioTrack( mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT) { mStatus = set((audio_stream_type_t)streamType, sampleRate, (audio_format_t)format, channelMask, - frameCount, (audio_policy_output_flags_t)flags, cbf, user, notificationFrames, + frameCount, (audio_output_flags_t)flags, cbf, user, notificationFrames, 0 /*sharedBuffer*/, false /*threadCanCallJava*/, sessionId); } @@ -134,7 +134,7 @@ AudioTrack::AudioTrack( audio_format_t format, int channelMask, const sp<IMemory>& sharedBuffer, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, callback_t cbf, void* user, int notificationFrames, @@ -174,7 +174,7 @@ status_t AudioTrack::set( audio_format_t format, int channelMask, int frameCount, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, callback_t cbf, void* user, int notificationFrames, @@ -222,8 +222,8 @@ status_t AudioTrack::set( // force direct flag if format is not linear PCM if (!audio_is_linear_pcm(format)) { - flags = (audio_policy_output_flags_t) - ((flags | AUDIO_POLICY_OUTPUT_FLAG_DIRECT) & ~AUDIO_POLICY_OUTPUT_FLAG_FAST); + flags = (audio_output_flags_t) + ((flags | AUDIO_OUTPUT_FLAG_DIRECT) & ~AUDIO_OUTPUT_FLAG_FAST); } if (!audio_is_output_channel(channelMask)) { @@ -735,7 +735,7 @@ status_t AudioTrack::createTrack_l( audio_format_t format, uint32_t channelMask, int frameCount, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output) { @@ -761,14 +761,14 @@ status_t AudioTrack::createTrack_l( // Client decides whether the track is TIMED (see below), but can only express a preference // for FAST. Server will perform additional tests. - if ((flags & AUDIO_POLICY_OUTPUT_FLAG_FAST) && !( + if ((flags & AUDIO_OUTPUT_FLAG_FAST) && !( // either of these use cases: // use case 1: shared buffer (sharedBuffer != 0) || // use case 2: callback handler (mCbf != NULL))) { - ALOGW("AUDIO_POLICY_OUTPUT_FLAG_FAST denied"); - flags = (audio_policy_output_flags_t) (flags & ~AUDIO_POLICY_OUTPUT_FLAG_FAST); + ALOGW("AUDIO_OUTPUT_FLAG_FAST denied"); + flags = (audio_output_flags_t) (flags & ~AUDIO_OUTPUT_FLAG_FAST); } ALOGV("createTrack_l() output %d afFrameCount %d afLatency %d", output, afFrameCount, afLatency); @@ -796,7 +796,7 @@ status_t AudioTrack::createTrack_l( if (mNotificationFramesAct > (uint32_t)frameCount/2) { mNotificationFramesAct = frameCount/2; } - if (frameCount < minFrameCount && !(flags & AUDIO_POLICY_OUTPUT_FLAG_FAST)) { + if (frameCount < minFrameCount && !(flags & AUDIO_OUTPUT_FLAG_FAST)) { // not ALOGW because it happens all the time when playing key clicks over A2DP ALOGV("Minimum buffer size corrected from %d to %d", frameCount, minFrameCount); @@ -817,7 +817,7 @@ status_t AudioTrack::createTrack_l( if (mIsTimed) { trackFlags |= IAudioFlinger::TRACK_TIMED; } - if (flags & AUDIO_POLICY_OUTPUT_FLAG_FAST) { + if (flags & AUDIO_OUTPUT_FLAG_FAST) { trackFlags |= IAudioFlinger::TRACK_FAST; } @@ -1033,7 +1033,7 @@ ssize_t AudioTrack::write(const void* buffer, size_t userSize) size_t toWrite; - if (mFormat == AUDIO_FORMAT_PCM_8_BIT && !(mFlags & AUDIO_POLICY_OUTPUT_FLAG_DIRECT)) { + if (mFormat == AUDIO_FORMAT_PCM_8_BIT && !(mFlags & AUDIO_OUTPUT_FLAG_DIRECT)) { // Divide capacity by 2 to take expansion into account toWrite = audioBuffer.size>>1; memcpy_to_i16_from_u8(audioBuffer.i16, (const uint8_t *) src, toWrite); @@ -1190,7 +1190,7 @@ bool AudioTrack::processAudioBuffer(const sp<AudioTrackThread>& thread) // Divide buffer size by 2 to take into account the expansion // due to 8 to 16 bit conversion: the callback must fill only half // of the destination buffer - if (mFormat == AUDIO_FORMAT_PCM_8_BIT && !(mFlags & AUDIO_POLICY_OUTPUT_FLAG_DIRECT)) { + if (mFormat == AUDIO_FORMAT_PCM_8_BIT && !(mFlags & AUDIO_OUTPUT_FLAG_DIRECT)) { audioBuffer.size >>= 1; } @@ -1209,7 +1209,7 @@ bool AudioTrack::processAudioBuffer(const sp<AudioTrackThread>& thread) } if (writtenSize > reqSize) writtenSize = reqSize; - if (mFormat == AUDIO_FORMAT_PCM_8_BIT && !(mFlags & AUDIO_POLICY_OUTPUT_FLAG_DIRECT)) { + if (mFormat == AUDIO_FORMAT_PCM_8_BIT && !(mFlags & AUDIO_OUTPUT_FLAG_DIRECT)) { // 8 to 16 bit conversion, note that source and destination are the same address memcpy_to_i16_from_u8(audioBuffer.i16, (const uint8_t *) audioBuffer.i8, writtenSize); writtenSize <<= 1; diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 81e259a..2b5126f 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -362,7 +362,7 @@ public: audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { Parcel data, reply; audio_devices_t devices = pDevices ? *pDevices : (audio_devices_t)0; @@ -855,7 +855,7 @@ status_t BnAudioFlinger::onTransact( audio_format_t format = (audio_format_t) data.readInt32(); audio_channel_mask_t channelMask = (audio_channel_mask_t)data.readInt32(); uint32_t latency = data.readInt32(); - audio_policy_output_flags_t flags = (audio_policy_output_flags_t) data.readInt32(); + audio_output_flags_t flags = (audio_output_flags_t) data.readInt32(); audio_io_handle_t output = openOutput(module, &devices, &samplingRate, diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 5040bd9..7aab8d6 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -124,7 +124,7 @@ public: uint32_t samplingRate, audio_format_t format, uint32_t channels, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { Parcel data, reply; data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor()); @@ -418,8 +418,8 @@ status_t BnAudioPolicyService::onTransact( uint32_t samplingRate = data.readInt32(); audio_format_t format = (audio_format_t) data.readInt32(); uint32_t channels = data.readInt32(); - audio_policy_output_flags_t flags = - static_cast <audio_policy_output_flags_t>(data.readInt32()); + audio_output_flags_t flags = + static_cast <audio_output_flags_t>(data.readInt32()); audio_io_handle_t output = getOutput(stream, samplingRate, diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index 52aee49..59e538f 100644 --- a/media/libmedia/JetPlayer.cpp +++ b/media/libmedia/JetPlayer.cpp @@ -94,7 +94,7 @@ int JetPlayer::init() AUDIO_FORMAT_PCM_16_BIT, audio_channel_out_mask_from_count(pLibConfig->numChannels), mTrackBufferSize, - AUDIO_POLICY_OUTPUT_FLAG_NONE); + AUDIO_OUTPUT_FLAG_NONE); // create render and playback thread { diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp index 3b7b96a..4b318ed 100644 --- a/media/libmedia/SoundPool.cpp +++ b/media/libmedia/SoundPool.cpp @@ -608,10 +608,10 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV // do not create a new audio track if current track is compatible with sample parameters #ifdef USE_SHARED_MEM_BUFFER newTrack = new AudioTrack(streamType, sampleRate, sample->format(), - channels, sample->getIMemory(), AUDIO_POLICY_OUTPUT_FLAG_NONE, callback, userData); + channels, sample->getIMemory(), AUDIO_OUTPUT_FLAG_NONE, callback, userData); #else newTrack = new AudioTrack(streamType, sampleRate, sample->format(), - channels, frameCount, AUDIO_POLICY_OUTPUT_FLAG_NONE, callback, userData, + channels, frameCount, AUDIO_OUTPUT_FLAG_NONE, callback, userData, bufferFrames); #endif oldTrack = mAudioTrack; diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index c93b6fd..253602d 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -1024,7 +1024,7 @@ bool ToneGenerator::initAudioTrack() { AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_MONO, 0, // frameCount - AUDIO_POLICY_OUTPUT_FLAG_FAST, + AUDIO_OUTPUT_FLAG_FAST, audioCallback, this, // user 0, // notificationFrames diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8bde8f1..7254599 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1587,7 +1587,7 @@ status_t MediaPlayerService::AudioOutput::open( format, channelMask, frameCount, - AUDIO_POLICY_OUTPUT_FLAG_NONE, + AUDIO_OUTPUT_FLAG_NONE, CallbackWrapper, mCallbackData, 0, // notification frames @@ -1599,7 +1599,7 @@ status_t MediaPlayerService::AudioOutput::open( format, channelMask, frameCount, - AUDIO_POLICY_OUTPUT_FLAG_NONE, + AUDIO_OUTPUT_FLAG_NONE, NULL, NULL, 0, diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 0f816e7..468fe2c 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -151,7 +151,7 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) { mAudioTrack = new AudioTrack( AUDIO_STREAM_MUSIC, mSampleRate, AUDIO_FORMAT_PCM_16_BIT, audioMask, - 0, AUDIO_POLICY_OUTPUT_FLAG_NONE, &AudioCallback, this, 0); + 0, AUDIO_OUTPUT_FLAG_NONE, &AudioCallback, this, 0); if ((err = mAudioTrack->initCheck()) != OK) { delete mAudioTrack; diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index b37eea2..c674c24 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1608,7 +1608,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac // FIXME test that MixerThread for this fast track has a capable output HAL // FIXME add a permission test also? ) ) { - ALOGW("AUDIO_POLICY_OUTPUT_FLAG_FAST denied"); + ALOGW("AUDIO_OUTPUT_FLAG_FAST denied"); flags &= ~IAudioFlinger::TRACK_FAST; } @@ -3696,7 +3696,7 @@ status_t AudioFlinger::PlaybackThread::Track::start(pid_t tid, mName, IPCThreadState::self()->getCallingPid(), mSessionId, tid); // check for use case 2 with missing callback if (isFastTrack() && (mSharedBuffer == 0) && (tid == 0)) { - ALOGW("AUDIO_POLICY_OUTPUT_FLAG_FAST denied"); + ALOGW("AUDIO_OUTPUT_FLAG_FAST denied"); mFlags &= ~IAudioFlinger::TRACK_FAST; // FIXME the track must be invalidated and moved to another thread or // attached directly to the normal mixer now @@ -5792,7 +5792,7 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { status_t status; PlaybackThread *thread = NULL; @@ -5844,7 +5844,7 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, if (status == NO_ERROR && outStream != NULL) { AudioStreamOut *output = new AudioStreamOut(outHwDev, outStream); - if ((flags & AUDIO_POLICY_OUTPUT_FLAG_DIRECT) || + if ((flags & AUDIO_OUTPUT_FLAG_DIRECT) || (config.format != AUDIO_FORMAT_PCM_16_BIT) || (config.channel_mask != AUDIO_CHANNEL_OUT_STEREO)) { thread = new DirectOutputThread(this, output, id, *pDevices); @@ -5864,7 +5864,7 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, thread->audioConfigChanged_l(AudioSystem::OUTPUT_OPENED); // the first primary output opened designates the primary hw device - if ((mPrimaryHardwareDev == NULL) && (flags & AUDIO_POLICY_OUTPUT_FLAG_PRIMARY)) { + if ((mPrimaryHardwareDev == NULL) && (flags & AUDIO_OUTPUT_FLAG_PRIMARY)) { ALOGI("Using module %d has the primary audio interface", module); mPrimaryHardwareDev = outHwDev; diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 9e6201a..b1c5554 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -144,7 +144,7 @@ public: audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags); + audio_output_flags_t flags); virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2); diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 15f4349..ca25ba9 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -224,7 +224,7 @@ audio_io_handle_t AudioPolicyService::getOutput(audio_stream_type_t stream, uint32_t samplingRate, audio_format_t format, uint32_t channels, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { if (mpAudioPolicy == NULL) { return 0; @@ -1349,7 +1349,7 @@ static audio_io_handle_t aps_open_output(void *service, audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); if (af == 0) { @@ -1368,7 +1368,7 @@ static audio_io_handle_t aps_open_output_on_module(void *service, audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) + audio_output_flags_t flags) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); if (af == 0) { diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index 9ed905d..fbca000 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -65,8 +65,8 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, - audio_policy_output_flags_t flags = - AUDIO_POLICY_OUTPUT_FLAG_NONE); + audio_output_flags_t flags = + AUDIO_OUTPUT_FLAG_NONE); virtual status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0); |