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

Clean up throws in AudioRecord and AudioTrack

Browse Source 
Remove dead assignments to member fields in constructor prior to throw.
Execution doesn't continue execution, so no need to initialize fields.

throw doesn't need parentheses.

Fix indentation.

Change-Id: I2bf1b8bfa2c836e53a41eea67552cba40dc6fd43
This commit is contained in:
Glenn Kasten
2013-07-18 17:08:21 -07:00
parent 474daa2b78
commit 896a7f5fee
2 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
media/java/android/media/AudioRecord.java
View File

@@ -256,19 +256,17 @@ public class AudioRecord
// audio source
if ( (audioSource < MediaRecorder.AudioSource.DEFAULT) ||
(audioSource > MediaRecorder.getAudioSourceMax()) ) {
throw (new IllegalArgumentException("Invalid audio source."));
} else {
mRecordSource = audioSource;
throw new IllegalArgumentException("Invalid audio source.");
}
mRecordSource = audioSource;
//--------------
// sample rate
if ( (sampleRateInHz < 4000) || (sampleRateInHz > 48000) ) {
throw (new IllegalArgumentException(sampleRateInHz
+ "Hz is not a supported sample rate."));
} else {
mSampleRate = sampleRateInHz;
throw new IllegalArgumentException(sampleRateInHz
+ "Hz is not a supported sample rate.");
}
mSampleRate = sampleRateInHz;
//--------------
// channel config
@@ -289,9 +287,7 @@ public class AudioRecord
mChannelMask = channelConfig;
break;
default:
mChannelCount = 0;
mChannelMask = AudioFormat.CHANNEL_INVALID;
throw (new IllegalArgumentException("Unsupported channel configuration."));
throw new IllegalArgumentException("Unsupported channel configuration.");
}
//--------------
@@ -305,9 +301,8 @@ public class AudioRecord
mAudioFormat = audioFormat;
break;
default:
mAudioFormat = AudioFormat.ENCODING_INVALID;
throw (new IllegalArgumentException("Unsupported sample encoding."
+ " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT."));
throw new IllegalArgumentException("Unsupported sample encoding."
+ " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT.");
}
}
@@ -324,7 +319,7 @@ public class AudioRecord
int frameSizeInBytes = mChannelCount
* (mAudioFormat == AudioFormat.ENCODING_PCM_8BIT ? 1 : 2);
if ((audioBufferSize % frameSizeInBytes != 0) || (audioBufferSize < 1)) {
throw (new IllegalArgumentException("Invalid audio buffer size."));
throw new IllegalArgumentException("Invalid audio buffer size.");
}
mNativeBufferSizeInBytes = audioBufferSize;
@@ -509,8 +504,8 @@ public class AudioRecord
public void startRecording()
throws IllegalStateException {
if (mState != STATE_INITIALIZED) {
throw(new IllegalStateException("startRecording() called on an "
+"uninitialized AudioRecord."));
throw new IllegalStateException("startRecording() called on an "
+ "uninitialized AudioRecord.");
}
// start recording
@@ -531,8 +526,8 @@ public class AudioRecord
public void startRecording(MediaSyncEvent syncEvent)
throws IllegalStateException {
if (mState != STATE_INITIALIZED) {
throw(new IllegalStateException("startRecording() called on an "
+"uninitialized AudioRecord."));
throw new IllegalStateException("startRecording() called on an "
+ "uninitialized AudioRecord.");
}
// start recording
@@ -550,7 +545,7 @@ public class AudioRecord
public void stop()
throws IllegalStateException {
if (mState != STATE_INITIALIZED) {
throw(new IllegalStateException("stop() called on an uninitialized AudioRecord."));
throw new IllegalStateException("stop() called on an uninitialized AudioRecord.");
}
// stop recording

18
media/java/android/media/AudioTrack.java
View File

@@ -371,18 +371,16 @@ public class AudioTrack
&& (streamType != AudioManager.STREAM_BLUETOOTH_SCO)
&& (streamType != AudioManager.STREAM_DTMF)) {
throw new IllegalArgumentException("Invalid stream type.");
} else {
mStreamType = streamType;
}
mStreamType = streamType;
//--------------
// sample rate, note these values are subject to change
if ( (sampleRateInHz < 4000) || (sampleRateInHz > 48000) ) {
throw new IllegalArgumentException(sampleRateInHz
+ "Hz is not a supported sample rate.");
} else {
mSampleRate = sampleRateInHz;
}
mSampleRate = sampleRateInHz;
//--------------
// channel config
@@ -403,14 +401,10 @@ public class AudioTrack
default:
if (!isMultichannelConfigSupported(channelConfig)) {
// input channel configuration features unsupported channels
mChannelCount = 0;
mChannels = AudioFormat.CHANNEL_INVALID;
mChannelConfiguration = AudioFormat.CHANNEL_INVALID;
throw new IllegalArgumentException("Unsupported channel configuration.");
} else {
mChannels = channelConfig;
mChannelCount = Integer.bitCount(channelConfig);
}
mChannels = channelConfig;
mChannelCount = Integer.bitCount(channelConfig);
}
//--------------
@@ -424,7 +418,6 @@ public class AudioTrack
mAudioFormat = audioFormat;
break;
default:
mAudioFormat = AudioFormat.ENCODING_INVALID;
throw new IllegalArgumentException("Unsupported sample encoding."
+ " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT.");
}
@@ -433,9 +426,8 @@ public class AudioTrack
// audio load mode
if ( (mode != MODE_STREAM) && (mode != MODE_STATIC) ) {
throw new IllegalArgumentException("Invalid mode.");
} else {
mDataLoadMode = mode;
}
mDataLoadMode = mode;
}
/**