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

Commit 5b3f07da authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "The MatroskaExtractor will now publish a different mime-type "video/webm" if"

parents 91bd59db 6e37cf90

media/libstagefright/matroska/MatroskaExtractor.cpp

+10 −2
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ MatroskaExtractor::MatroskaExtractor(const sp<DataSource> &source) 
    : mDataSource(source),

      mReader(new DataSourceReader(mDataSource)),

      mSegment(NULL),

      mExtractedThumbnails(false) {

      mExtractedThumbnails(false),

      mIsWebm(false) {

    off64_t size;

    mIsLiveStreaming =

        (mDataSource->flags()
@@ -507,6 +508,10 @@ MatroskaExtractor::MatroskaExtractor(const sp<DataSource> &source) 
        return;

    }



    if (ebmlHeader.m_docType && !strcmp("webm", ebmlHeader.m_docType)) {

        mIsWebm = true;

    }



    long long ret =

        mkvparser::Segment::CreateInstance(mReader, pos, mSegment);
@@ -757,7 +762,10 @@ void MatroskaExtractor::findThumbnails() { 


sp<MetaData> MatroskaExtractor::getMetaData() {

    sp<MetaData> meta = new MetaData;

    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_MATROSKA);



    meta->setCString(

            kKeyMIMEType,

            mIsWebm ? "video/webm" : MEDIA_MIMETYPE_CONTAINER_MATROSKA);



    return meta;

}

media/libstagefright/matroska/MatroskaExtractor.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ private: 
    mkvparser::Segment *mSegment;

    bool mExtractedThumbnails;

    bool mIsLiveStreaming;

    bool mIsWebm;



    void addTracks();

    void findThumbnails();