Skip to content

Commit

Permalink
mediacodec encode/decode aac
Browse files Browse the repository at this point in the history
  • Loading branch information
@isuperqiang
isuperqiang committed May 3, 2019
1 parent 3aff5a6 commit f6796b4
Show file tree
Hide file tree
Showing 14 changed files with 151 additions and 117 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<activity
android:name=".camera.CameraPreviewActivity"
android:theme="@style/Theme.AppCompat.NoActionBar" />
<activity android:name=".mp4.MediaMp4Activity" />
<activity android:name=".muxerextract.MediaMuxerExtractActivity" />
<activity
android:name=".codec.MediaCodecActivity"
android:theme="@style/Theme.AppCompat.NoActionBar" />
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/richie/multimedialearning/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.richie.multimedialearning.audiotrack.AudioTrackActivity;
import com.richie.multimedialearning.camera.CameraPreviewActivity;
import com.richie.multimedialearning.codec.CodecActivity;
import com.richie.multimedialearning.mp4.MediaMp4Activity;
import com.richie.multimedialearning.muxerextract.MediaMuxerExtractActivity;
import com.richie.multimedialearning.opengl.OpenGLActivity;
import com.richie.multimedialearning.surface.SurfaceActivity;

Expand All @@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
findViewById(R.id.btn_audio_record).setOnClickListener(this);
findViewById(R.id.btn_audio_track).setOnClickListener(this);
findViewById(R.id.btn_camera_preview).setOnClickListener(this);
findViewById(R.id.btn_media_mp4).setOnClickListener(this);
findViewById(R.id.btn_media_muxur_extract).setOnClickListener(this);
findViewById(R.id.btn_media_codec).setOnClickListener(this);
findViewById(R.id.btn_opengles).setOnClickListener(this);

Expand Down Expand Up @@ -83,8 +83,8 @@ public void onClick(DialogInterface dialog, int which) {
builder.show();
}
break;
case R.id.btn_media_mp4:
intent = new Intent(this, MediaMp4Activity.class);
case R.id.btn_media_muxur_extract:
intent = new Intent(this, MediaMuxerExtractActivity.class);
break;
case R.id.btn_media_codec:
intent = new Intent(this, CodecActivity.class);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/richie/multimedialearning/audiorecord/AudioRecorder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ public void createAudio(String fileName, int audioSource, int sampleRateInHz, in
// 获得缓冲区字节大小
mBufferSizeInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
if (mBufferSizeInBytes <= 0) {
throw new IllegalStateException("AudioRecord is not available " + mBufferSizeInBytes);
throw new IllegalStateException("AudioRecord is not available, minBufferSize: " + mBufferSizeInBytes);
}

mAudioRecord = new AudioRecord(audioSource, sampleRateInHz, channelConfig, audioFormat, mBufferSizeInBytes);
int state = mAudioRecord.getState();
Log.i(TAG, "createAudio state:" + state + ", initialized:" + (state == AudioRecord.STATE_INITIALIZED));
Log.i(TAG, "createAudio state: " + state + ", initialized: " + (state == AudioRecord.STATE_INITIALIZED));
mPcmFileName = fileName;
mStatus = Status.STATUS_READY;
}
Expand Down
74 changes: 39 additions & 35 deletions app/src/main/java/com/richie/multimedialearning/codec/AacPcmCoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@

