Skip to content
Snippets Groups Projects
Commit 4d84f0fa authored by Leo Ma's avatar Leo Ma
Browse files

Updrade Android Studio 2.3


Signed-off-by: default avatarLeo Ma <begeekmyfriend@gmail.com>
parent 464bbcd9
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Loading
Loading
Loading
Loading
@@ -328,15 +328,13 @@ public class SrsEncoder {
// when got encoded h264 es stream.
private void onEncodedAnnexbFrame(ByteBuffer es, MediaCodec.BufferInfo bi) {
ByteBuffer record = es.duplicate();
mp4Muxer.writeSampleData(videoMp4Track, record, bi);
mp4Muxer.writeSampleData(videoMp4Track, es.duplicate(), bi);
flvMuxer.writeSampleData(videoFlvTrack, es, bi);
}
// when got encoded aac raw stream.
private void onEncodedAacFrame(ByteBuffer es, MediaCodec.BufferInfo bi) {
ByteBuffer record = es.duplicate();
mp4Muxer.writeSampleData(audioMp4Track, record, bi);
mp4Muxer.writeSampleData(audioMp4Track, es.duplicate(), bi);
flvMuxer.writeSampleData(audioFlvTrack, es, bi);
}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment