diff options
| author | Pannag Sanketi <psanketi@google.com> | 2011-09-22 17:03:48 -0700 |
|---|---|---|
| committer | Pannag Sanketi <psanketi@google.com> | 2011-09-22 17:03:48 -0700 |
| commit | a1849fceaf4b22d0a8ec7992c91bc416f78c9fd2 (patch) | |
| tree | 0dfd3602307339eaaa32dd8c1d8208caf8e1a7cf /media | |
| parent | 904fb9d79cc72879e4c6767c219ec78feda8e62b (diff) | |
| download | frameworks_base-a1849fceaf4b22d0a8ec7992c91bc416f78c9fd2.zip frameworks_base-a1849fceaf4b22d0a8ec7992c91bc416f78c9fd2.tar.gz frameworks_base-a1849fceaf4b22d0a8ec7992c91bc416f78c9fd2.tar.bz2 | |
Returning EOS in SurfaceMediaSource:read
In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.
Related to FactoryROM bug: 5332812
Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 306f1f6..2b27ee2 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -764,8 +764,8 @@ status_t SurfaceMediaSource::read( MediaBuffer **buffer, // If the loop was exited as a result of stopping the recording, // it is OK if (mStopped) { - LOGV("Read: SurfaceMediaSource is stopped. Returning NO_INIT;"); - return NO_INIT; + LOGV("Read: SurfaceMediaSource is stopped. Returning ERROR_END_OF_STREAM."); + return ERROR_END_OF_STREAM; } // Update the current buffer info |