/**
* @author Richie on 2019.04.03
* see https://blog.csdn.net/KokJuis/article/details/72781835
*/
public final class AacPcmCoder {
private static final String TAG = "AacPcmCoder";
private final static String AUDIO_MIME = "audio/mp4a-latm";
private final static long AUDIO_BYTES_PER_SAMPLE = 44100 * 16 / 8;
private final static long AUDIO_BYTES_PER_SAMPLE = 44100 * 1 * 16 / 8;

/**
* 利用 MediaExtractor 和 MediaCodec 来提取编码后的音频数据并解压成音频源数据
Expand All @@ -28,7 +29,7 @@ public final class AacPcmCoder {
* @param decodedFile
* @throws IOException
*/
public static void decodeAac2Pcm(File encodedFile, File decodedFile) throws IOException {
public static void decodeAacToPcm(File encodedFile, File decodedFile) throws IOException {
MediaExtractor extractor = new MediaExtractor();
extractor.setDataSource(encodedFile.getAbsolutePath());
MediaFormat mediaFormat = null;
Expand All @@ -42,7 +43,7 @@ public static void decodeAac2Pcm(File encodedFile, File decodedFile) throws IOEx
}
}
if (mediaFormat == null) {
Log.e(TAG, "not a valid file with audio track..");
Log.e(TAG, "Invalid file with audio track.");
extractor.release();
return;
}
Expand All @@ -54,11 +55,10 @@ public static void decodeAac2Pcm(File encodedFile, File decodedFile) throws IOEx
codec.start();
ByteBuffer[] codecInputBuffers = codec.getInputBuffers();
ByteBuffer[] codecOutputBuffers = codec.getOutputBuffers();
final long kTimeOutUs = 5000;
final long kTimeOutUs = 10_000;
MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
boolean sawInputEOS = false;
boolean sawOutputEOS = false;
int totalRawSize = 0;

try {
while (!sawOutputEOS) {
Expand All @@ -72,8 +72,7 @@ public static void decodeAac2Pcm(File encodedFile, File decodedFile) throws IOEx
sawInputEOS = true;
codec.queueInputBuffer(inputBufIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
} else {
long presentationTimeUs = extractor.getSampleTime();
codec.queueInputBuffer(inputBufIndex, 0, sampleSize, presentationTimeUs, 0);
codec.queueInputBuffer(inputBufIndex, 0, sampleSize, extractor.getSampleTime(), 0);
extractor.advance();
}
}
Expand All @@ -94,7 +93,6 @@ public static void decodeAac2Pcm(File encodedFile, File decodedFile) throws IOEx
outBuf.limit(info.offset + info.size);
byte[] data = new byte[info.size];
outBuf.get(data);
totalRawSize += data.length;
fosDecoder.write(data);
}

Expand All @@ -113,22 +111,29 @@ public static void decodeAac2Pcm(File encodedFile, File decodedFile) throws IOEx
}
}
} finally {
Log.i(TAG, "release totalRawSize: " + totalRawSize);
Log.i(TAG, "decodeAacToPcm finish");
fosDecoder.close();
codec.stop();
codec.release();
extractor.release();
}
}


