summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/m4v_h263
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-06-29 22:35:59 -0700
committerJames Dong <jdong@google.com>2011-06-29 22:35:59 -0700
commitba499b591db0e26081e38545493144755eb72fff (patch)
treee4ac33a3cc5f01a0a59947e09813c4bc1d7ceea5 /media/libstagefright/codecs/m4v_h263
parent0a932b40bdc8c427ff275426ee19960d8648021d (diff)
downloadframeworks_av-ba499b591db0e26081e38545493144755eb72fff.zip
frameworks_av-ba499b591db0e26081e38545493144755eb72fff.tar.gz
frameworks_av-ba499b591db0e26081e38545493144755eb72fff.tar.bz2
Return ERROR_END_OF_STREAM when the input source reaches eos
Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263')
-rw-r--r--media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
index 15ed219..d7249c1 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
@@ -398,10 +398,13 @@ status_t M4vH263Encoder::read(
}
// Ready for accepting an input video frame
- if (OK != mSource->read(&mInputBuffer, options)) {
- LOGE("Failed to read from data source");
+ status_t err = mSource->read(&mInputBuffer, options);
+ if (OK != err) {
+ if (err != ERROR_END_OF_STREAM) {
+ LOGE("Failed to read from data source");
+ }
outputBuffer->release();
- return UNKNOWN_ERROR;
+ return err;
}
if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) {