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

Commit 343f9c81 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits" 

* commit 'dca2b5d7':
  Changed parsing of trkn and disk from 8 bits to 16 bits
parents abae71d3 dca2b5d7

media/libstagefright/MPEG4Extractor.cpp

+7 −5
Original line number Original line Diff line number Diff line
@@ -1633,8 +1633,9 @@ status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) { 
        {

        {

            if (size == 16 && flags == 0) {

            if (size == 16 && flags == 0) {

                char tmp[16];

                char tmp[16];

                sprintf(tmp, "%d/%d",

                uint16_t* pTrack = (uint16_t*)&buffer[10];

                        (int)buffer[size - 5], (int)buffer[size - 3]);

                uint16_t* pTotalTracks = (uint16_t*)&buffer[12];

                sprintf(tmp, "%d/%d", ntohs(*pTrack), ntohs(*pTotalTracks));





                mFileMetaData->setCString(kKeyCDTrackNumber, tmp);

                mFileMetaData->setCString(kKeyCDTrackNumber, tmp);

            }

            }
@@ -1642,10 +1643,11 @@ status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) { 
        }

        }

        case FOURCC('d', 'i', 's', 'k'):

        case FOURCC('d', 'i', 's', 'k'):

        {

        {

            if (size == 14 && flags == 0) {

            if ((size == 14 || size == 16) && flags == 0) {

                char tmp[16];

                char tmp[16];

                sprintf(tmp, "%d/%d",

                uint16_t* pDisc = (uint16_t*)&buffer[10];

                        (int)buffer[size - 3], (int)buffer[size - 1]);

                uint16_t* pTotalDiscs = (uint16_t*)&buffer[12];

                sprintf(tmp, "%d/%d", ntohs(*pDisc), ntohs(*pTotalDiscs));





                mFileMetaData->setCString(kKeyDiscNumber, tmp);

                mFileMetaData->setCString(kKeyDiscNumber, tmp);

            }

            }