diff options
author | Dan Albert <danalbert@google.com> | 2014-09-22 22:37:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-22 22:37:22 +0000 |
commit | 2f87e069e90948526cb557c5e696cc67c40ed968 (patch) | |
tree | ff4539f5be439790a9b1c412d83df4b5cf4d5008 /media/libstagefright | |
parent | 9707ffaf0b574b7929d62b2fe683595e95ef7774 (diff) | |
parent | 8f230382b86e7b431211ceb0263d06c4bba1bf6b (diff) | |
download | frameworks_av-2f87e069e90948526cb557c5e696cc67c40ed968.zip frameworks_av-2f87e069e90948526cb557c5e696cc67c40ed968.tar.gz frameworks_av-2f87e069e90948526cb557c5e696cc67c40ed968.tar.bz2 |
am 8f230382: Merge "Fix a namespace collision."
* commit '8f230382b86e7b431211ceb0263d06c4bba1bf6b':
Fix a namespace collision.
Diffstat (limited to 'media/libstagefright')
-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); } |