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

Commit 57d8e701 authored by Edwin Wong's avatar Edwin Wong Committed by Android (Google) Code Review
Browse files

Merge "Fix AMediaExtractor_getSampleCryptoInfo returning iv as key." into nyc-mr1-dev

parents 2f9fc81f b2fb3c97

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;

        }

    }