Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd01692e authored by Edwin Wong's avatar Edwin Wong Committed by android-build-merger
Browse files

Fix AMediaExtractor_getSampleCryptoInfo returning iv as key. am: b2fb3c97 am: 73fb5495 

am: de34b121

Change-Id: I0cc0ab7ebac2d56f084b1923c4e512b6ba528ff7
parents e6a4cf9c de34b121

media/ndk/NdkMediaExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ AMediaCodecCryptoInfo *AMediaExtractor_getSampleCryptoInfo(AMediaExtractor *ex) 


    const void *key;

    size_t keysize;

    if (meta->findData(kKeyCryptoIV, &type, &key, &keysize)) {

    if (meta->findData(kKeyCryptoKey, &type, &key, &keysize)) {

        if (keysize != 16) {

            // IVs must be 16 bytes in length.

            // Keys must be 16 bytes in length.

            return NULL;

        }

    }