Skip to content

Commit 1c66547

Browse files
gkastenAndroid (Google) Code Review
gkasten
authored and
Android (Google) Code Review
committed
Merge "Use audio_format_t consistently"
2 parents cc98580 + 1c5a89d commit 1c66547

File tree

13 files changed

+51
-49
lines changed

13 files changed

+51
-49
lines changed

‎core/jni/android_media_AudioTrack.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
240240

241241
// compute the frame count
242242
int bytesPerSample = audioFormat == javaAudioTrackFields.PCM16 ? 2 : 1;
243-
int format = audioFormat == javaAudioTrackFields.PCM16 ?
243+
audio_format_t format = audioFormat == javaAudioTrackFields.PCM16 ?
244244
AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_8_BIT;
245245
int frameCount = buffSizeInBytes / (nbChannels * bytesPerSample);
246246

‎include/media/AudioTrack.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ class AudioTrack : virtual public RefBase
6969
MUTE = 0x00000001
7070
};
7171
uint32_t flags;
72-
int format;
72+
audio_format_t format; // but AUDIO_FORMAT_PCM_8_BIT -> AUDIO_FORMAT_PCM_16_BIT
73+
// accessed directly by WebKit ANP callback
7374
int channelCount; // will be removed in the future, do not use
7475
size_t frameCount;
7576
size_t size;
@@ -143,7 +144,7 @@ class AudioTrack : virtual public RefBase
143144

144145
AudioTrack( int streamType,
145146
uint32_t sampleRate = 0,
146-
int format = 0,
147+
audio_format_t format = AUDIO_FORMAT_DEFAULT,
147148
int channelMask = 0,
148149
int frameCount = 0,
149150
uint32_t flags = 0,
@@ -163,7 +164,7 @@ class AudioTrack : virtual public RefBase
163164

164165
AudioTrack( int streamType,
165166
uint32_t sampleRate = 0,
166-
int format = 0,
167+
audio_format_t format = AUDIO_FORMAT_DEFAULT,
167168
int channelMask = 0,
168169
const sp<IMemory>& sharedBuffer = 0,
169170
uint32_t flags = 0,
@@ -187,7 +188,7 @@ class AudioTrack : virtual public RefBase
187188
* */
188189
status_t set(int streamType =-1,
189190
uint32_t sampleRate = 0,
190-
int format = 0,
191+
audio_format_t format = AUDIO_FORMAT_DEFAULT,
191192
int channelMask = 0,
192193
int frameCount = 0,
193194
uint32_t flags = 0,
@@ -215,7 +216,7 @@ class AudioTrack : virtual public RefBase
215216
/* getters, see constructor */
216217

217218
int streamType() const;
218-
int format() const;
219+
audio_format_t format() const;
219220
int channelCount() const;
220221
uint32_t frameCount() const;
221222
int frameSize() const;
@@ -434,7 +435,7 @@ class AudioTrack : virtual public RefBase
434435
bool processAudioBuffer(const sp<AudioTrackThread>& thread);
435436
status_t createTrack_l(int streamType,
436437
uint32_t sampleRate,
437-
uint32_t format,
438+
audio_format_t format,
438439
uint32_t channelMask,
439440
int frameCount,
440441
uint32_t flags,
@@ -456,7 +457,7 @@ class AudioTrack : virtual public RefBase
456457
uint32_t mFrameCount;
457458

458459
audio_track_cblk_t* mCblk;
459-
uint32_t mFormat;
460+
audio_format_t mFormat;
460461
uint8_t mStreamType;
461462
uint8_t mChannelCount;
462463
uint8_t mMuted;

‎include/media/IMediaPlayerService.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <utils/String8.h>
2424
#include <binder/IInterface.h>
2525
#include <binder/Parcel.h>
26+
#include <system/audio.h>
2627

2728
#include <media/IMediaPlayerClient.h>
2829
#include <media/IMediaPlayer.h>
@@ -43,8 +44,8 @@ class IMediaPlayerService: public IInterface
4344
virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0;
4445
virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0;
4546

46-
virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;
47-
virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;
47+
virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) = 0;
48+
virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) = 0;
4849
virtual sp<IOMX> getOMX() = 0;
4950

5051
// codecs and audio devices usage tracking for the battery app

‎include/media/MediaPlayerInterface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class MediaPlayerBase : public RefBase
8585
// audio data.
8686
virtual status_t open(
8787
uint32_t sampleRate, int channelCount,
88-
int format=AUDIO_FORMAT_PCM_16_BIT,
88+
audio_format_t format=AUDIO_FORMAT_PCM_16_BIT,
8989
int bufferCount=DEFAULT_AUDIOSINK_BUFFERCOUNT,
9090
AudioCallback cb = NULL,
9191
void *cookie = NULL) = 0;

‎include/media/mediaplayer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ class MediaPlayer : public BnMediaPlayerClient,
190190
bool isLooping();
191191
status_t setVolume(float leftVolume, float rightVolume);
192192
void notify(int msg, int ext1, int ext2, const Parcel *obj = NULL);
193-
static sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat);
194-
static sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat);
193+
static sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat);
194+
static sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat);
195195
status_t invoke(const Parcel& request, Parcel *reply);
196196
status_t setMetadataFilter(const Parcel& filter);
197197
status_t getMetadata(bool update_only, bool apply_filter, Parcel *metadata);

