libmedia new can't fail on Android (83bc7f3c) · Commits · e / os / android_frameworks_av

media/libmedia/AudioRecord.cpp

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -208,9 +208,6 @@ status_t AudioRecord::set(

	if (cbf != 0) {		if (cbf != 0) {
	mClientRecordThread = new ClientRecordThread(*this, threadCanCallJava);		mClientRecordThread = new ClientRecordThread(*this, threadCanCallJava);
	if (mClientRecordThread == 0) {
	return NO_INIT;
	}
	}		}

	mStatus = NO_ERROR;		mStatus = NO_ERROR;

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -238,10 +238,6 @@ status_t AudioTrack::set(

	if (cbf != 0) {		if (cbf != 0) {
	mAudioTrackThread = new AudioTrackThread(*this, threadCanCallJava);		mAudioTrackThread = new AudioTrackThread(*this, threadCanCallJava);
	if (mAudioTrackThread == 0) {
	ALOGE("Could not create callback thread");
	return NO_INIT;
	}
	}		}

	mStatus = NO_ERROR;		mStatus = NO_ERROR;

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -168,10 +168,6 @@ int JetPlayer::render() {
	// allocate render buffer		// allocate render buffer
	mAudioBuffer =		mAudioBuffer =
	new EAS_PCM[pLibConfig->mixBufferSize * pLibConfig->numChannels * MIX_NUM_BUFFERS];		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		// signal main thread that we started
	{		{

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -173,6 +173,7 @@ void MediaScannerClient::convertValues(uint32_t encoding)
	const char* source = mValues->getEntry(i);		const char* source = mValues->getEntry(i);
	int targetLength = len * 3 + 1;		int targetLength = len * 3 + 1;
	char* buffer = new char[targetLength];		char* buffer = new char[targetLength];
			// don't normally check for NULL, but in this case targetLength may be large
	if (!buffer)		if (!buffer)
	break;		break;
	char* target = buffer;		char* target = buffer;

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1017,10 +1017,6 @@ bool ToneGenerator::initAudioTrack() {

	// Open audio track in mono, PCM 16bit, default sampling rate, default buffer size		// Open audio track in mono, PCM 16bit, default sampling rate, default buffer size
	mpAudioTrack = new AudioTrack();		mpAudioTrack = new AudioTrack();
	if (mpAudioTrack == 0) {
	ALOGE("AudioTrack allocation failed");
	goto initAudioTrack_exit;
	}
	ALOGV("Create Track: %p\n", mpAudioTrack);		ALOGV("Create Track: %p\n", mpAudioTrack);

	mpAudioTrack->set(mStreamType,		mpAudioTrack->set(mStreamType,
	@@ -1353,9 +1349,6 @@ bool ToneGenerator::prepareWave() {
	new ToneGenerator::WaveGenerator((unsigned short)mSamplingRate,		new ToneGenerator::WaveGenerator((unsigned short)mSamplingRate,
	frequency,		frequency,
	TONEGEN_GAIN/lNumWaves);		TONEGEN_GAIN/lNumWaves);
	if (lpWaveGen == 0) {
	goto prepareWave_exit;
	}
	mWaveGens.add(frequency, lpWaveGen);		mWaveGens.add(frequency, lpWaveGen);
	}		}
	frequency = mpNewToneDesc->segments[segmentIdx].waveFreq[++freqIdx];		frequency = mpNewToneDesc->segments[segmentIdx].waveFreq[++freqIdx];
	@@ -1375,12 +1368,6 @@ bool ToneGenerator::prepareWave() {
	}		}

	return true;		return true;

	prepareWave_exit:

	clearWaveGens();

	return false;
	}		}