Merge tag 'android-6.0.1_r24' into HEAD (7599aab7) · Commits · e / os / android_frameworks_av

include/media/mediametadataretriever.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ public:
		const char* extractMetadata(int keyCode);

		private:
		static const sp<IMediaPlayerService>& getService();
		static const sp<IMediaPlayerService> getService();

		class DeathNotifier: public IBinder::DeathRecipient
		{

media/libmedia/IDrm.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -658,7 +658,7 @@ status_t BnDrm::onTransact(

		Vector<uint8_t> request;
		String8 defaultUrl;
		DrmPlugin::KeyRequestType keyRequestType;
		DrmPlugin::KeyRequestType keyRequestType = DrmPlugin::kKeyRequestType_Unknown;

		status_t result = getKeyRequest(sessionId, initData, mimeType,
		keyType, optionalParameters, request, defaultUrl,

media/libmedia/IOMX.cpp

+49 −33

Original line number	Diff line number	Diff line
		@@ -447,7 +447,7 @@ public:
		remote()->transact(CONFIGURE_VIDEO_TUNNEL_MODE, data, &reply);

		status_t err = reply.readInt32();
		if (sidebandHandle) {
		if (err == OK && sidebandHandle) {
		sidebandHandle = (native_handle_t )reply.readNativeHandle();
		}
		return err;
		@@ -694,10 +694,13 @@ status_t BnOMX::onTransact(

		size_t size = data.readInt64();

		void *params = malloc(size);
		data.read(params, size);

		status_t err;
		status_t err = NO_MEMORY;
		void *params = calloc(size, 1);
		if (params) {
		err = data.read(params, size);
		if (err != OK) {
		android_errorWriteLog(0x534e4554, "26914474");
		} else {
		switch (code) {
		case GET_PARAMETER:
		err = getParameter(node, index, params, size);
		@@ -723,6 +726,8 @@ status_t BnOMX::onTransact(
		default:
		TRESPASS();
		}
		}
		}

		reply->writeInt32(err);

		@@ -846,9 +851,13 @@ status_t BnOMX::onTransact(
		OMX_U32 port_index = data.readInt32();

		sp<IGraphicBufferProducer> bufferProducer;
		MetadataBufferType type;
		MetadataBufferType type = kMetadataBufferTypeInvalid;
		status_t err = createInputSurface(node, port_index, &bufferProducer, &type);

		if ((err != OK) && (type == kMetadataBufferTypeInvalid)) {
		android_errorWriteLog(0x534e4554, "26324358");
		}

		reply->writeInt32(type);
		reply->writeInt32(err);

		@@ -888,9 +897,13 @@ status_t BnOMX::onTransact(
		sp<IGraphicBufferConsumer> bufferConsumer =
		interface_cast<IGraphicBufferConsumer>(data.readStrongBinder());

		MetadataBufferType type;
		MetadataBufferType type = kMetadataBufferTypeInvalid;
		status_t err = setInputSurface(node, port_index, bufferConsumer, &type);

		if ((err != OK) && (type == kMetadataBufferTypeInvalid)) {
		android_errorWriteLog(0x534e4554, "26324358");
		}

		reply->writeInt32(type);
		reply->writeInt32(err);
		return NO_ERROR;
		@@ -916,8 +929,9 @@ status_t BnOMX::onTransact(
		OMX_U32 port_index = data.readInt32();
		OMX_BOOL enable = (OMX_BOOL)data.readInt32();

		MetadataBufferType type;
		MetadataBufferType type = kMetadataBufferTypeInvalid;
		status_t err = storeMetaDataInBuffers(node, port_index, enable, &type);

		reply->writeInt32(type);
		reply->writeInt32(err);

		@@ -950,11 +964,13 @@ status_t BnOMX::onTransact(
		OMX_BOOL tunneled = (OMX_BOOL)data.readInt32();
		OMX_U32 audio_hw_sync = data.readInt32();

		native_handle_t *sideband_handle;
		native_handle_t *sideband_handle = NULL;
		status_t err = configureVideoTunnelMode(
		node, port_index, tunneled, audio_hw_sync, &sideband_handle);
		reply->writeInt32(err);
		if(err == OK){
		reply->writeNativeHandle(sideband_handle);
		}

		return NO_ERROR;
		}

media/libmedia/mediametadataretriever.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ Mutex MediaMetadataRetriever::sServiceLock;
		sp<IMediaPlayerService> MediaMetadataRetriever::sService;
		sp<MediaMetadataRetriever::DeathNotifier> MediaMetadataRetriever::sDeathNotifier;

		const sp<IMediaPlayerService>& MediaMetadataRetriever::getService()
		const sp<IMediaPlayerService> MediaMetadataRetriever::getService()
		{
		Mutex::Autolock lock(sServiceLock);
		if (sService == 0) {
		@@ -62,7 +62,7 @@ const sp<IMediaPlayerService>& MediaMetadataRetriever::getService()
		MediaMetadataRetriever::MediaMetadataRetriever()
		{
		ALOGV("constructor");
		const sp<IMediaPlayerService>& service(getService());
		const sp<IMediaPlayerService> service(getService());
		if (service == 0) {
		ALOGE("failed to obtain MediaMetadataRetrieverService");
		return;

media/libstagefright/MPEG4Extractor.cpp

+9 −1

Original line number	Diff line number	Diff line
		@@ -4261,7 +4261,15 @@ status_t MPEG4Source::read(
		continue;
		}

		CHECK(dstOffset + 4 <= mBuffer->size());
		if (dstOffset > SIZE_MAX - 4 \|\|
		dstOffset + 4 > SIZE_MAX - nalLength \|\|
		dstOffset + 4 + nalLength > mBuffer->size()) {
		ALOGE("b/27208621 : %zu %zu", dstOffset, mBuffer->size());
		android_errorWriteLog(0x534e4554, "27208621");
		mBuffer->release();
		mBuffer = NULL;
		return ERROR_MALFORMED;
		}

		dstData[dstOffset++] = 0;
		dstData[dstOffset++] = 0;