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

Commit 45f18859 authored by Hassan Shojania's avatar Hassan Shojania Committed by Android (Google) Code Review
Browse files

Merge "Fix format string for Modular DRM for MediaPlayer"

parents 9e96ca0a 06a7081e

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { 
        const char *mime;

        CHECK(meta->findCString(kKeyMIMEType, &mime));



        ALOGV("initFromDataSource track[%d]: %s", i, mime);

        ALOGV("initFromDataSource track[%zu]: %s", i, mime);



        // Do the string compare immediately with "mime",

        // we can't assume "mime" would stay valid after another
@@ -1932,7 +1932,7 @@ status_t NuPlayer::GenericSource::checkDrmInfo() 
    Parcel parcel;

    NuPlayerDrm::retrieveDrmInfo(pssh, psshsize, mMimes, &parcel);

    ALOGV("checkDrmInfo: MEDIA_DRM_INFO PSSH size: %d  Parcel size: %d  objects#: %d",

          psshsize, (int)parcel.dataSize(), (int)parcel.objectsCount());

          (int)psshsize, (int)parcel.dataSize(), (int)parcel.objectsCount());



    if (parcel.dataSize() == 0) {

        ALOGE("checkDrmInfo: Unexpected parcel size: 0");