diff options
author | Glenn Kasten <gkasten@google.com> | 2012-01-04 12:38:13 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-01-11 12:27:41 -0800 |
commit | 83bc7f3cf78b28a818417f40a4f0c00593993366 (patch) | |
tree | 92870fd797bc4cc281c60e463848e27e7f16b1ea /media | |
parent | 3bba0e0a60b15895134bc2c731d21fd7ebd28784 (diff) | |
download | frameworks_av-83bc7f3cf78b28a818417f40a4f0c00593993366.zip frameworks_av-83bc7f3cf78b28a818417f40a4f0c00593993366.tar.gz frameworks_av-83bc7f3cf78b28a818417f40a4f0c00593993366.tar.bz2 |
libmedia new can't fail on Android
Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioRecord.cpp | 3 | ||||
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 4 | ||||
-rw-r--r-- | media/libmedia/JetPlayer.cpp | 4 | ||||
-rw-r--r-- | media/libmedia/MediaScannerClient.cpp | 1 | ||||
-rw-r--r-- | media/libmedia/ToneGenerator.cpp | 13 | ||||
-rw-r--r-- | media/libmedia/Visualizer.cpp | 4 |
6 files changed, 1 insertions, 28 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 2674070..8e4a9d6 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -208,9 +208,6 @@ status_t AudioRecord::set( if (cbf != 0) { mClientRecordThread = new ClientRecordThread(*this, threadCanCallJava); - if (mClientRecordThread == 0) { - return NO_INIT; - } } mStatus = NO_ERROR; diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 191fbaf..335db57 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -238,10 +238,6 @@ status_t AudioTrack::set( if (cbf != 0) { mAudioTrackThread = new AudioTrackThread(*this, threadCanCallJava); - if (mAudioTrackThread == 0) { - ALOGE("Could not create callback thread"); - return NO_INIT; - } } mStatus = NO_ERROR; diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index 38f05f2..b1491b6 100644 --- a/media/libmedia/JetPlayer.cpp +++ b/media/libmedia/JetPlayer.cpp @@ -168,10 +168,6 @@ int JetPlayer::render() { // allocate render buffer mAudioBuffer = new EAS_PCM[pLibConfig->mixBufferSize * pLibConfig->numChannels * MIX_NUM_BUFFERS]; - if (!mAudioBuffer) { - ALOGE("JetPlayer::render(): mAudioBuffer allocate failed"); - goto threadExit; - } // signal main thread that we started { diff --git a/media/libmedia/MediaScannerClient.cpp b/media/libmedia/MediaScannerClient.cpp index 40b8188..9fe1820 100644 --- a/media/libmedia/MediaScannerClient.cpp +++ b/media/libmedia/MediaScannerClient.cpp @@ -173,6 +173,7 @@ void MediaScannerClient::convertValues(uint32_t encoding) const char* source = mValues->getEntry(i); int targetLength = len * 3 + 1; char* buffer = new char[targetLength]; + // don't normally check for NULL, but in this case targetLength may be large if (!buffer) break; char* target = buffer; diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 35dfbb8..9d32460 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -1017,10 +1017,6 @@ bool ToneGenerator::initAudioTrack() { // Open audio track in mono, PCM 16bit, default sampling rate, default buffer size mpAudioTrack = new AudioTrack(); - if (mpAudioTrack == 0) { - ALOGE("AudioTrack allocation failed"); - goto initAudioTrack_exit; - } ALOGV("Create Track: %p\n", mpAudioTrack); mpAudioTrack->set(mStreamType, @@ -1353,9 +1349,6 @@ bool ToneGenerator::prepareWave() { new ToneGenerator::WaveGenerator((unsigned short)mSamplingRate, frequency, TONEGEN_GAIN/lNumWaves); - if (lpWaveGen == 0) { - goto prepareWave_exit; - } mWaveGens.add(frequency, lpWaveGen); } frequency = mpNewToneDesc->segments[segmentIdx].waveFreq[++freqIdx]; @@ -1375,12 +1368,6 @@ bool ToneGenerator::prepareWave() { } return true; - -prepareWave_exit: - - clearWaveGens(); - - return false; } diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp index d08ffa5..66758d2 100644 --- a/media/libmedia/Visualizer.cpp +++ b/media/libmedia/Visualizer.cpp @@ -115,10 +115,6 @@ status_t Visualizer::setCaptureCallBack(capture_cbk_t cbk, void* user, uint32_t if (cbk != NULL) { mCaptureThread = new CaptureThread(*this, rate, ((flags & CAPTURE_CALL_JAVA) != 0)); - if (mCaptureThread == 0) { - ALOGE("Could not create callback thread"); - return NO_INIT; - } } ALOGV("setCaptureCallBack() rate: %d thread %p flags 0x%08x", rate, mCaptureThread.get(), mCaptureFlags); |