Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"

Browse Source 
* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit
This commit is contained in:
Narayan Kamath
2014-03-07 08:08:21 -08:00
committed by Android Git Automerger
parent 6ac6263dcc 5de03b18ea
commit 51ec4ec51f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/android_media_MediaExtractor.cpp
View File

@@ -556,7 +556,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo(
return JNI_FALSE; return JNI_FALSE;
} }
size_t numSubSamples = size / sizeof(size_t); size_t numSubSamples = size / sizeof(int32_t);
if (numSubSamples == 0) { if (numSubSamples == 0) {
return JNI_FALSE; return JNI_FALSE;
@@ -566,7 +566,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo(
jboolean isCopy; jboolean isCopy;
jint *dst = env->GetIntArrayElements(numBytesOfEncryptedDataObj, &isCopy); jint *dst = env->GetIntArrayElements(numBytesOfEncryptedDataObj, &isCopy);
for (size_t i = 0; i < numSubSamples; ++i) { for (size_t i = 0; i < numSubSamples; ++i) {
dst[i] = ((const size_t *)data)[i]; dst[i] = ((const int32_t *)data)[i];
} }
env->ReleaseIntArrayElements(numBytesOfEncryptedDataObj, dst, 0); env->ReleaseIntArrayElements(numBytesOfEncryptedDataObj, dst, 0);
dst = NULL; dst = NULL;
@@ -583,7 +583,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo(
jboolean isCopy; jboolean isCopy;
jint *dst = env->GetIntArrayElements(numBytesOfPlainDataObj, &isCopy); jint *dst = env->GetIntArrayElements(numBytesOfPlainDataObj, &isCopy);
for (size_t i = 0; i < numSubSamples; ++i) { for (size_t i = 0; i < numSubSamples; ++i) {
dst[i] = ((const size_t *)data)[i]; dst[i] = ((const int32_t *)data)[i];
} }
env->ReleaseIntArrayElements(numBytesOfPlainDataObj, dst, 0); env->ReleaseIntArrayElements(numBytesOfPlainDataObj, dst, 0);
dst = NULL; dst = NULL;