Skip to content

Commit dc4bb3f

Browse files
gkastenAndroid (Google) Code Review
gkasten
authored and
Android (Google) Code Review
committed
Merge "Use audio_policy_output_flags_t consistently"
2 parents 559c484 + 28b269f commit dc4bb3f

File tree

12 files changed

+32
-29
lines changed

12 files changed

+32
-29
lines changed

‎core/jni/android_media_AudioTrack.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
279279
format,// word length, PCM
280280
nativeChannelMask,
281281
frameCount,
282-
0,// flags
282+
AUDIO_POLICY_OUTPUT_FLAG_NONE,
283283
audioCallback, &(lpJniStorage->mCallbackData),//callback, callback data (user)
284284
0,// notificationFrames == 0 since not using EVENT_MORE_DATA to feed the AudioTrack
285285
0,// shared mem
@@ -300,7 +300,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
300300
format,// word length, PCM
301301
nativeChannelMask,
302302
frameCount,
303-
0,// flags
303+
AUDIO_POLICY_OUTPUT_FLAG_NONE,
304304
audioCallback, &(lpJniStorage->mCallbackData),//callback, callback data (user));
305305
0,// notificationFrames == 0 since not using EVENT_MORE_DATA to feed the AudioTrack
306306
lpJniStorage->mMemBase,// shared mem

‎include/media/AudioTrack.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class AudioTrack : virtual public RefBase
153153
audio_format_t format = AUDIO_FORMAT_DEFAULT,
154154
int channelMask = 0,
155155
int frameCount = 0,
156-
uint32_t flags = 0,
156+
audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,
157157
callback_t cbf = NULL,
158158
void* user = NULL,
159159
int notificationFrames = 0,
@@ -165,7 +165,7 @@ class AudioTrack : virtual public RefBase
165165
int format = AUDIO_FORMAT_DEFAULT,
166166
int channelMask = 0,
167167
int frameCount = 0,
168-
uint32_t flags = 0,
168+
uint32_t flags = (uint32_t) AUDIO_POLICY_OUTPUT_FLAG_NONE,
169169
callback_t cbf = 0,
170170
void* user = 0,
171171
int notificationFrames = 0,
@@ -185,7 +185,7 @@ class AudioTrack : virtual public RefBase
185185
audio_format_t format = AUDIO_FORMAT_DEFAULT,
186186
int channelMask = 0,
187187
const sp<IMemory>& sharedBuffer = 0,
188-
uint32_t flags = 0,
188+
audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,
189189
callback_t cbf = NULL,
190190
void* user = NULL,
191191
int notificationFrames = 0,
@@ -209,7 +209,7 @@ class AudioTrack : virtual public RefBase
209209
audio_format_t format = AUDIO_FORMAT_DEFAULT,
210210
int channelMask = 0,
211211
int frameCount = 0,
212-
uint32_t flags = 0,
212+
audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,
213213
callback_t cbf = NULL,
214214
void* user = NULL,
215215
int notificationFrames = 0,
@@ -473,7 +473,7 @@ class AudioTrack : virtual public RefBase
473473
audio_format_t format,
474474
uint32_t channelMask,
475475
int frameCount,
476-
uint32_t flags,
476+
audio_policy_output_flags_t flags,
477477
const sp<IMemory>& sharedBuffer,
478478
audio_io_handle_t output,
479479
bool enforceFrameCount);
@@ -515,7 +515,7 @@ class AudioTrack : virtual public RefBase
515515
uint32_t mNewPosition;
516516
uint32_t mUpdatePeriod;
517517
bool mFlushed; // FIXME will be made obsolete by making flush() synchronous
518-
uint32_t mFlags;
518+
audio_policy_output_flags_t mFlags;
519519
int mSessionId;
520520
int mAuxEffectId;
521521
mutable Mutex mLock;

