Snap for 4713750 from 94525c7753f84a68d8f799712653cbd3c5824214 to pi-release (aeb0958b) · Commits · e / os / android_frameworks_av

drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ status_t ClearKeyCasFactory::queryPlugins(

		status_t ClearKeyCasFactory::createPlugin(
		int32_t CA_system_id,
		uint64_t appData,
		void *appData,
		CasPluginCallback callback,
		CasPlugin **plugin) {
		if (!isSystemIdSupported(CA_system_id)) {
		@@ -83,7 +83,7 @@ status_t ClearKeyDescramblerFactory::createPlugin(

		///////////////////////////////////////////////////////////////////////////////
		ClearKeyCasPlugin::ClearKeyCasPlugin(
		uint64_t appData, CasPluginCallback callback)
		void *appData, CasPluginCallback callback)
		: mCallback(callback), mAppData(appData) {
		ALOGV("CTOR");
		}

drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ public:
		std::vector<CasPluginDescriptor> *descriptors) const override;
		virtual status_t createPlugin(
		int32_t CA_system_id,
		uint64_t appData,
		void *appData,
		CasPluginCallback callback,
		CasPlugin **plugin) override;
		};
		@@ -62,7 +62,7 @@ public:

		class ClearKeyCasPlugin : public CasPlugin {
		public:
		ClearKeyCasPlugin(uint64_t appData, CasPluginCallback callback);
		ClearKeyCasPlugin(void *appData, CasPluginCallback callback);
		virtual ~ClearKeyCasPlugin();

		virtual status_t setPrivateData(
		@@ -94,7 +94,7 @@ private:
		Mutex mKeyFetcherLock;
		std::unique_ptr<KeyFetcher> mKeyFetcher;
		CasPluginCallback mCallback;
		uint64_t mAppData;
		void* mAppData;
		};

		class ClearKeyDescramblerPlugin : public DescramblerPlugin {

drm/mediacas/plugins/mock/MockCasPlugin.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ status_t MockCasFactory::queryPlugins(

		status_t MockCasFactory::createPlugin(
		int32_t CA_system_id,
		uint64_t /appData/,
		void* /appData/,
		CasPluginCallback /callback/,
		CasPlugin **plugin) {
		if (!isSystemIdSupported(CA_system_id)) {

drm/mediacas/plugins/mock/MockCasPlugin.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public:
		std::vector<CasPluginDescriptor> *descriptors) const override;
		virtual status_t createPlugin(
		int32_t CA_system_id,
		uint64_t appData,
		void *appData,
		CasPluginCallback callback,
		CasPlugin **plugin) override;
		};

media/libaaudio/include/aaudio/AAudio.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,8 @@ typedef int32_t aaudio_performance_mode_t;
		* to make more refined volume or routing decisions.
		*
		* Note that these match the equivalent values in AudioAttributes in the Android Java API.
		*
		* Added in API level 28.
		*/
		enum {
		/**
		@@ -220,6 +222,8 @@ typedef int32_t aaudio_usage_t;
		* enforce audio focus.
		*
		* Note that these match the equivalent values in AudioAttributes in the Android Java API.
		*
		* Added in API level 28.
		*/
		enum {

		@@ -252,6 +256,8 @@ typedef int32_t aaudio_content_type_t;
		* configuration.
		*
		* Note that these match the equivalent values in MediaRecorder.AudioSource in the Android Java API.
		*
		* Added in API level 28.
		*/
		enum {
		/**
		@@ -288,6 +294,8 @@ enum {
		* Do not allocate a session ID.
		* Effects cannot be used with this stream.
		* Default.
		*
		* Added in API level 28.
		*/
		AAUDIO_SESSION_ID_NONE = -1,

		@@ -297,6 +305,8 @@ enum {
		* Note that the use of this flag may result in higher latency.
		*
		* Note that this matches the value of AudioManager.AUDIO_SESSION_ID_GENERATE.
		*
		* Added in API level 28.
		*/
		AAUDIO_SESSION_ID_ALLOCATE = 0,
		};
		@@ -481,6 +491,8 @@ AAUDIO_API void AAudioStreamBuilder_setPerformanceMode(AAudioStreamBuilder* buil
		*
		* The default, if you do not call this function, is AAUDIO_USAGE_MEDIA.
		*
		* Added in API level 28.
		*
		* @param builder reference provided by AAudio_createStreamBuilder()
		* @param usage the desired usage, eg. AAUDIO_USAGE_GAME
		*/
		@@ -496,6 +508,8 @@ AAUDIO_API void AAudioStreamBuilder_setUsage(AAudioStreamBuilder* builder,
		*
		* The default, if you do not call this function, is AAUDIO_CONTENT_TYPE_MUSIC.
		*
		* Added in API level 28.
		*
		* @param builder reference provided by AAudio_createStreamBuilder()
		* @param contentType the type of audio data, eg. AAUDIO_CONTENT_TYPE_SPEECH
		*/
		@@ -514,6 +528,8 @@ AAUDIO_API void AAudioStreamBuilder_setContentType(AAudioStreamBuilder* builder,
		* That is because VOICE_RECOGNITION is the preset with the lowest latency
		* on many platforms.
		*
		* Added in API level 28.
		*
		* @param builder reference provided by AAudio_createStreamBuilder()
		* @param inputPreset the desired configuration for recording
		*/
		@@ -540,6 +556,8 @@ AAUDIO_API void AAudioStreamBuilder_setInputPreset(AAudioStreamBuilder* builder,
		*
		* Allocated session IDs will always be positive and nonzero.
		*
		* Added in API level 28.
		*
		* @param builder reference provided by AAudio_createStreamBuilder()
		* @param sessionId an allocated sessionID or AAUDIO_SESSION_ID_ALLOCATE
		*/
		@@ -1059,6 +1077,8 @@ AAUDIO_API int64_t AAudioStream_getFramesRead(AAudioStream* stream);
		*
		* The sessionID for a stream should not change once the stream has been opened.
		*
		* Added in API level 28.
		*
		* @param stream reference provided by AAudioStreamBuilder_openStream()
		* @return session ID or AAUDIO_SESSION_ID_NONE
		*/
		@@ -1094,6 +1114,8 @@ AAUDIO_API aaudio_result_t AAudioStream_getTimestamp(AAudioStream* stream,
		/**
		* Return the use case for the stream.
		*
		* Added in API level 28.
		*
		* @param stream reference provided by AAudioStreamBuilder_openStream()
		* @return frames read
		*/
		@@ -1102,6 +1124,8 @@ AAUDIO_API aaudio_usage_t AAudioStream_getUsage(AAudioStream* stream);
		/**
		* Return the content type for the stream.
		*
		* Added in API level 28.
		*
		* @param stream reference provided by AAudioStreamBuilder_openStream()
		* @return content type, for example AAUDIO_CONTENT_TYPE_MUSIC
		*/
		@@ -1110,6 +1134,8 @@ AAUDIO_API aaudio_content_type_t AAudioStream_getContentType(AAudioStream* strea
		/**
		* Return the input preset for the stream.
		*
		* Added in API level 28.
		*
		* @param stream reference provided by AAudioStreamBuilder_openStream()
		* @return input preset, for example AAUDIO_INPUT_PRESET_CAMCORDER
		*/