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

Commit f421908d authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix various DRM related tests"

parents 91cca480 0fbfa6f0

media/libstagefright/MediaTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ status_t MediaTrackCUnwrapper::read(MediaBufferBase **buffer, const ReadOptions 
        if (format->mFormat->findInt64("timeUs", &val64)) {

            meta.setInt64(kKeyTime, val64);

        }

        if (format->mFormat->findInt64("duration", &val64)) {

        if (format->mFormat->findInt64("durationUs", &val64)) {

            meta.setInt64(kKeyDuration, val64);

        }

        if (format->mFormat->findInt64("target-time", &val64)) {

media/ndk/NdkMediaFormat.cpp

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_SIZES = "crypto-encrypted-s 
EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_IV = "crypto-iv";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_KEY = "crypto-key";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_MODE = "crypto-mode";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_PLAIN_SIZES = "crypto-encrypted-sizes";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_PLAIN_SIZES = "crypto-plain-sizes";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_SKIP_BYTE_BLOCK = "crypto-skip-byte-block";

EXPORT const char* AMEDIAFORMAT_KEY_CSD = "csd";

EXPORT const char* AMEDIAFORMAT_KEY_CSD_0 = "csd-0";