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

Commit 361ba742 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

stagefright: add flags to NuMediaExtractor::getTrackFormat 

am: 768a2537

* commit '768a2537':
  stagefright: add flags to NuMediaExtractor::getTrackFormat

Change-Id: Ia68a08ffdb81275d73624944aaa732d247549c8e
parents 4bd13b79 768a2537

include/media/stagefright/NuMediaExtractor.h

+6 −1
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ struct NuMediaExtractor : public RefBase { 
        SAMPLE_FLAG_ENCRYPTED   = 2,

    };



    // identical to IMediaExtractor::GetTrackMetaDataFlags

    enum GetTrackFormatFlags {

        kIncludeExtensiveMetaData = 1, // reads sample table and possibly stream headers

    };



    NuMediaExtractor();



    status_t setDataSource(
@@ -56,7 +61,7 @@ struct NuMediaExtractor : public RefBase { 
    status_t setDataSource(const sp<DataSource> &datasource);



    size_t countTracks() const;

    status_t getTrackFormat(size_t index, sp<AMessage> *format) const;

    status_t getTrackFormat(size_t index, sp<AMessage> *format, uint32_t flags = 0) const;



    status_t getFileFormat(sp<AMessage> *format) const;

media/libstagefright/NuMediaExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ size_t NuMediaExtractor::countTracks() const { 
}



status_t NuMediaExtractor::getTrackFormat(

        size_t index, sp<AMessage> *format) const {

        size_t index, sp<AMessage> *format, uint32_t flags) const {

    Mutex::Autolock autoLock(mLock);



    *format = NULL;
@@ -245,7 +245,7 @@ status_t NuMediaExtractor::getTrackFormat( 
        return -ERANGE;

    }



    sp<MetaData> meta = mImpl->getTrackMetaData(index);

    sp<MetaData> meta = mImpl->getTrackMetaData(index, flags);

    // Extractors either support trackID-s or not, so either all tracks have trackIDs or none.

    // Generate trackID if missing.

    int32_t trackID;