‎media/jni/soundpool/SoundPool.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ status_t Sample::doLoad()
496496
{
497497
uint32_t sampleRate;
498498
int numChannels;
499-
int format;
499+
audio_format_t format;
500500
sp<IMemory> p;
501501
ALOGV("Start decode");
502502
if (mUrl) {

‎media/jni/soundpool/SoundPool.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Sample : public RefBase {
5656
int sampleID() { return mSampleID; }
5757
int numChannels() { return mNumChannels; }
5858
int sampleRate() { return mSampleRate; }
59-
int format() { return mFormat; }
59+
audio_format_t format() { return mFormat; }
6060
size_t size() { return mSize; }
6161
int state() { return mState; }
6262
uint8_t* data() { return static_cast<uint8_t*>(mData->pointer()); }
@@ -65,7 +65,7 @@ class Sample : public RefBase {
6565
sp<IMemory> getIMemory() { return mData; }
6666

6767
// hack
68-
void init(int numChannels, int sampleRate, int format, size_t size, sp<IMemory> data ) {
68+
void init(int numChannels, int sampleRate, audio_format_t format, size_t size, sp<IMemory> data ) {
6969
mNumChannels = numChannels; mSampleRate = sampleRate; mFormat = format; mSize = size; mData = data; }
7070

7171
private:
@@ -77,7 +77,7 @@ class Sample : public RefBase {
7777
uint16_t mSampleRate;
7878
uint8_t mState : 3;
7979
uint8_t mNumChannels : 2;
80-
uint8_t mFormat : 2;
80+
audio_format_t mFormat;
8181
int mFd;
8282
int64_t mOffset;
8383
int64_t mLength;

‎media/libmedia/AudioTrack.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ AudioTrack::AudioTrack()
8585
AudioTrack::AudioTrack(
8686
int streamType,
8787
uint32_t sampleRate,
88-
int format,
88+
audio_format_t format,
8989
int channelMask,
9090
int frameCount,
9191
uint32_t flags,
@@ -104,7 +104,7 @@ AudioTrack::AudioTrack(
104104
AudioTrack::AudioTrack(
105105
int streamType,
106106
uint32_t sampleRate,
107-
int format,
107+
audio_format_t format,
108108
int channelMask,
109109
const sp<IMemory>& sharedBuffer,
110110
uint32_t flags,
@@ -142,7 +142,7 @@ AudioTrack::~AudioTrack()
142142
status_t AudioTrack::set(
143143
int streamType,
144144
uint32_t sampleRate,
145-
int format,
145+
audio_format_t format,
146146
int channelMask,
147147
int frameCount,
148148
uint32_t flags,
@@ -179,7 +179,7 @@ status_t AudioTrack::set(
179179
sampleRate = afSampleRate;
180180
}
181181
// these below should probably come from the audioFlinger too...
182-
if (format == 0) {
182+
if (format == AUDIO_FORMAT_DEFAULT) {
183183
format = AUDIO_FORMAT_PCM_16_BIT;
184184
}
185185
if (channelMask == 0) {
@@ -205,7 +205,7 @@ status_t AudioTrack::set(
205205

206206
audio_io_handle_t output = AudioSystem::getOutput(
207207
(audio_stream_type_t)streamType,
208-
sampleRate,format, channelMask,
208+
sampleRate, format, channelMask,
209209
(audio_policy_output_flags_t)flags);
210210

211211
if (output == 0) {
@@ -224,7 +224,7 @@ status_t AudioTrack::set(
224224
// create the IAudioTrack
225225
status_t status = createTrack_l(streamType,
226226
sampleRate,
227-
(uint32_t)format,
227+
format,
228228
(uint32_t)channelMask,
229229
frameCount,
230230
flags,
@@ -243,7 +243,7 @@ status_t AudioTrack::set(
243243
mStatus = NO_ERROR;
244244

245245
mStreamType = streamType;
246-
mFormat = (uint32_t)format;
246+
mFormat = format;
247247
mChannelMask = (uint32_t)channelMask;
248248
mChannelCount = channelCount;
249249
mSharedBuffer = sharedBuffer;
@@ -280,7 +280,7 @@ int AudioTrack::streamType() const
280280
return mStreamType;
281281
}
282282

283-
int AudioTrack::format() const
283+
audio_format_t AudioTrack::format() const
284284
{
285285
return mFormat;
286286
}
@@ -713,7 +713,7 @@ status_t AudioTrack::attachAuxEffect(int effectId)
713713
status_t AudioTrack::createTrack_l(
714714
int streamType,
715715
uint32_t sampleRate,
716-
uint32_t format,
716+
audio_format_t format,
717717
uint32_t channelMask,
718718
int frameCount,
719719
uint32_t flags,

‎media/libmedia/IMediaPlayerService.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ class BpMediaPlayerService: public BpInterface<IMediaPlayerService>
7878
return interface_cast<IMediaRecorder>(reply.readStrongBinder());
7979
}
8080

81-
virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat)
81+
virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat)
8282
{
8383
Parcel data, reply;
8484
data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
8585
data.writeCString(url);
8686
remote()->transact(DECODE_URL, data, &reply);
8787
*pSampleRate = uint32_t(reply.readInt32());
8888
*pNumChannels = reply.readInt32();
89-
*pFormat = reply.readInt32();
89+
*pFormat = (audio_format_t) reply.readInt32();
9090
return interface_cast<IMemory>(reply.readStrongBinder());
9191
}
9292

93-
virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat)
93+
virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat)
9494
{
9595
Parcel data, reply;
9696
data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
@@ -100,7 +100,7 @@ class BpMediaPlayerService: public BpInterface<IMediaPlayerService>
100100
remote()->transact(DECODE_FD, data, &reply);
101101
*pSampleRate = uint32_t(reply.readInt32());
102102
*pNumChannels = reply.readInt32();
103-
*pFormat = reply.readInt32();
103+
*pFormat = (audio_format_t) reply.readInt32();
104104
return interface_cast<IMemory>(reply.readStrongBinder());
105105
}
106106

@@ -148,11 +148,11 @@ status_t BnMediaPlayerService::onTransact(
148148
const char* url = data.readCString();
149149
uint32_t sampleRate;
150150
int numChannels;
151-
int format;
151+
audio_format_t format;
152152
sp<IMemory> player = decode(url, &sampleRate, &numChannels, &format);
153153
reply->writeInt32(sampleRate);
154154
reply->writeInt32(numChannels);
155-
reply->writeInt32(format);
155+
reply->writeInt32((int32_t) format);
156156
reply->writeStrongBinder(player->asBinder());
157157
return NO_ERROR;
158158
} break;
@@ -163,11 +163,11 @@ status_t BnMediaPlayerService::onTransact(
163163
int64_t length = data.readInt64();
164164
uint32_t sampleRate;
165165
int numChannels;
166-
int format;
166+
audio_format_t format;
167167
sp<IMemory> player = decode(fd, offset, length, &sampleRate, &numChannels, &format);
168168
reply->writeInt32(sampleRate);
169169
reply->writeInt32(numChannels);
170-
reply->writeInt32(format);
170+
reply->writeInt32((int32_t) format);
171171
reply->writeStrongBinder(player->asBinder());
172172
return NO_ERROR;
173173
} break;

‎media/libmedia/JetPlayer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int JetPlayer::init()
9191
mAudioTrack = new AudioTrack();
9292
mAudioTrack->set(AUDIO_STREAM_MUSIC, //TODO parametrize this
9393
pLibConfig->sampleRate,
94-
1, // format = PCM 16bits per sample,
94+
AUDIO_FORMAT_PCM_16_BIT,
9595
(pLibConfig->numChannels == 2) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,
9696
mTrackBufferSize,
9797
0);

0 commit comments

Comments
 (0)