diff options
author | James Dong <jdong@google.com> | 2010-09-01 14:02:51 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2010-09-01 14:11:28 -0700 |
commit | a87544b35fda354cd24e1b7e803570e8926da918 (patch) | |
tree | 85845a94a062a4cc62d18591c1be3e4789fd5c8f /media/libstagefright | |
parent | 6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d (diff) | |
download | frameworks_base-a87544b35fda354cd24e1b7e803570e8926da918.zip frameworks_base-a87544b35fda354cd24e1b7e803570e8926da918.tar.gz frameworks_base-a87544b35fda354cd24e1b7e803570e8926da918.tar.bz2 |
Make sure that if initialization fails, AudioSource still behaves well.
Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/AudioSource.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
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 @@ status_t AudioSource::start(MetaData *params) { 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 @@ status_t AudioSource::stop() { return UNKNOWN_ERROR; } + if (mInitCheck != OK) { + return NO_INIT; + } + mRecord->stop(); delete mGroup; @@ -118,6 +126,10 @@ status_t AudioSource::stop() { } 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 @@ void AudioSource::rampVolume( status_t AudioSource::read( MediaBuffer **out, const ReadOptions *options) { + + if (mInitCheck != OK) { + return NO_INIT; + } + *out = NULL; MediaBuffer *buffer; @@ -294,10 +311,6 @@ status_t AudioSource::read( 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); |