update

han1202012 · Jun 11, 2020 · be4dbc9 · be4dbc9
1 parent 7d780b7
commit be4dbc9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -1,10 +1,14 @@
 #include <jni.h>
 #include <string>
+#include "librtmp/rtmp.h"
+#include <x264.h>
 
 extern "C" JNIEXPORT jstring JNICALL
 Java_kim_hsl_rtmp_MainActivity_stringFromJNI(
         JNIEnv* env,
         jobject /* this */) {
     std::string hello = "Hello from C++";
+    RTMP_Alloc();
+    x264_picture_t *p = new x264_picture_t;
     return env->NewStringUTF(hello.c_str());
 }
diff --git a/app/src/main/java/kim/hsl/rtmp/MainActivity.java b/app/src/main/java/kim/hsl/rtmp/MainActivity.java
@@ -8,7 +8,6 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    // Used to load the 'native-lib' library on application startup.
     static {
         System.loadLibrary("native-lib");
     }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,11 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <!-- 预览 Camera 采集的图像数据 -->
-    <SurfaceView
-        android:id="@+id/surfaceView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 
     <TextView
         android:id="@+id/sample_text"
@@ -22,4 +17,11 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!-- 预览 Camera 采集的图像数据 -->
+    <SurfaceView
+        android:id="@+id/surfaceView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>