Snap for 6793014 from 424180bdc4aa18249e678daebfd0fcf9365f6e5d to master (76313677) · Commits · e / os / android_frameworks_av

media/libaaudio/src/legacy/AudioStreamTrack.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,7 @@ aaudio_result_t AudioStreamTrack::open(const AudioStreamBuilder& builder)
		// that is some multiple of the burst size.
		notificationFrames = 0 - DEFAULT_BURSTS_PER_BUFFER_CAPACITY;
		} else {
		// To avoid glitching, let AudioFlinger pick the optimal burst size.
		notificationFrames = 0;
		notificationFrames = builder.getFramesPerDataCallback();
		}
		}
		mCallbackBufferSize = builder.getFramesPerDataCallback();

media/libaudioclient/AudioTrack.cpp

+3 −13

Original line number	Diff line number	Diff line
		@@ -210,11 +210,7 @@ status_t AudioTrack::getMetrics(mediametrics::Item * &item)
		return NO_ERROR;
		}

		AudioTrack::AudioTrack() : AudioTrack("" /opPackageName/)
		{
		}

		AudioTrack::AudioTrack(const std::string& opPackageName)
		AudioTrack::AudioTrack()
		: mStatus(NO_INIT),
		mState(STATE_STOPPED),
		mPreviousPriority(ANDROID_PRIORITY_NORMAL),
		@@ -222,7 +218,6 @@ AudioTrack::AudioTrack(const std::string& opPackageName)
		mPausedPosition(0),
		mSelectedDeviceId(AUDIO_PORT_HANDLE_NONE),
		mRoutedDeviceId(AUDIO_PORT_HANDLE_NONE),
		mOpPackageName(opPackageName),
		mAudioTrackCallback(new AudioTrackCallback())
		{
		mAttributes.content_type = AUDIO_CONTENT_TYPE_UNKNOWN;
		@@ -249,14 +244,12 @@ AudioTrack::AudioTrack(
		const audio_attributes_t* pAttributes,
		bool doNotReconnect,
		float maxRequiredSpeed,
		audio_port_handle_t selectedDeviceId,
		const std::string& opPackageName)
		audio_port_handle_t selectedDeviceId)
		: mStatus(NO_INIT),
		mState(STATE_STOPPED),
		mPreviousPriority(ANDROID_PRIORITY_NORMAL),
		mPreviousSchedulingGroup(SP_DEFAULT),
		mPausedPosition(0),
		mOpPackageName(opPackageName),
		mAudioTrackCallback(new AudioTrackCallback())
		{
		mAttributes = AUDIO_ATTRIBUTES_INITIALIZER;
		@@ -284,15 +277,13 @@ AudioTrack::AudioTrack(
		pid_t pid,
		const audio_attributes_t* pAttributes,
		bool doNotReconnect,
		float maxRequiredSpeed,
		const std::string& opPackageName)
		float maxRequiredSpeed)
		: mStatus(NO_INIT),
		mState(STATE_STOPPED),
		mPreviousPriority(ANDROID_PRIORITY_NORMAL),
		mPreviousSchedulingGroup(SP_DEFAULT),
		mPausedPosition(0),
		mSelectedDeviceId(AUDIO_PORT_HANDLE_NONE),
		mOpPackageName(opPackageName),
		mAudioTrackCallback(new AudioTrackCallback())
		{
		mAttributes = AUDIO_ATTRIBUTES_INITIALIZER;
		@@ -1564,7 +1555,6 @@ status_t AudioTrack::createTrack_l()
		input.selectedDeviceId = mSelectedDeviceId;
		input.sessionId = mSessionId;
		input.audioTrackCallback = mAudioTrackCallback;
		input.opPackageName = mOpPackageName;

		IAudioFlinger::CreateTrackOutput output;

media/libaudioclient/include/media/AudioTrack.h

+2 −10

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@
		#include <media/Modulo.h>
		#include <utils/threads.h>

		#include <string>

		#include "android/media/BnAudioTrackCallback.h"
		#include "android/media/IAudioTrackCallback.h"

		@@ -179,8 +177,6 @@ public:
		*/
		AudioTrack();

		AudioTrack(const std::string& opPackageName);

		/* Creates an AudioTrack object and registers it with AudioFlinger.
		* Once created, the track needs to be started before it can be used.
		* Unspecified values are set to appropriate default values.
		@@ -262,8 +258,7 @@ public:
		const audio_attributes_t* pAttributes = NULL,
		bool doNotReconnect = false,
		float maxRequiredSpeed = 1.0f,
		audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE,
		const std::string& opPackageName = "");
		audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE);

		/* Creates an audio track and registers it with AudioFlinger.
		* With this constructor, the track is configured for static buffer mode.
		@@ -293,8 +288,7 @@ public:
		pid_t pid = -1,
		const audio_attributes_t* pAttributes = NULL,
		bool doNotReconnect = false,
		float maxRequiredSpeed = 1.0f,
		const std::string& opPackageName = "");
		float maxRequiredSpeed = 1.0f);

		/* Terminates the AudioTrack and unregisters it from AudioFlinger.
		* Also destroys all resources associated with the AudioTrack.
		@@ -1242,8 +1236,6 @@ public:

		sp<media::VolumeHandler> mVolumeHandler;

		const std::string mOpPackageName;

		private:
		class DeathNotifier : public IBinder::DeathRecipient {
		public:

media/libaudioclient/include/media/IAudioFlinger.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@
		#include <system/audio_policy.h>
		#include <utils/String8.h>
		#include <media/MicrophoneInfo.h>
		#include <string>
		#include <vector>

		#include "android/media/IAudioRecord.h"
		@@ -86,11 +85,6 @@ public:
		speed = parcel->readFloat();
		audioTrackCallback = interface_cast<media::IAudioTrackCallback>(
		parcel->readStrongBinder());
		const char* opPackageNamePtr = parcel->readCString();
		if (opPackageNamePtr == nullptr) {
		return FAILED_TRANSACTION;
		}
		opPackageName = opPackageNamePtr;

		/* input/output arguments*/
		(void)parcel->read(&flags, sizeof(audio_output_flags_t));
		@@ -115,7 +109,6 @@ public:
		(void)parcel->writeInt32(notificationsPerBuffer);
		(void)parcel->writeFloat(speed);
		(void)parcel->writeStrongBinder(IInterface::asBinder(audioTrackCallback));
		(void)parcel->writeCString(opPackageName.c_str());

		/* input/output arguments*/
		(void)parcel->write(&flags, sizeof(audio_output_flags_t));
		@@ -134,7 +127,6 @@ public:
		uint32_t notificationsPerBuffer;
		float speed;
		sp<media::IAudioTrackCallback> audioTrackCallback;
		std::string opPackageName;

		/* input/output */
		audio_output_flags_t flags;

media/libmedia/IMediaPlayerService.cpp

+2 −9

Original line number	Diff line number	Diff line
		@@ -62,13 +62,11 @@ public:
		}

		virtual sp<IMediaPlayer> create(
		const sp<IMediaPlayerClient>& client, audio_session_t audioSessionId,
		const std::string opPackageName) {
		const sp<IMediaPlayerClient>& client, audio_session_t audioSessionId) {
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
		data.writeStrongBinder(IInterface::asBinder(client));
		data.writeInt32(audioSessionId);
		data.writeCString(opPackageName.c_str());

		remote()->transact(CREATE, data, &reply);
		return interface_cast<IMediaPlayer>(reply.readStrongBinder());
		@@ -129,12 +127,7 @@ status_t BnMediaPlayerService::onTransact(
		sp<IMediaPlayerClient> client =
		interface_cast<IMediaPlayerClient>(data.readStrongBinder());
		audio_session_t audioSessionId = (audio_session_t) data.readInt32();
		const char* opPackageName = data.readCString();
		if (opPackageName == nullptr) {
		return FAILED_TRANSACTION;
		}
		std::string opPackageNameStr(opPackageName);
		sp<IMediaPlayer> player = create(client, audioSessionId, opPackageNameStr);
		sp<IMediaPlayer> player = create(client, audioSessionId);
		reply->writeStrongBinder(IInterface::asBinder(player));
		return NO_ERROR;
		} break;