Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-dev (e6d7f46c) · Commits · e / os / android_frameworks_av

media/libstagefright/WVMExtractor.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,12 @@ void WVMExtractor::setAdaptiveStreamingMode(bool adaptive) {
		}
		}

		void WVMExtractor::setCryptoPluginMode(bool cryptoPluginMode) {
		if (mImpl != NULL) {
		mImpl->setCryptoPluginMode(cryptoPluginMode);
		}
		}

		void WVMExtractor::setUID(uid_t uid) {
		if (mImpl != NULL) {
		mImpl->setUID(uid);

+7 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ public:

		virtual int64_t getCachedDurationUs(status_t *finalStatus) = 0;
		virtual void setAdaptiveStreamingMode(bool adaptive) = 0;
		virtual void setCryptoPluginMode(bool cryptoPluginMode) = 0;
		virtual void setUID(uid_t uid) = 0;
		};

		@@ -61,6 +62,12 @@ public:
		// is used.
		void setAdaptiveStreamingMode(bool adaptive);

		// setCryptoPluginMode(true) to select crypto plugin mode.
		// In this mode, the extractor returns encrypted data for use
		// with the MediaCodec model, which handles the decryption in the
		// codec.
		void setCryptoPluginMode(bool cryptoPluginMode);

		void setUID(uid_t uid);

		static bool getVendorLibHandle();