Merge "Use audio_format_t consistently" (4cc55d53) · Commits · e / os / android_frameworks_av

include/media/AudioTrack.h

+8 −7

Original line number	Diff line number	Diff line
		@@ -69,7 +69,8 @@ public:
		MUTE = 0x00000001
		};
		uint32_t flags;
		int format;
		audio_format_t format; // but AUDIO_FORMAT_PCM_8_BIT -> AUDIO_FORMAT_PCM_16_BIT
		// accessed directly by WebKit ANP callback
		int channelCount; // will be removed in the future, do not use
		size_t frameCount;
		size_t size;
		@@ -143,7 +144,7 @@ public:

		AudioTrack( int streamType,
		uint32_t sampleRate = 0,
		int format = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		int frameCount = 0,
		uint32_t flags = 0,
		@@ -163,7 +164,7 @@ public:

		AudioTrack( int streamType,
		uint32_t sampleRate = 0,
		int format = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		const sp<IMemory>& sharedBuffer = 0,
		uint32_t flags = 0,
		@@ -187,7 +188,7 @@ public:
		* */
		status_t set(int streamType =-1,
		uint32_t sampleRate = 0,
		int format = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		int frameCount = 0,
		uint32_t flags = 0,
		@@ -215,7 +216,7 @@ public:
		/* getters, see constructor */

		int streamType() const;
		int format() const;
		audio_format_t format() const;
		int channelCount() const;
		uint32_t frameCount() const;
		int frameSize() const;
		@@ -434,7 +435,7 @@ private:
		bool processAudioBuffer(const sp<AudioTrackThread>& thread);
		status_t createTrack_l(int streamType,
		uint32_t sampleRate,
		uint32_t format,
		audio_format_t format,
		uint32_t channelMask,
		int frameCount,
		uint32_t flags,
		@@ -456,7 +457,7 @@ private:
		uint32_t mFrameCount;

		audio_track_cblk_t* mCblk;
		uint32_t mFormat;
		audio_format_t mFormat;
		uint8_t mStreamType;
		uint8_t mChannelCount;
		uint8_t mMuted;

include/media/IMediaPlayerService.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <utils/String8.h>
		#include <binder/IInterface.h>
		#include <binder/Parcel.h>
		#include <system/audio.h>

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

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

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

include/media/MediaPlayerInterface.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ public:
		// audio data.
		virtual status_t open(
		uint32_t sampleRate, int channelCount,
		int format=AUDIO_FORMAT_PCM_16_BIT,
		audio_format_t format=AUDIO_FORMAT_PCM_16_BIT,
		int bufferCount=DEFAULT_AUDIOSINK_BUFFERCOUNT,
		AudioCallback cb = NULL,
		void *cookie = NULL) = 0;

include/media/mediaplayer.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -190,8 +190,8 @@ public:
		bool isLooping();
		status_t setVolume(float leftVolume, float rightVolume);
		void notify(int msg, int ext1, int ext2, const Parcel *obj = NULL);
		static sp<IMemory> decode(const char* url, uint32_t pSampleRate, int pNumChannels, int* pFormat);
		static sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t pSampleRate, int pNumChannels, int* pFormat);
		static sp<IMemory> decode(const char* url, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat);
		static sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat);
		status_t invoke(const Parcel& request, Parcel *reply);
		status_t setMetadataFilter(const Parcel& filter);
		status_t getMetadata(bool update_only, bool apply_filter, Parcel *metadata);

media/libmedia/AudioTrack.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ AudioTrack::AudioTrack()
		AudioTrack::AudioTrack(
		int streamType,
		uint32_t sampleRate,
		int format,
		audio_format_t format,
		int channelMask,
		int frameCount,
		uint32_t flags,
		@@ -104,7 +104,7 @@ AudioTrack::AudioTrack(
		AudioTrack::AudioTrack(
		int streamType,
		uint32_t sampleRate,
		int format,
		audio_format_t format,
		int channelMask,
		const sp<IMemory>& sharedBuffer,
		uint32_t flags,
		@@ -142,7 +142,7 @@ AudioTrack::~AudioTrack()
		status_t AudioTrack::set(
		int streamType,
		uint32_t sampleRate,
		int format,
		audio_format_t format,
		int channelMask,
		int frameCount,
		uint32_t flags,
		@@ -179,7 +179,7 @@ status_t AudioTrack::set(
		sampleRate = afSampleRate;
		}
		// these below should probably come from the audioFlinger too...
		if (format == 0) {
		if (format == AUDIO_FORMAT_DEFAULT) {
		format = AUDIO_FORMAT_PCM_16_BIT;
		}
		if (channelMask == 0) {
		@@ -224,7 +224,7 @@ status_t AudioTrack::set(
		// create the IAudioTrack
		status_t status = createTrack_l(streamType,
		sampleRate,
		(uint32_t)format,
		format,
		(uint32_t)channelMask,
		frameCount,
		flags,
		@@ -243,7 +243,7 @@ status_t AudioTrack::set(
		mStatus = NO_ERROR;

		mStreamType = streamType;
		mFormat = (uint32_t)format;
		mFormat = format;
		mChannelMask = (uint32_t)channelMask;
		mChannelCount = channelCount;
		mSharedBuffer = sharedBuffer;
		@@ -280,7 +280,7 @@ int AudioTrack::streamType() const
		return mStreamType;
		}

		int AudioTrack::format() const
		audio_format_t AudioTrack::format() const
		{
		return mFormat;
		}
		@@ -713,7 +713,7 @@ status_t AudioTrack::attachAuxEffect(int effectId)
		status_t AudioTrack::createTrack_l(
		int streamType,
		uint32_t sampleRate,
		uint32_t format,
		audio_format_t format,
		uint32_t channelMask,
		int frameCount,
		uint32_t flags,