diff options
-rw-r--r-- | include/media/mediametadataretriever.h | 2 | ||||
-rw-r--r-- | media/libmedia/IDrm.cpp | 2 | ||||
-rw-r--r-- | media/libmedia/IOMX.cpp | 82 | ||||
-rw-r--r-- | media/libmedia/mediametadataretriever.cpp | 4 | ||||
-rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 10 | ||||
-rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 1 |
6 files changed, 38 insertions, 63 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index 8ed07ee..f655f35 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -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 { diff --git a/media/libmedia/IDrm.cpp b/media/libmedia/IDrm.cpp index 7c709cd..b1ad0c5 100644 --- a/media/libmedia/IDrm.cpp +++ b/media/libmedia/IDrm.cpp @@ -658,7 +658,7 @@ status_t BnDrm::onTransact( Vector<uint8_t> request; String8 defaultUrl; - DrmPlugin::KeyRequestType keyRequestType = DrmPlugin::kKeyRequestType_Unknown; + DrmPlugin::KeyRequestType keyRequestType; status_t result = getKeyRequest(sessionId, initData, mimeType, keyType, optionalParameters, request, defaultUrl, diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp index 865d575..5423c2a 100644 --- a/media/libmedia/IOMX.cpp +++ b/media/libmedia/IOMX.cpp @@ -446,7 +446,7 @@ public: remote()->transact(CONFIGURE_VIDEO_TUNNEL_MODE, data, &reply); status_t err = reply.readInt32(); - if (err == OK && sidebandHandle) { + if (sidebandHandle) { *sidebandHandle = (native_handle_t *)reply.readNativeHandle(); } return err; @@ -692,39 +692,34 @@ status_t BnOMX::onTransact( size_t size = data.readInt64(); - 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); - break; - case SET_PARAMETER: - err = setParameter(node, index, params, size); - break; - case GET_CONFIG: - err = getConfig(node, index, params, size); - break; - case SET_CONFIG: - err = setConfig(node, index, params, size); - break; - case SET_INTERNAL_OPTION: - { - InternalOptionType type = - (InternalOptionType)data.readInt32(); - - err = setInternalOption(node, index, type, params, size); - break; - } - - default: - TRESPASS(); - } + void *params = malloc(size); + data.read(params, size); + + status_t err; + switch (code) { + case GET_PARAMETER: + err = getParameter(node, index, params, size); + break; + case SET_PARAMETER: + err = setParameter(node, index, params, size); + break; + case GET_CONFIG: + err = getConfig(node, index, params, size); + break; + case SET_CONFIG: + err = setConfig(node, index, params, size); + break; + case SET_INTERNAL_OPTION: + { + InternalOptionType type = + (InternalOptionType)data.readInt32(); + + err = setInternalOption(node, index, type, params, size); + break; } + + default: + TRESPASS(); } reply->writeInt32(err); @@ -849,13 +844,9 @@ status_t BnOMX::onTransact( OMX_U32 port_index = data.readInt32(); sp<IGraphicBufferProducer> bufferProducer; - MetadataBufferType type = kMetadataBufferTypeInvalid; + MetadataBufferType type; status_t err = createInputSurface(node, port_index, &bufferProducer, &type); - if ((err != OK) && (type == kMetadataBufferTypeInvalid)) { - android_errorWriteLog(0x534e4554, "26324358"); - } - reply->writeInt32(type); reply->writeInt32(err); @@ -895,13 +886,9 @@ status_t BnOMX::onTransact( sp<IGraphicBufferConsumer> bufferConsumer = interface_cast<IGraphicBufferConsumer>(data.readStrongBinder()); - MetadataBufferType type = kMetadataBufferTypeInvalid; + MetadataBufferType type; 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; @@ -927,9 +914,8 @@ status_t BnOMX::onTransact( OMX_U32 port_index = data.readInt32(); OMX_BOOL enable = (OMX_BOOL)data.readInt32(); - MetadataBufferType type = kMetadataBufferTypeInvalid; + MetadataBufferType type; status_t err = storeMetaDataInBuffers(node, port_index, enable, &type); - reply->writeInt32(type); reply->writeInt32(err); @@ -962,13 +948,11 @@ status_t BnOMX::onTransact( OMX_BOOL tunneled = (OMX_BOOL)data.readInt32(); OMX_U32 audio_hw_sync = data.readInt32(); - native_handle_t *sideband_handle = NULL; + native_handle_t *sideband_handle; status_t err = configureVideoTunnelMode( node, port_index, tunneled, audio_hw_sync, &sideband_handle); reply->writeInt32(err); - if(err == OK){ - reply->writeNativeHandle(sideband_handle); - } + reply->writeNativeHandle(sideband_handle); return NO_ERROR; } diff --git a/media/libmedia/mediametadataretriever.cpp b/media/libmedia/mediametadataretriever.cpp index 08a9e6a..9a76f58 100644 --- a/media/libmedia/mediametadataretriever.cpp +++ b/media/libmedia/mediametadataretriever.cpp @@ -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; diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index f8789da..e4f8384 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -4228,15 +4228,7 @@ status_t MPEG4Source::read( continue; } - 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; - } + CHECK(dstOffset + 4 <= mBuffer->size()); dstData[dstOffset++] = 0; dstData[dstOffset++] = 0; diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 8735eff..94a213a 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -519,7 +519,6 @@ status_t OMXNodeInstance::storeMetaDataInBuffers( status_t OMXNodeInstance::storeMetaDataInBuffers_l( OMX_U32 portIndex, OMX_BOOL enable, MetadataBufferType *type) { if (portIndex != kPortIndexInput && portIndex != kPortIndexOutput) { - android_errorWriteLog(0x534e4554, "26324358"); return BAD_VALUE; } |