Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread

Browse Source 
Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp

* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
  Make sure that if initialization fails, AudioSource still behaves well.
This commit is contained in:
James Dong
2010-09-01 15:56:25 -07:00
committed by Android Git Automerger
parent 61f1cbdd71 d3c1bae4eb
commit 3fd01c4da9
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/libstagefright/AudioSource.cpp
View File

@@ -72,6 +72,10 @@ status_t AudioSource::start(MetaData *params) {
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
if (mInitCheck != OK) {
return NO_INIT;
}
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];
if (property_get("media.stagefright.record-stats", value, NULL) if (property_get("media.stagefright.record-stats", value, NULL)
&& (!strcmp(value, "1") || !strcasecmp(value, "true"))) { && (!strcmp(value, "1") || !strcasecmp(value, "true"))) {
@@ -102,6 +106,10 @@ status_t AudioSource::stop() {
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
if (mInitCheck != OK) {
return NO_INIT;
}
mRecord->stop(); mRecord->stop();
delete mGroup; delete mGroup;
@@ -118,6 +126,10 @@ status_t AudioSource::stop() {
} }
sp<MetaData> AudioSource::getFormat() { sp<MetaData> AudioSource::getFormat() {
if (mInitCheck != OK) {
return 0;
}
sp<MetaData> meta = new MetaData; sp<MetaData> meta = new MetaData;
meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW); meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);
meta->setInt32(kKeySampleRate, mRecord->getSampleRate()); meta->setInt32(kKeySampleRate, mRecord->getSampleRate());
@@ -193,6 +205,11 @@ void AudioSource::rampVolume(
status_t AudioSource::read( status_t AudioSource::read(
MediaBuffer **out, const ReadOptions *options) { MediaBuffer **out, const ReadOptions *options) {
if (mInitCheck != OK) {
return NO_INIT;
}
*out = NULL; *out = NULL;
MediaBuffer *buffer; MediaBuffer *buffer;
@@ -294,10 +311,6 @@ status_t AudioSource::read(
buffer->meta_data()->setInt64(kKeyTime, mPrevSampleTimeUs); buffer->meta_data()->setInt64(kKeyTime, mPrevSampleTimeUs);
CHECK(timestampUs > mPrevSampleTimeUs); CHECK(timestampUs > mPrevSampleTimeUs);
if (mTotalLostFrames == 0) {
CHECK_EQ(mPrevSampleTimeUs,
mStartTimeUs + (1000000LL * numFramesRecorded) / sampleRate);
}
mPrevSampleTimeUs = timestampUs; mPrevSampleTimeUs = timestampUs;
LOGV("initial delay: %lld, sample rate: %d, timestamp: %lld", LOGV("initial delay: %lld, sample rate: %d, timestamp: %lld",
mStartTimeUs, sampleRate, timestampUs); mStartTimeUs, sampleRate, timestampUs);