‎include/media/IAudioFlinger.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <media/IAudioRecord.h>
2929
#include <media/IAudioFlingerClient.h>
3030
#include <system/audio.h>
31+
#include <system/audio_policy.h>
3132
#include <hardware/audio_effect.h>
3233
#include <media/IEffect.h>
3334
#include <media/IEffectClient.h>
@@ -121,7 +122,7 @@ class IAudioFlinger : public IInterface
121122
audio_format_t *pFormat,
122123
uint32_t *pChannels,
123124
uint32_t *pLatencyMs,
124-
uint32_t flags) = 0;
125+
audio_policy_output_flags_t flags) = 0;
125126
virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1,
126127
audio_io_handle_t output2) = 0;
127128
virtual status_t closeOutput(audio_io_handle_t output) = 0;

‎media/jni/soundpool/SoundPool.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,11 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
608608
// do not create a new audio track if current track is compatible with sample parameters
609609
#ifdef USE_SHARED_MEM_BUFFER
610610
newTrack = new AudioTrack(streamType, sampleRate, sample->format(),
611-
channels, sample->getIMemory(), 0, callback, userData);
611+
channels, sample->getIMemory(), AUDIO_POLICY_OUTPUT_FLAG_NONE, callback, userData);
612612
#else
613613
newTrack = new AudioTrack(streamType, sampleRate, sample->format(),
614-
channels, frameCount, 0, callback, userData, bufferFrames);
614+
channels, frameCount, AUDIO_POLICY_OUTPUT_FLAG_NONE, callback, userData,
615+
bufferFrames);
615616
#endif
616617
oldTrack = mAudioTrack;
617618
status = newTrack->initCheck();

‎media/libmedia/AudioTrack.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ AudioTrack::AudioTrack(
9292
audio_format_t format,
9393
int channelMask,
9494
int frameCount,
95-
uint32_t flags,
95+
audio_policy_output_flags_t flags,
9696
callback_t cbf,
9797
void* user,
9898
int notificationFrames,
@@ -119,10 +119,11 @@ AudioTrack::AudioTrack(
119119
int notificationFrames,
120120
int sessionId)
121121
: mStatus(NO_INIT),
122+
mIsTimed(false),
122123
mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)
123124
{
124125
mStatus = set((audio_stream_type_t)streamType, sampleRate, (audio_format_t)format, channelMask,
125-
frameCount, flags, cbf, user, notificationFrames,
126+
frameCount, (audio_policy_output_flags_t)flags, cbf, user, notificationFrames,
126127
0, false, sessionId);
127128
}
128129