public static void encodePcmToAac(File pcmAudioFile, File outEncodeFile) throws IOException {
/**
* Encode pcm data to aac format
*
* @param inPcmFile
* @param outAacFile
* @throws IOException
*/
public static void encodePcmToAac(File inPcmFile, File outAacFile) throws IOException {
FileInputStream fisRawAudio = null;
FileOutputStream fosAccAudio = null;
MediaCodec audioEncoder = createAudioEncoder();
;
try {
fisRawAudio = new FileInputStream(pcmAudioFile);
fosAccAudio = new FileOutputStream(outEncodeFile);
final MediaCodec audioEncoder = createACCAudioDecoder();
fisRawAudio = new FileInputStream(inPcmFile);
fosAccAudio = new FileOutputStream(outAacFile);
audioEncoder.start();
ByteBuffer[] audioInputBuffers = audioEncoder.getInputBuffers();
ByteBuffer[] audioOutputBuffers = audioEncoder.getOutputBuffers();
Expand All @@ -138,7 +143,7 @@ public static void encodePcmToAac(File pcmAudioFile, File outEncodeFile) throws
MediaCodec.BufferInfo outBufferInfo = new MediaCodec.BufferInfo();
boolean readRawAudioEOS = false;
byte[] rawInputBytes = new byte[8192];
int readRawAudioCount = 0;
int readRawAudioCount;
int rawAudioSize = 0;
long lastAudioPresentationTimeUs = 0;
int inputBufIndex, outputBufIndex;
Expand All @@ -152,11 +157,9 @@ public static void encodePcmToAac(File pcmAudioFile, File outEncodeFile) throws
if (bufferSize != rawInputBytes.length) {
rawInputBytes = new byte[bufferSize];
}
if (!readRawAudioEOS) {
readRawAudioCount = fisRawAudio.read(rawInputBytes);
if (readRawAudioCount == -1) {
readRawAudioEOS = true;
}
readRawAudioCount = fisRawAudio.read(rawInputBytes);
if (readRawAudioCount == -1) {
readRawAudioEOS = true;
}
if (readRawAudioEOS) {
audioEncoder.queueInputBuffer(inputBufIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
Expand All @@ -165,7 +168,7 @@ public static void encodePcmToAac(File pcmAudioFile, File outEncodeFile) throws
inputBuffer.put(rawInputBytes, 0, readRawAudioCount);
rawAudioSize += readRawAudioCount;
audioEncoder.queueInputBuffer(inputBufIndex, 0, readRawAudioCount, audioTimeUs, 0);
audioTimeUs = (long) (1000000 * (rawAudioSize / 2.0) / AUDIO_BYTES_PER_SAMPLE);
audioTimeUs = (long) (1_000_000 * ((float) rawAudioSize / AUDIO_BYTES_PER_SAMPLE));
}
}
}
Expand All @@ -182,18 +185,18 @@ public static void encodePcmToAac(File pcmAudioFile, File outEncodeFile) throws
ByteBuffer outBuffer = audioOutputBuffers[outputBufIndex];
outBuffer.position(outBufferInfo.offset);
outBuffer.limit(outBufferInfo.offset + outBufferInfo.size);
//Log.i(TAG, String.format(" writing audio sample : size=%s , presentationTimeUs=%s", outBufferInfo.size, outBufferInfo.presentationTimeUs));
//Log.v(TAG, String.format(" writing audio sample : size=%s , presentationTimeUs=%s", outBufferInfo.size, outBufferInfo.presentationTimeUs));
if (lastAudioPresentationTimeUs <= outBufferInfo.presentationTimeUs) {
lastAudioPresentationTimeUs = outBufferInfo.presentationTimeUs;
int outBufSize = outBufferInfo.size;
int outPacketSize = outBufSize + 7;
outBuffer.position(outBufferInfo.offset);
outBuffer.limit(outBufferInfo.offset + outBufSize);
byte[] outData = new byte[outBufSize + 7];
byte[] outData = new byte[outPacketSize];
addADTStoPacket(outData, outPacketSize);
outBuffer.get(outData, 7, outBufSize);
fosAccAudio.write(outData, 0, outData.length);
//Log.i(TAG, outData.length + " bytes written.");
//Log.v(TAG, outData.length + " bytes written.");
} else {
Log.e(TAG, "error sample! its presentationTimeUs should not lower than before.");
}
Expand All @@ -210,20 +213,18 @@ public static void encodePcmToAac(File pcmAudioFile, File outEncodeFile) throws
}
}
} finally {
try {
if (fisRawAudio != null) {
fisRawAudio.close();
}
if (fosAccAudio != null) {
fosAccAudio.close();
}
} catch (IOException e) {
e.printStackTrace();
Log.i(TAG, "encodePcmToAac: finish");
if (fisRawAudio != null) {
fisRawAudio.close();
}
if (fosAccAudio != null) {
fosAccAudio.close();
}
audioEncoder.release();
}
}

private static MediaCodec createACCAudioDecoder() throws IOException {
private static MediaCodec createAudioEncoder() throws IOException {
MediaCodec codec = MediaCodec.createEncoderByType(AUDIO_MIME);
MediaFormat format = new MediaFormat();
format.setString(MediaFormat.KEY_MIME, AUDIO_MIME);
Expand All @@ -241,12 +242,15 @@ private static MediaCodec createACCAudioDecoder() throws IOException {
* AAC data.
* <p>
* Note the packetLen must count in the ADTS header itself.
* <p>
* see https://blog.csdn.net/bsplover/article/details/7426476,
* Sample rate and channel count are variables.
**/
private static void addADTStoPacket(byte[] packet, int packetLen) {
int profile = 2; //AAC LC
//39=MediaCodecInfo.CodecProfileLevel.AACObjectELD;
int freqIdx = 4; //44.1KHz
int chanCfg = 2; //CPE
int chanCfg = 1; //CPE
// fill in ADTS data
packet[0] = (byte) 0xFF;
packet[1] = (byte) 0xF9;
Expand Down
Loading

0 comments on commit f6796b4

Please sign in to comment.