Make sure that if initialization fails, AudioSource still behaves well.
Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp
index 4c729e4..bcae913 100644
--- a/media/libstagefright/AudioSource.cpp
+++ b/media/libstagefright/AudioSource.cpp
@@ -72,6 +72,10 @@
return UNKNOWN_ERROR;
}
+ if (mInitCheck != OK) {
+ return NO_INIT;
+ }
+
char value[PROPERTY_VALUE_MAX];
if (property_get("media.stagefright.record-stats", value, NULL)
&& (!strcmp(value, "1") || !strcasecmp(value, "true"))) {
@@ -102,6 +106,10 @@
return UNKNOWN_ERROR;
}
+ if (mInitCheck != OK) {
+ return NO_INIT;
+ }
+
mRecord->stop();
delete mGroup;
@@ -118,6 +126,10 @@
}
sp<MetaData> AudioSource::getFormat() {
+ if (mInitCheck != OK) {
+ return 0;
+ }
+
sp<MetaData> meta = new MetaData;
meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);
meta->setInt32(kKeySampleRate, mRecord->getSampleRate());
@@ -193,6 +205,11 @@
status_t AudioSource::read(
MediaBuffer **out, const ReadOptions *options) {
+
+ if (mInitCheck != OK) {
+ return NO_INIT;
+ }
+
*out = NULL;
MediaBuffer *buffer;
@@ -294,10 +311,6 @@
buffer->meta_data()->setInt64(kKeyTime, mPrevSampleTimeUs);
CHECK(timestampUs > mPrevSampleTimeUs);
- if (mTotalLostFrames == 0) {
- CHECK_EQ(mPrevSampleTimeUs,
- mStartTimeUs + (1000000LL * numFramesRecorded) / sampleRate);
- }
mPrevSampleTimeUs = timestampUs;
LOGV("initial delay: %lld, sample rate: %d, timestamp: %lld",
mStartTimeUs, sampleRate, timestampUs);