diff options
| author | Chong Zhang <chz@google.com> | 2013-12-26 01:38:35 -0800 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2014-02-05 15:46:26 -0800 |
| commit | 72cecca17d735db6532c45f0a7e10c47ee6f065a (patch) | |
| tree | d2f532b1909ea605f10e6044d2f027e7e58a8575 /media/libstagefright/MPEG4Writer.cpp | |
| parent | 412d4744efae64083e4f99a664e3efaba031af48 (diff) | |
| download | frameworks_av-72cecca17d735db6532c45f0a7e10c47ee6f065a.zip frameworks_av-72cecca17d735db6532c45f0a7e10c47ee6f065a.tar.gz frameworks_av-72cecca17d735db6532c45f0a7e10c47ee6f065a.tar.bz2 | |
Change StagefrightRecorder to use MediaCodec
Bug: 12305192
Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index b7a4b75..0fa3b2d 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -1763,7 +1763,7 @@ status_t MPEG4Writer::Track::pause() { } status_t MPEG4Writer::Track::stop() { - ALOGD("Stopping %s track", mIsAudio? "Audio": "Video"); + ALOGD("%s track stopping", mIsAudio? "Audio": "Video"); if (!mStarted) { ALOGE("Stop() called but track is not started"); return ERROR_END_OF_STREAM; @@ -1774,19 +1774,14 @@ status_t MPEG4Writer::Track::stop() { } mDone = true; + ALOGD("%s track source stopping", mIsAudio? "Audio": "Video"); + mSource->stop(); + ALOGD("%s track source stopped", mIsAudio? "Audio": "Video"); + void *dummy; pthread_join(mThread, &dummy); - status_t err = (status_t) dummy; - ALOGD("Stopping %s track source", mIsAudio? "Audio": "Video"); - { - status_t status = mSource->stop(); - if (err == OK && status != OK && status != ERROR_END_OF_STREAM) { - err = status; - } - } - ALOGD("%s track stopped", mIsAudio? "Audio": "Video"); return err; } |