diff options
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/AMRWriter.cpp | 9 | ||||
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/media/libstagefright/AMRWriter.cpp b/media/libstagefright/AMRWriter.cpp index 7b681f1..caff452 100644 --- a/media/libstagefright/AMRWriter.cpp +++ b/media/libstagefright/AMRWriter.cpp @@ -115,6 +115,7 @@ status_t AMRWriter::start() { pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); + mReachedEOS = false; mDone = false; pthread_create(&mThread, &attr, ThreadWrapper, this); @@ -179,6 +180,14 @@ void AMRWriter::threadFunc() { break; } } + + Mutex::Autolock autoLock(mLock); + mReachedEOS = true; +} + +bool AMRWriter::reachedEOS() { + Mutex::Autolock autoLock(mLock); + return mReachedEOS; } } // namespace android diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 367459f..aee4d15 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -92,9 +92,11 @@ MPEG4Writer::~MPEG4Writer() { mTracks.clear(); } -void MPEG4Writer::addSource(const sp<MediaSource> &source) { +status_t MPEG4Writer::addSource(const sp<MediaSource> &source) { Track *track = new Track(this, source); mTracks.push_back(track); + + return OK; } status_t MPEG4Writer::start() { |