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

Commit 9c6cb7a8 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fragmented mp4 extractor" into jb-mr1-dev

parents 0b73d473 56997121

include/media/stagefright/Utils.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ struct MetaData; 
struct AMessage;

status_t convertMetaDataToMessage(

        const sp<MetaData> &meta, sp<AMessage> *format);

void convertMessageToMetaData(

        const sp<AMessage> &format, sp<MetaData> &meta);



}  // namespace android

media/libmediaplayerservice/nuplayer/mp4/MP4Source.cpp

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ struct StreamSource : public FragmentedMP4Parser::Source { 
        return total;

    }



    bool isSeekable() {

        return false;

    }



private:

    sp<NuPlayer::NuPlayerStreamListener> mListener;

    off64_t mPosition;

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:= \ 
        ESDS.cpp                          \

        FileSource.cpp                    \

        FLACExtractor.cpp                 \

        FragmentedMP4Extractor.cpp        \

        HTTPBase.cpp                      \

        JPEGSource.cpp                    \

        MP3Extractor.cpp                  \

media/libstagefright/DRMExtractor.cpp

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 
 */



#include "include/DRMExtractor.h"

#include "include/AMRExtractor.h"

#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/WAVExtractor.h"

#include "include/OggExtractor.h"



#include <arpa/inet.h>

#include <utils/String8.h>

media/libstagefright/DataSource.cpp

+9 −7
Original line number Diff line number Diff line
@@ -20,17 +20,18 @@ 
#include "include/chromium_http_stub.h"

#endif



#include "include/AACExtractor.h"

#include "include/DRMExtractor.h"

#include "include/FLACExtractor.h"

#include "include/FragmentedMP4Extractor.h"

#include "include/HTTPBase.h"

#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/WAVExtractor.h"

#include "include/OggExtractor.h"

#include "include/MPEG2PSExtractor.h"

#include "include/MPEG2TSExtractor.h"

#include "include/MPEG4Extractor.h"

#include "include/NuCachedSource2.h"

#include "include/HTTPBase.h"

#include "include/DRMExtractor.h"

#include "include/FLACExtractor.h"

#include "include/AACExtractor.h"

#include "include/OggExtractor.h"

#include "include/WAVExtractor.h"

#include "include/WVMExtractor.h"



#include "matroska/MatroskaExtractor.h"
@@ -110,6 +111,7 @@ void DataSource::RegisterSniffer(SnifferFunc func) { 
// static

void DataSource::RegisterDefaultSniffers() {

    RegisterSniffer(SniffMPEG4);

    RegisterSniffer(SniffFragmentedMP4);

    RegisterSniffer(SniffMatroska);

    RegisterSniffer(SniffOgg);

    RegisterSniffer(SniffWAV);