am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d (1b24cf32) · Commits · e / os / android_frameworks_av

cmds/stagefright/stagefright.cpp

+7 −9

Original line number	Diff line number	Diff line
		@@ -14,16 +14,16 @@
		* limitations under the License.
		*/

		#include <inttypes.h>
		#include <fcntl.h>
		#include <stdlib.h>
		#include <string.h>
		#include <sys/time.h>

		//#define LOG_NDEBUG 0
		#define LOG_TAG "stagefright"
		#include <media/stagefright/foundation/ADebug.h>

		#include <sys/time.h>

		#include <stdlib.h>
		#include <string.h>
		#include <inttypes.h>

		#include "jpeg.h"
		#include "SineSource.h"

		@@ -51,8 +51,6 @@

		#include <private/media/VideoFrame.h>

		#include <fcntl.h>

		#include <gui/GLConsumer.h>
		#include <gui/Surface.h>
		#include <gui/SurfaceComposerClient.h>
		@@ -648,7 +646,7 @@ static void dumpCodecProfiles(const sp<IOMX>& omx, bool queryDecoders) {
		const CodecProfileLevel &profileLevel =
		results[i].mProfileLevels[j];

		printf("%s%ld/%ld", j > 0 ? ", " : "",
		printf("%s%" PRIu32 "/%" PRIu32, j > 0 ? ", " : "",
		profileLevel.mProfile, profileLevel.mLevel);
		}

drm/common/DrmSupportInfo.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const {
		return false;
		}

		for (unsigned int i = 0; i < mMimeTypeVector.size(); i++) {
		for (size_t i = 0; i < mMimeTypeVector.size(); i++) {
		const String8 item = mMimeTypeVector.itemAt(i);

		if (!strcasecmp(item.string(), mimeType.string())) {
		@@ -58,7 +58,7 @@ bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const {
		}

		bool DrmSupportInfo::isSupportedFileSuffix(const String8& fileType) const {
		for (unsigned int i = 0; i < mFileSuffixVector.size(); i++) {
		for (size_t i = 0; i < mFileSuffixVector.size(); i++) {
		const String8 item = mFileSuffixVector.itemAt(i);

		if (!strcasecmp(item.string(), fileType.string())) {

drm/drmserver/DrmManager.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ status_t DrmManager::loadPlugIns() {
		status_t DrmManager::loadPlugIns(const String8& plugInDirPath) {
		mPlugInManager.loadPlugIns(plugInDirPath);
		Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList();
		for (unsigned int i = 0; i < plugInPathList.size(); ++i) {
		for (size_t i = 0; i < plugInPathList.size(); ++i) {
		String8 plugInPath = plugInPathList[i];
		DrmSupportInfo* info = mPlugInManager.getPlugIn(plugInPath).getSupportInfo(0);
		if (NULL != info) {
		@@ -138,7 +138,7 @@ void DrmManager::addClient(int uniqueId) {
		Mutex::Autolock _l(mLock);
		if (!mSupportInfoToPlugInIdMap.isEmpty()) {
		Vector<String8> plugInIdList = mPlugInManager.getPlugInIdList();
		for (unsigned int index = 0; index < plugInIdList.size(); index++) {
		for (size_t index = 0; index < plugInIdList.size(); index++) {
		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInIdList.itemAt(index));
		rDrmEngine.initialize(uniqueId);
		rDrmEngine.setOnInfoListener(uniqueId, this);
		@@ -149,7 +149,7 @@ void DrmManager::addClient(int uniqueId) {
		void DrmManager::removeClient(int uniqueId) {
		Mutex::Autolock _l(mLock);
		Vector<String8> plugInIdList = mPlugInManager.getPlugInIdList();
		for (unsigned int index = 0; index < plugInIdList.size(); index++) {
		for (size_t index = 0; index < plugInIdList.size(); index++) {
		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInIdList.itemAt(index));
		rDrmEngine.terminate(uniqueId);
		}
		@@ -208,7 +208,7 @@ bool DrmManager::canHandle(int uniqueId, const String8& path) {
		bool result = false;
		Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList();

		for (unsigned int i = 0; i < plugInPathList.size(); ++i) {
		for (size_t i = 0; i < plugInPathList.size(); ++i) {
		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInPathList[i]);
		result = rDrmEngine.canHandle(uniqueId, path);

		@@ -318,7 +318,7 @@ status_t DrmManager::removeRights(int uniqueId, const String8& path) {
		status_t DrmManager::removeAllRights(int uniqueId) {
		Vector<String8> plugInIdList = mPlugInManager.getPlugInIdList();
		status_t result = DRM_ERROR_UNKNOWN;
		for (unsigned int index = 0; index < plugInIdList.size(); index++) {
		for (size_t index = 0; index < plugInIdList.size(); index++) {
		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInIdList.itemAt(index));
		result = rDrmEngine.removeAllRights(uniqueId);
		if (DRM_NO_ERROR != result) {
		@@ -412,7 +412,7 @@ DecryptHandle* DrmManager::openDecryptSession(
		if (NULL != handle) {
		handle->decryptId = mDecryptSessionId + 1;

		for (unsigned int index = 0; index < plugInIdList.size(); index++) {
		for (size_t index = 0; index < plugInIdList.size(); index++) {
		String8 plugInId = plugInIdList.itemAt(index);
		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId);
		result = rDrmEngine.openDecryptSession(uniqueId, handle, fd, offset, length, mime);
		@@ -440,7 +440,7 @@ DecryptHandle* DrmManager::openDecryptSession(
		if (NULL != handle) {
		handle->decryptId = mDecryptSessionId + 1;

		for (unsigned int index = 0; index < plugInIdList.size(); index++) {
		for (size_t index = 0; index < plugInIdList.size(); index++) {
		String8 plugInId = plugInIdList.itemAt(index);
		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId);
		result = rDrmEngine.openDecryptSession(uniqueId, handle, uri, mime);
		@@ -565,7 +565,7 @@ String8 DrmManager::getSupportedPlugInId(const String8& mimeType) {
		String8 plugInId("");

		if (EMPTY_STRING != mimeType) {
		for (unsigned int index = 0; index < mSupportInfoToPlugInIdMap.size(); index++) {
		for (size_t index = 0; index < mSupportInfoToPlugInIdMap.size(); index++) {
		const DrmSupportInfo& drmSupportInfo = mSupportInfoToPlugInIdMap.keyAt(index);

		if (drmSupportInfo.isSupportedMimeType(mimeType)) {
		@@ -581,7 +581,7 @@ String8 DrmManager::getSupportedPlugInIdFromPath(int uniqueId, const String8& pa
		String8 plugInId("");
		const String8 fileSuffix = path.getPathExtension();

		for (unsigned int index = 0; index < mSupportInfoToPlugInIdMap.size(); index++) {
		for (size_t index = 0; index < mSupportInfoToPlugInIdMap.size(); index++) {
		const DrmSupportInfo& drmSupportInfo = mSupportInfoToPlugInIdMap.keyAt(index);

		if (drmSupportInfo.isSupportedFileSuffix(fileSuffix)) {
		@@ -599,7 +599,7 @@ String8 DrmManager::getSupportedPlugInIdFromPath(int uniqueId, const String8& pa

		void DrmManager::onInfo(const DrmInfoEvent& event) {
		Mutex::Autolock _l(mListenerLock);
		for (unsigned int index = 0; index < mServiceListeners.size(); index++) {
		for (size_t index = 0; index < mServiceListeners.size(); index++) {
		int uniqueId = mServiceListeners.keyAt(index);

		if (uniqueId == event.getUniqueId()) {

drm/libdrmframework/include/PlugInManager.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public:
		Vector<String8> plugInFileList = getPlugInPathList(rsPlugInDirPath);

		if (!plugInFileList.isEmpty()) {
		for (unsigned int i = 0; i < plugInFileList.size(); ++i) {
		for (size_t i = 0; i < plugInFileList.size(); ++i) {
		loadPlugIn(plugInFileList[i]);
		}
		}
		@@ -91,7 +91,7 @@ public:
		*
		*/
		void unloadPlugIns() {
		for (unsigned int i = 0; i < m_plugInIdList.size(); ++i) {
		for (size_t i = 0; i < m_plugInIdList.size(); ++i) {
		unloadPlugIn(m_plugInIdList[i]);
		}
		m_plugInIdList.clear();

include/media/stagefright/FileSource.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ private:
		sp<DecryptHandle> mDecryptHandle;
		DrmManagerClient *mDrmManagerClient;
		int64_t mDrmBufOffset;
		int64_t mDrmBufSize;
		size_t mDrmBufSize;
		unsigned char *mDrmBuf;

		ssize_t readAtDRM(off64_t offset, void *data, size_t size);