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

Commit fdcf28cb authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Remove kKeyNalLengthSize 

It was only used internally in MatroskaExtractor, so doesn't need to
be exposed in MetaData.

Test: build

Change-Id: I078f441cd125d161b1cd22557675c7abfb64d7f2
parent 10caf0e2

media/extractors/mkv/MatroskaExtractor.cpp

+7 −5
Original line number Original line Diff line number Diff line
@@ -222,7 +222,8 @@ MatroskaSource::MatroskaSource( 
                 mExtractor->mTracks.itemAt(index).mTrackNum,

                 mExtractor->mTracks.itemAt(index).mTrackNum,

                 index),

                 index),

      mNALSizeLen(-1) {

      mNALSizeLen(-1) {

    MetaDataBase &meta = mExtractor->mTracks.editItemAt(index).mMeta;

    MatroskaExtractor::TrackInfo &trackInfo = mExtractor->mTracks.editItemAt(index);

    MetaDataBase &meta = trackInfo.mMeta;





    const char *mime;

    const char *mime;

    CHECK(meta.findCString(kKeyMIMEType, &mime));

    CHECK(meta.findCString(kKeyMIMEType, &mime));
@@ -235,9 +236,9 @@ MatroskaSource::MatroskaSource( 
        uint32_t dummy;

        uint32_t dummy;

        const uint8_t *avcc;

        const uint8_t *avcc;

        size_t avccSize;

        size_t avccSize;

        int32_t nalSizeLen = 0;

        int32_t nalSizeLen = trackInfo.mNalLengthSize;

        if (meta.findInt32(kKeyNalLengthSize, &nalSizeLen)) {

        if (nalSizeLen >= 0) {

            if (nalSizeLen >= 0 && nalSizeLen <= 4) {

            if (nalSizeLen <= 4) {

                mNALSizeLen = nalSizeLen;

                mNALSizeLen = nalSizeLen;

            }

            }

        } else if (meta.findData(kKeyAVCC, &dummy, (const void **)&avcc, &avccSize)

        } else if (meta.findData(kKeyAVCC, &dummy, (const void **)&avcc, &avccSize)
@@ -1227,7 +1228,7 @@ status_t MatroskaExtractor::synthesizeAVCC(TrackInfo *trackInfo, size_t index) { 
    }

    }





    // Override the synthesized nal length size, which is arbitrary

    // Override the synthesized nal length size, which is arbitrary

    trackInfo->mMeta.setInt32(kKeyNalLengthSize, 0);

    trackInfo->mNalLengthSize = 0;

    return OK;

    return OK;

}

}
@@ -1344,6 +1345,7 @@ status_t MatroskaExtractor::initTrackInfo( 
    trackInfo->mEncrypted = false;

    trackInfo->mEncrypted = false;

    trackInfo->mHeader = NULL;

    trackInfo->mHeader = NULL;

    trackInfo->mHeaderLen = 0;

    trackInfo->mHeaderLen = 0;

    trackInfo->mNalLengthSize = -1;





    for(size_t i = 0; i < track->GetContentEncodingCount(); i++) {

    for(size_t i = 0; i < track->GetContentEncodingCount(); i++) {

        const mkvparser::ContentEncoding *encoding = track->GetContentEncodingByIndex(i);

        const mkvparser::ContentEncoding *encoding = track->GetContentEncodingByIndex(i);

media/extractors/mkv/MatroskaExtractor.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ private: 
        // in ~MatroskaExtractor.

        // in ~MatroskaExtractor.

        unsigned char *mHeader;

        unsigned char *mHeader;

        size_t mHeaderLen;

        size_t mHeaderLen;

        int32_t mNalLengthSize;





        const mkvparser::Track* getTrack() const;

        const mkvparser::Track* getTrack() const;

        const mkvparser::CuePoint::TrackPosition *find(long long timeNs) const;

        const mkvparser::CuePoint::TrackPosition *find(long long timeNs) const;

media/libmediaextractor/include/media/stagefright/MetaDataBase.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -199,9 +199,6 @@ enum { 
    // MPEG user data offsets

    // MPEG user data offsets

    kKeyMpegUserData      = 'mpud', // size_t[]

    kKeyMpegUserData      = 'mpud', // size_t[]





    // Size of NALU length in mkv/mp4

    kKeyNalLengthSize     = 'nals', // int32_t



    // HDR related

    // HDR related

    kKeyHdrStaticInfo    = 'hdrS', // HDRStaticInfo

    kKeyHdrStaticInfo    = 'hdrS', // HDRStaticInfo