diff options
Diffstat (limited to 'media/ndk')
-rw-r--r-- | media/ndk/NdkMediaCodec.cpp | 12 | ||||
-rw-r--r-- | media/ndk/NdkMediaCrypto.cpp | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index 1f62fa2..ac05920 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -369,7 +369,7 @@ int AMediaCodec_queueSecureInputBuffer( if (err != 0) { ALOGE("queSecureInputBuffer: %s", errormsg.c_str()); } - delete subSamples; + delete [] subSamples; return translate_error(err); } @@ -396,13 +396,11 @@ AMediaCodecCryptoInfo *AMediaCodecCryptoInfo_new( ret->mode = mode; // clearbytes and encryptedbytes point at the actual data, which follows - ret->clearbytes = (size_t*) ((&ret->encryptedbytes) + sizeof(ret->encryptedbytes)); - ret->encryptedbytes = (size_t*) (ret->clearbytes + (sizeof(size_t) * numsubsamples)); + ret->clearbytes = (size_t*) (ret + 1); // point immediately after the struct + ret->encryptedbytes = ret->clearbytes + numsubsamples; // point after the clear sizes - size_t *dst = ret->clearbytes; - memcpy(dst, clearbytes, numsubsamples * sizeof(size_t)); - dst += numsubsamples * sizeof(size_t); - memcpy(dst, encryptedbytes, numsubsamples * sizeof(size_t)); + memcpy(ret->clearbytes, clearbytes, numsubsamples * sizeof(size_t)); + memcpy(ret->encryptedbytes, encryptedbytes, numsubsamples * sizeof(size_t)); return ret; } diff --git a/media/ndk/NdkMediaCrypto.cpp b/media/ndk/NdkMediaCrypto.cpp index 25dfe6a..d57f42b 100644 --- a/media/ndk/NdkMediaCrypto.cpp +++ b/media/ndk/NdkMediaCrypto.cpp @@ -74,7 +74,7 @@ struct AMediaCrypto { extern "C" { -bool AMediaCrypto_isCryptoSchemeSupport(const AMediaUUID uuid) { +bool AMediaCrypto_isCryptoSchemeSupported(const AMediaUUID uuid) { sp<ICrypto> crypto = makeCrypto(); if (crypto == NULL) { return false; |