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

Commit 06638ffa authored by Dan Albert's avatar Dan Albert
Browse files

Fix a namespace collision. 

There's already an android::FileSource defined in
media/libstagefright/FileSource.h, and the two can conflict at link
time.

Change-Id: Id8d80e96c68af1c9bb2a153630c84b923a4f4d06
parent fd7e0440

media/libstagefright/mp4/FragmentedMP4Parser.cpp

+5 −5
Original line number Diff line number Diff line
@@ -127,13 +127,13 @@ const FragmentedMP4Parser::DispatchEntry FragmentedMP4Parser::kDispatchTable[] = 
    { FOURCC('s', 'i', 'd', 'x'), 0, &FragmentedMP4Parser::parseSegmentIndex },

};



struct FileSource : public FragmentedMP4Parser::Source {

    FileSource(const char *filename)

struct MP4FileSource : public FragmentedMP4Parser::Source {

    MP4FileSource(const char *filename)

        : mFile(fopen(filename, "rb")) {

            CHECK(mFile != NULL);

        }



    virtual ~FileSource() {

    virtual ~MP4FileSource() {

        fclose(mFile);

    }
@@ -149,7 +149,7 @@ struct FileSource : public FragmentedMP4Parser::Source { 
    private:

    FILE *mFile;



    DISALLOW_EVIL_CONSTRUCTORS(FileSource);

    DISALLOW_EVIL_CONSTRUCTORS(MP4FileSource);

};



struct ReadTracker : public RefBase {
@@ -236,7 +236,7 @@ FragmentedMP4Parser::~FragmentedMP4Parser() { 


void FragmentedMP4Parser::start(const char *filename) {

    sp<AMessage> msg = new AMessage(kWhatStart, id());

    msg->setObject("source", new FileSource(filename));

    msg->setObject("source", new MP4FileSource(filename));

    msg->post();

    ALOGV("Parser::start(%s)", filename);

}