@@ -132,7 +133,7 @@ AudioTrack::AudioTrack(
132133
audio_format_t format,
133134
int channelMask,
134135
const sp<IMemory>& sharedBuffer,
135-
uint32_t flags,
136+
audio_policy_output_flags_t flags,
136137
callback_t cbf,
137138
void* user,
138139
int notificationFrames,
@@ -172,7 +173,7 @@ status_t AudioTrack::set(
172173
audio_format_t format,
173174
int channelMask,
174175
int frameCount,
175-
uint32_t flags,
176+
audio_policy_output_flags_t flags,
176177
callback_t cbf,
177178
void* user,
178179
int notificationFrames,
@@ -221,7 +222,7 @@ status_t AudioTrack::set(
221222

222223
// force direct flag if format is not linear PCM
223224
if (!audio_is_linear_pcm(format)) {
224-
flags |= AUDIO_POLICY_OUTPUT_FLAG_DIRECT;
225+
flags = (audio_policy_output_flags_t) (flags | AUDIO_POLICY_OUTPUT_FLAG_DIRECT);
225226
}
226227

227228
if (!audio_is_output_channel(channelMask)) {
@@ -233,7 +234,7 @@ status_t AudioTrack::set(
233234
audio_io_handle_t output = AudioSystem::getOutput(
234235
streamType,
235236
sampleRate, format, channelMask,
236-
(audio_policy_output_flags_t)flags);
237+
flags);
237238

238239
if (output == 0) {
239240
ALOGE("Could not get audio output for stream type %d", streamType);
@@ -707,7 +708,7 @@ audio_io_handle_t AudioTrack::getOutput()
707708
audio_io_handle_t AudioTrack::getOutput_l()
708709
{
709710
return AudioSystem::getOutput(mStreamType,
710-
mCblk->sampleRate, mFormat, mChannelMask, (audio_policy_output_flags_t)mFlags);
711+
mCblk->sampleRate, mFormat, mChannelMask, mFlags);
711712
}
712713

713714
int AudioTrack::getSessionId() const
@@ -734,7 +735,7 @@ status_t AudioTrack::createTrack_l(
734735
audio_format_t format,
735736
uint32_t channelMask,
736737
int frameCount,
737-
uint32_t flags,
738+
audio_policy_output_flags_t flags,
738739
const sp<IMemory>& sharedBuffer,
739740
audio_io_handle_t output,
740741
bool enforceFrameCount)

‎media/libmedia/IAudioFlinger.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class BpAudioFlinger : public BpInterface<IAudioFlinger>
362362
audio_format_t *pFormat,
363363
uint32_t *pChannels,
364364
uint32_t *pLatencyMs,
365-
uint32_t flags)
365+
audio_policy_output_flags_t flags)
366366
{
367367
Parcel data, reply;
368368
uint32_t devices = pDevices ? *pDevices : 0;
@@ -377,7 +377,7 @@ class BpAudioFlinger : public BpInterface<IAudioFlinger>
377377
data.writeInt32(format);
378378
data.writeInt32(channels);
379379
data.writeInt32(latency);
380-
data.writeInt32(flags);
380+
data.writeInt32((int32_t) flags);
381381
remote()->transact(OPEN_OUTPUT, data, &reply);
382382
audio_io_handle_t output = (audio_io_handle_t) reply.readInt32();
383383
ALOGV("openOutput() returned output, %d", output);
@@ -845,7 +845,7 @@ status_t BnAudioFlinger::onTransact(
845845
audio_format_t format = (audio_format_t) data.readInt32();
846846
uint32_t channels = data.readInt32();
847847
uint32_t latency = data.readInt32();
848-
uint32_t flags = data.readInt32();
848+
audio_policy_output_flags_t flags = (audio_policy_output_flags_t) data.readInt32();
849849
audio_io_handle_t output = openOutput(&devices,
850850
&samplingRate,
851851
&format,

‎media/libmedia/JetPlayer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int JetPlayer::init()
9494
AUDIO_FORMAT_PCM_16_BIT,
9595
(pLibConfig->numChannels == 2) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,
9696
mTrackBufferSize,
97-
0);
97+
AUDIO_POLICY_OUTPUT_FLAG_NONE);
9898

9999
// create render and playback thread
100100
{

‎media/libmedia/ToneGenerator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ bool ToneGenerator::initAudioTrack() {
10241024
AUDIO_FORMAT_PCM_16_BIT,
10251025
AUDIO_CHANNEL_OUT_MONO,
10261026
0,
1027-
0,
1027+
AUDIO_POLICY_OUTPUT_FLAG_NONE,
10281028
audioCallback,
10291029
this,
10301030
0,

‎media/libmediaplayerservice/MediaPlayerService.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ status_t MediaPlayerService::AudioOutput::open(
15031503
format,
15041504
channelMask,
15051505
frameCount,
1506-
0 /* flags */,
1506+
AUDIO_POLICY_OUTPUT_FLAG_NONE,
15071507
CallbackWrapper,
15081508
this,
15091509
0,
@@ -1515,7 +1515,7 @@ status_t MediaPlayerService::AudioOutput::open(
15151515
format,
15161516
channelMask,
15171517
frameCount,
1518-
0,
1518+
AUDIO_POLICY_OUTPUT_FLAG_NONE,
15191519
NULL,
15201520
NULL,
15211521
0,

‎media/libstagefright/AudioPlayer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {
151151

152152
mAudioTrack = new AudioTrack(
153153
AUDIO_STREAM_MUSIC, mSampleRate, AUDIO_FORMAT_PCM_16_BIT, audioMask,
154-
0, 0, &AudioCallback, this, 0);
154+
0, AUDIO_POLICY_OUTPUT_FLAG_NONE, &AudioCallback, this, 0);
155155

156156
if ((err = mAudioTrack->initCheck()) != OK) {
157157
delete mAudioTrack;

0 commit comments

Comments
 (0)