Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread

James Dong · Android (Google) Code Review · commit ea5d2c584490 · 2011-03-31T11:20:40.000-07:00
diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp
@@ -287,9 +287,10 @@ status_t AudioSource::read(
         }
 
         ssize_t n = mRecord->read(buffer->data(), buffer->size());
-        if (n < 0) {
+        if (n <= 0) {
+            LOGE("Read from AudioRecord returns: %ld", n);
             buffer->release();
-            return (status_t)n;
+            return UNKNOWN_ERROR;
         }
 
         int64_t recordDurationUs = (1000000LL * n >> 1) / sampleRate;

Original file line number	Diff line number	Diff line change
`@@ -287,9 +287,10 @@ status_t AudioSource::read(`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`ssize_t n = mRecord->read(buffer->data(), buffer->size());`
`290`		`- if (n < 0) {`
	`290`	`+ if (n <= 0) {`
	`291`	`+ LOGE("Read from AudioRecord returns: %ld", n);`
`291`	`292`	`buffer->release();`
`292`		`- return (status_t)n;`
	`293`	`+ return UNKNOWN_ERROR;`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`int64_t recordDurationUs = (1000000LL * n >> 1) / sampleRate;`