diff options
author | Dan Albert <danalbert@google.com> | 2014-09-22 22:29:31 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-22 22:29:31 +0000 |
commit | 8f230382b86e7b431211ceb0263d06c4bba1bf6b (patch) | |
tree | 74251f3cf6d8fd3bd9248199cbed9bbba9f587e0 | |
parent | fd7e04401fe28fdc093dfe4b399240378fd1f2f8 (diff) | |
parent | 06638ffa734d81136979d26897ce5e021eb17f7c (diff) | |
download | frameworks_av-8f230382b86e7b431211ceb0263d06c4bba1bf6b.zip frameworks_av-8f230382b86e7b431211ceb0263d06c4bba1bf6b.tar.gz frameworks_av-8f230382b86e7b431211ceb0263d06c4bba1bf6b.tar.bz2 |
Merge "Fix a namespace collision."
-rw-r--r-- | media/libstagefright/mp4/FragmentedMP4Parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/mp4/FragmentedMP4Parser.cpp b/media/libstagefright/mp4/FragmentedMP4Parser.cpp index 0102656..ec8cd34 100644 --- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp +++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp @@ -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); } |