update gradle;add more param to StremPublisher.Param

ChillingVan · ChillingVan · commit 31e4313fd085 · 2017-12-17T20:30:42.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,12 +21,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.2"
     defaultConfig {
         applicationId "com.chillingvan.instantvideo.sample"
         minSdkVersion 18
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -50,8 +50,8 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile project(':applibs')
-    compile 'com.github.tajchert:nammu:1.1.1'
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.github.tajchert:nammu:1.2.0'
+    compile 'com.android.support:appcompat-v7:27.0.2'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/chillingvan/instantvideo/sample/test/audio/TestAudioEncoder.java b/app/src/main/java/com/chillingvan/instantvideo/sample/test/audio/TestAudioEncoder.java
@@ -26,6 +26,7 @@
 import com.chillingvan.canvasgl.Loggers;
 import com.chillingvan.lib.encoder.MediaCodecInputStream;
 import com.chillingvan.lib.encoder.audio.AACEncoder;
+import com.chillingvan.lib.publisher.StreamPublisher;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -56,7 +57,8 @@ public TestAudioEncoder(Context ctx) {
 
     public void prepareEncoder() {
         try {
-            aacEncoder = new AACEncoder(44100, 192000);
+            StreamPublisher.StreamPublisherParam streamPublisherParam = new StreamPublisher.StreamPublisherParam();
+            aacEncoder = new AACEncoder(streamPublisherParam);
             aacEncoder.setOnDataComingCallback(new AACEncoder.OnDataComingCallback() {
                 @Override
                 public void onComing() {
diff --git a/app/src/main/java/com/chillingvan/instantvideo/sample/test/camera/TestCameraAndVideoActivity.java b/app/src/main/java/com/chillingvan/instantvideo/sample/test/camera/TestCameraAndVideoActivity.java
@@ -23,6 +23,10 @@
 import com.chillingvan.lib.camera.InstantVideoCamera;
 import com.chillingvan.lib.encoder.video.H264Encoder;
 
+/**
+ * Data Stream:
+ * Camera -> SurfaceTexture -> Surface -> MediaCodec -> encode data(byte[]) -> File
+ */
 public class TestCameraAndVideoActivity extends AppCompatActivity {
 
     private TestVideoEncoder testVideoEncoder;
diff --git a/app/src/main/java/com/chillingvan/instantvideo/sample/test/publisher/TestCameraPublisherActivity.java b/app/src/main/java/com/chillingvan/instantvideo/sample/test/publisher/TestCameraPublisherActivity.java
@@ -70,6 +70,8 @@ public void onGLDraw(ICanvasGL canvasGL, SurfaceTexture surfaceTexture, RawTextu
             }
         });
         addrEditText = (EditText) findViewById(R.id.ip_input_test);
+
+
         instantVideoCamera = new InstantVideoCamera(Camera.CameraInfo.CAMERA_FACING_FRONT, 640, 480);
 //        instantVideoCamera = new InstantVideoCamera(Camera.CameraInfo.CAMERA_FACING_FRONT, 1280, 720);
 
@@ -82,6 +84,8 @@ public void handleMessage(Message msg) {
 //                StreamPublisher.StreamPublisherParam streamPublisherParam = new StreamPublisher.StreamPublisherParam();
 //                StreamPublisher.StreamPublisherParam streamPublisherParam = new StreamPublisher.StreamPublisherParam(1080, 640, 9500 * 1000, 30, 1, 44100, 19200);
                 StreamPublisher.StreamPublisherParam streamPublisherParam = new StreamPublisher.StreamPublisherParam(540, 750, 1500 * 1000, 30, 1, 44100, 19200);
+                streamPublisherParam.outputFilePath = getExternalFilesDir(null) + "/test_flv_encode.flv";
+//                streamPublisherParam.outputFilePath = getExternalFilesDir(null) + "/test_mp4_encode.mp4";
                 streamPublisher.prepareEncoder(streamPublisherParam, new H264Encoder.OnDrawListener() {
                     @Override
                     public void onGLDraw(ICanvasGL canvasGL, SurfaceTexture surfaceTexture, RawTexture rawTexture, @Nullable SurfaceTexture outsideSurfaceTexture, @Nullable BasicTexture outsideTexture) {
@@ -91,16 +95,17 @@ public void onGLDraw(ICanvasGL canvasGL, SurfaceTexture surfaceTexture, RawTextu
                     }
                 });
                 try {
-                    streamPublisher.startPublish(addrEditText.getText().toString(), streamPublisherParam.width, streamPublisherParam.height);
+                    streamPublisherParam.outputUrl = addrEditText.getText().toString();
+                    streamPublisher.startPublish();
                 } catch (IOException e) {
                     e.printStackTrace();
+                    ((TextView)findViewById(R.id.test_camera_button)).setText("START");
                 }
             }
         };
 
-//        streamPublisher = new CameraStreamPublisher(new RTMPStreamMuxer(), cameraPreviewTextureView, instantVideoCamera);
-        String filename = getExternalFilesDir(null) + "/test_flv_encode.flv";
-        streamPublisher = new CameraStreamPublisher(new RTMPStreamMuxer(filename), cameraPreviewTextureView, instantVideoCamera);
+        streamPublisher = new CameraStreamPublisher(new RTMPStreamMuxer(), cameraPreviewTextureView, instantVideoCamera);
+//        streamPublisher = new CameraStreamPublisher(new MP4Muxer(), cameraPreviewTextureView, instantVideoCamera);
     }
 
     private void drawVideoFrame(ICanvasGL canvasGL, @Nullable SurfaceTexture outsideSurfaceTexture, @Nullable BasicTexture outsideTexture) {
diff --git a/app/src/main/java/com/chillingvan/instantvideo/sample/test/video/TestVideoEncoder.java b/app/src/main/java/com/chillingvan/instantvideo/sample/test/video/TestVideoEncoder.java
@@ -34,6 +34,7 @@
 import com.chillingvan.canvasgl.glview.texture.gles.EglContextWrapper;
 import com.chillingvan.lib.encoder.MediaCodecInputStream;
 import com.chillingvan.lib.encoder.video.H264Encoder;
+import com.chillingvan.lib.publisher.StreamPublisher;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -69,7 +70,7 @@ public TestVideoEncoder(Context ctx, final EglContextWrapper eglCtx) {
 
     public void prepareEncoder(H264Encoder.OnDrawListener onDrawListener) {
         try {
-            h264Encoder = new H264Encoder(640, 480, 2949120, 30, 5, eglCtx);
+            h264Encoder = new H264Encoder(new StreamPublisher.StreamPublisherParam(), eglCtx);
             h264Encoder.setSharedTexture(outsideTexture, outsideSurfaceTexture);
             h264Encoder.setOnDrawListener(onDrawListener);
         } catch (IOException | IllegalStateException e) {
diff --git a/app/src/main/res/layout/activity_test_camera_publisher.xml b/app/src/main/res/layout/activity_test_camera_publisher.xml
@@ -63,7 +63,7 @@
         android:id="@+id/ip_input_test"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="rtmp://192.168.137.1:19305/live/room"
+        android:text="rtmp://192.168.0.101:19305/live/room"
         android:hint="rtmp://192.168.1.139:19305/live/room"
         android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
diff --git a/applibs/build.gradle b/applibs/build.gradle
@@ -23,12 +23,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.ChillingVan'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 100010
         versionName "1.0.1.0"
 
@@ -45,14 +45,14 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.1.2'
+    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.2.1'
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
     testCompile 'junit:junit:4.12'
     compile 'net.butterflytv.utils:rtmp-client:0.2.6'
 
+    compile 'com.android.support:support-annotations:27.0.2'
 }
 
 
diff --git a/applibs/src/main/java/com/chillingvan/lib/encoder/audio/AACEncoder.java b/applibs/src/main/java/com/chillingvan/lib/encoder/audio/AACEncoder.java
@@ -23,19 +23,19 @@
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaCodec;
-import android.media.MediaCodecInfo;
-import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.util.Log;
 
 import com.chillingvan.canvasgl.Loggers;
 import com.chillingvan.lib.encoder.MediaCodecInputStream;
+import com.chillingvan.lib.publisher.StreamPublisher;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
- * Created by Chilling on 2017/1/11.
+ * Data Stream:
+ * MIC -> AudioRecord -> voice data(byte[]) -> MediaCodec -> encode data(byte[])
  */
 
 public class AACEncoder {
@@ -51,16 +51,12 @@ public class AACEncoder {
     private final int bufferSize;
     private boolean isStart;
 
-    public AACEncoder(final int samplingRate, int bitRate) throws IOException {
-        this.samplingRate = samplingRate;
+    public AACEncoder(StreamPublisher.StreamPublisherParam params) throws IOException {
+        this.samplingRate = params.samplingRate;
 
-        bufferSize = AudioRecord.getMinBufferSize(samplingRate, AudioFormat.CHANNEL_IN_STEREO, AudioFormat.ENCODING_PCM_16BIT) * 2;
-        mMediaCodec = MediaCodec.createEncoderByType("audio/mp4a-latm");
-        MediaFormat format = MediaFormat.createAudioFormat("audio/mp4a-latm", samplingRate, 2);
-        format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
-        format.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
-        format.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, bufferSize);
-        mMediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+        bufferSize = params.audioBufferSize;
+        mMediaCodec = MediaCodec.createEncoderByType(params.audioMIME);
+        mMediaCodec.configure(params.createAudioMediaFormat(), null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
 
         mediaCodecInputStream = new MediaCodecInputStream(mMediaCodec);
         mAudioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, samplingRate, AudioFormat.CHANNEL_IN_STEREO, AudioFormat.ENCODING_PCM_16BIT, bufferSize);
diff --git a/applibs/src/main/java/com/chillingvan/lib/encoder/video/H264Encoder.java b/applibs/src/main/java/com/chillingvan/lib/encoder/video/H264Encoder.java
@@ -34,13 +34,16 @@
 import com.chillingvan.canvasgl.glcanvas.RawTexture;
 import com.chillingvan.canvasgl.glview.texture.gles.EglContextWrapper;
 import com.chillingvan.lib.encoder.MediaCodecInputStream;
+import com.chillingvan.lib.publisher.StreamPublisher;
 
 import java.io.IOException;
 
 /**
- * Created by Chilling on 2016/12/11.
+ * Data Stream:
+ *
+ * The texture of {@link H264Encoder#setSharedTexture} -> Surface of MediaCodec -> encode data(byte[])
+ *
  */
-
 public class H264Encoder {
 
     private final Surface mInputSurface;
@@ -55,39 +58,33 @@ public class H264Encoder {
     private boolean isStart;
 
 
-    public H264Encoder(int width, int height, int bitRate, int frameRate, int iframeInterval) throws IOException {
-        this(width, height, bitRate, frameRate, iframeInterval, EglContextWrapper.EGL_NO_CONTEXT_WRAPPER);
+    public H264Encoder(StreamPublisher.StreamPublisherParam params) throws IOException {
+        this(params, EglContextWrapper.EGL_NO_CONTEXT_WRAPPER);
     }
 
 
     /**
      *
-     * @param width width
-     * @param height height
-     * @param bitRate bitRate
-     * @param frameRate frameRate
-     * @param iframeInterval iframeInterval
      * @param eglCtx can be EGL10.EGL_NO_CONTEXT or outside context
-     * @throws IOException
      */
-    public H264Encoder(int width, int height, int bitRate, int frameRate, int iframeInterval, final EglContextWrapper eglCtx) throws IOException {
+    public H264Encoder(StreamPublisher.StreamPublisherParam params, final EglContextWrapper eglCtx) throws IOException {
 
-        MediaFormat format = MediaFormat.createVideoFormat(MIME_TYPE, width, height);
+        MediaFormat format = MediaFormat.createVideoFormat(MIME_TYPE, params.width, params.height);
 
         // Set some properties.  Failing to specify some of these can cause the MediaCodec
         // configure() call to throw an unhelpful exception.
         format.setInteger(MediaFormat.KEY_COLOR_FORMAT,
                 MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
-        format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
-        format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
-        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, iframeInterval);
+        format.setInteger(MediaFormat.KEY_BIT_RATE, params.videoBitRate);
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, params.frameRate);
+        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, params.iframeInterval);
         mEncoder = MediaCodec.createEncoderByType(MIME_TYPE);
         mEncoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
         mInputSurface = mEncoder.createInputSurface();
         mEncoder.start();
         mediaCodecInputStream = new MediaCodecInputStream(mEncoder);
 
-        offScreenCanvas = new EncoderCanvas(width, height, eglCtx);
+        offScreenCanvas = new EncoderCanvas(params.width, params.height, eglCtx);
     }
 
     /**
diff --git a/applibs/src/main/java/com/chillingvan/lib/muxer/FrameSender.java b/applibs/src/main/java/com/chillingvan/lib/muxer/FrameSender.java
@@ -18,11 +18,25 @@
  *
  */
 
-package com.chillingvan.lib.encoder.audio.packetlizer;
+package com.chillingvan.lib.muxer;
+
+import android.os.Handler;
+
+import java.util.LinkedList;
+import java.util.List;
 
 /**
- * Created by Chilling on 2017/2/4.
+ * Created by Chilling on 2017/12/17.
  */
 
-public class AACADTSPaketLizer {
+public class FrameSender {
+
+    public static final int KEEP_COUNT = 30;
+
+    private Handler sendHandler;
+    private List<FramePool.Frame> frameQueue = new LinkedList<>();
+    private FramePool framePool = new FramePool(KEEP_COUNT + 10);
+
+    public FrameSender() {
+    }
 }
diff --git a/applibs/src/main/java/com/chillingvan/lib/muxer/IMuxer.java b/applibs/src/main/java/com/chillingvan/lib/muxer/IMuxer.java
@@ -22,13 +22,15 @@
 
 import android.media.MediaCodec;
 
+import com.chillingvan.lib.publisher.StreamPublisher;
+
 /**
  * Created by Chilling on 2017/5/21.
  */
 
 public interface IMuxer {
 
-    int open(String url, int videoWidth, int videoHeight);
+    int open(StreamPublisher.StreamPublisherParam params);
 
     void writeVideo(byte[] buffer, int offset, int length, MediaCodec.BufferInfo bufferInfo);
 
diff --git a/applibs/src/main/java/com/chillingvan/lib/muxer/MP4Muxer.java b/applibs/src/main/java/com/chillingvan/lib/muxer/MP4Muxer.java
@@ -0,0 +1,78 @@
+/*
+ *
+ *  *
+ *  *  * Copyright (C) 2017 ChillingVan
+ *  *  *
+ *  *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  * you may not use this file except in compliance with the License.
+ *  *  * You may obtain a copy of the License at
+ *  *  *
+ *  *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *  *
+ *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  * See the License for the specific language governing permissions and
+ *  *  * limitations under the License.
+ *  *
+ *
+ */
+
+package com.chillingvan.lib.muxer;
+
+import android.media.MediaCodec;
+import android.media.MediaMuxer;
+
+import com.chillingvan.lib.publisher.StreamPublisher;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+/**
+ * Created by Chilling on 2017/12/17.
+ */
+
+public class MP4Muxer implements IMuxer {
+
+    private MediaMuxer mMuxer;
+    private int videoTrackIndex;
+    private int audioTrackIndex;
+
+    public MP4Muxer() {
+    }
+
+    @Override
+    public int open(StreamPublisher.StreamPublisherParam params) {
+        try {
+            mMuxer = new MediaMuxer(params.outputFilePath,
+                    MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return -1;
+        }
+        videoTrackIndex = mMuxer.addTrack(params.createVideoMediaFormat());
+        audioTrackIndex = mMuxer.addTrack(params.createAudioMediaFormat());
+        mMuxer.start();
+        return 0;
+    }
+
+    @Override
+    public void writeVideo(byte[] buffer, int offset, int length, MediaCodec.BufferInfo bufferInfo) {
+        mMuxer.writeSampleData(videoTrackIndex, ByteBuffer.wrap(buffer, offset, length), bufferInfo);
+    }
+
+    @Override
+    public void writeAudio(byte[] buffer, int offset, int length, MediaCodec.BufferInfo bufferInfo) {
+        mMuxer.writeSampleData(audioTrackIndex, ByteBuffer.wrap(buffer, offset, length), bufferInfo);
+    }
+
+    @Override
+    public int close() {
+        if (mMuxer != null) {
+            mMuxer.stop();
+            mMuxer.release();
+            mMuxer = null;
+        }
+        return 0;
+    }
+}
diff --git a/applibs/src/main/java/com/chillingvan/lib/muxer/RTMPStreamMuxer.java b/applibs/src/main/java/com/chillingvan/lib/muxer/RTMPStreamMuxer.java
diff --git a/applibs/src/main/java/com/chillingvan/lib/publisher/CameraStreamPublisher.java b/applibs/src/main/java/com/chillingvan/lib/publisher/CameraStreamPublisher.java
diff --git a/applibs/src/main/java/com/chillingvan/lib/publisher/StreamPublisher.java b/applibs/src/main/java/com/chillingvan/lib/publisher/StreamPublisher.java
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
