Commit 82764fae4a38217656d8fc51dea872714d229272
1 parent
ea267647
添加推流SDK文档
Showing
25 changed files
with
43 additions
and
43 deletions
app/build.gradle
| @@ -4,7 +4,7 @@ android { | @@ -4,7 +4,7 @@ android { | ||
| 4 | compileSdkVersion 24 | 4 | compileSdkVersion 24 |
| 5 | buildToolsVersion "24.0.3" | 5 | buildToolsVersion "24.0.3" |
| 6 | defaultConfig { | 6 | defaultConfig { |
| 7 | - applicationId "com.cnlive.demo.stream" | 7 | + applicationId "com.cnlive.demo.streamqn" |
| 8 | minSdkVersion 16 | 8 | minSdkVersion 16 |
| 9 | targetSdkVersion 24 | 9 | targetSdkVersion 24 |
| 10 | versionCode 1 | 10 | versionCode 1 |
app/libs/libcnlivestream.jar
No preview for this file type
app/src/androidTest/java/com/cnlive/demo/stream/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/com/cnlive/demo/streamqn/ExampleInstrumentedTest.java
app/src/main/AndroidManifest.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - package="com.cnlive.demo.stream"> | 3 | + package="com.cnlive.demo.streamqn"> |
| 4 | 4 | ||
| 5 | <uses-permission android:name="android.permission.INTERNET" /> | 5 | <uses-permission android:name="android.permission.INTERNET" /> |
| 6 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | 6 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> |
| @@ -14,20 +14,20 @@ | @@ -14,20 +14,20 @@ | ||
| 14 | <uses-feature android:glEsVersion="0x00020000" android:required="true" /> | 14 | <uses-feature android:glEsVersion="0x00020000" android:required="true" /> |
| 15 | 15 | ||
| 16 | <application | 16 | <application |
| 17 | - android:name=".CNStreamApplication" | 17 | + android:name="com.cnlive.demo.streamqn.CNStreamApplication" |
| 18 | android:allowBackup="true" | 18 | android:allowBackup="true" |
| 19 | android:icon="@mipmap/ic_launcher" | 19 | android:icon="@mipmap/ic_launcher" |
| 20 | android:label="@string/app_name" | 20 | android:label="@string/app_name" |
| 21 | android:supportsRtl="true" | 21 | android:supportsRtl="true" |
| 22 | android:theme="@style/AppTheme"> | 22 | android:theme="@style/AppTheme"> |
| 23 | - <activity android:name=".MainActivity"> | 23 | + <activity android:name="com.cnlive.demo.streamqn.MainActivity"> |
| 24 | <intent-filter> | 24 | <intent-filter> |
| 25 | <action android:name="android.intent.action.MAIN" /> | 25 | <action android:name="android.intent.action.MAIN" /> |
| 26 | 26 | ||
| 27 | <category android:name="android.intent.category.LAUNCHER" /> | 27 | <category android:name="android.intent.category.LAUNCHER" /> |
| 28 | </intent-filter> | 28 | </intent-filter> |
| 29 | </activity> | 29 | </activity> |
| 30 | - <activity android:name=".BaseStreamActivity" | 30 | + <activity android:name="com.cnlive.demo.streamqn.BaseStreamActivity" |
| 31 | android:configChanges="orientation|screenSize"></activity> | 31 | android:configChanges="orientation|screenSize"></activity> |
| 32 | </application> | 32 | </application> |
| 33 | 33 |
app/src/main/java/com/cnlive/demo/stream/BaseStreamActivity.java renamed to app/src/main/java/com/cnlive/demo/streamqn/BaseStreamActivity.java
| 1 | -package com.cnlive.demo.stream; | 1 | +package com.cnlive.demo.streamqn; |
| 2 | 2 | ||
| 3 | import android.app.Activity; | 3 | import android.app.Activity; |
| 4 | import android.app.AlertDialog; | 4 | import android.app.AlertDialog; |
| @@ -22,9 +22,9 @@ import android.widget.ImageView; | @@ -22,9 +22,9 @@ import android.widget.ImageView; | ||
| 22 | import android.widget.SeekBar; | 22 | import android.widget.SeekBar; |
| 23 | import android.widget.Toast; | 23 | import android.widget.Toast; |
| 24 | 24 | ||
| 25 | -import com.cnlive.demo.stream.gles.FBO; | ||
| 26 | -import com.cnlive.demo.stream.ui.CameraPreviewFrameView; | ||
| 27 | -import com.cnlive.demo.stream.ui.RotateLayout; | 25 | +import com.cnlive.demo.streamqn.gles.FBO; |
| 26 | +import com.cnlive.demo.streamqn.ui.CameraPreviewFrameView; | ||
| 27 | +import com.cnlive.demo.streamqn.ui.RotateLayout; | ||
| 28 | 28 | ||
| 29 | import com.cnlive.libs.lib_cnstream.CNCameraSetting; | 29 | import com.cnlive.libs.lib_cnstream.CNCameraSetting; |
| 30 | import com.cnlive.libs.lib_cnstream.CNMicrophoneSetting; | 30 | import com.cnlive.libs.lib_cnstream.CNMicrophoneSetting; |
app/src/main/java/com/cnlive/demo/stream/Config.java renamed to app/src/main/java/com/cnlive/demo/streamqn/Config.java
app/src/main/java/com/cnlive/demo/stream/MainActivity.java renamed to app/src/main/java/com/cnlive/demo/streamqn/MainActivity.java
app/src/main/java/com/cnlive/demo/stream/filter/AbstractFilter.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/AbstractFilter.java
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilter.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilter.java
| 1 | -package com.cnlive.demo.stream.filter; | 1 | +package com.cnlive.demo.streamqn.filter; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | import android.opengl.GLES11Ext; | 4 | import android.opengl.GLES11Ext; |
| 5 | import android.opengl.GLES20; | 5 | import android.opengl.GLES20; |
| 6 | 6 | ||
| 7 | -import com.cnlive.demo.stream.R; | ||
| 8 | -import com.cnlive.demo.stream.gles.GlUtil; | 7 | +import com.cnlive.demo.streamqn.R; |
| 8 | +import com.cnlive.demo.streamqn.gles.GlUtil; | ||
| 9 | 9 | ||
| 10 | import java.nio.FloatBuffer; | 10 | import java.nio.FloatBuffer; |
| 11 | 11 |
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilterBeauty.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilterBeauty.java
| 1 | -package com.cnlive.demo.stream.filter; | 1 | +package com.cnlive.demo.streamqn.filter; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | import android.opengl.GLES20; | 4 | import android.opengl.GLES20; |
| 5 | 5 | ||
| 6 | -import com.cnlive.demo.stream.R; | ||
| 7 | -import com.cnlive.demo.stream.gles.GlUtil; | 6 | +import com.cnlive.demo.streamqn.R; |
| 7 | +import com.cnlive.demo.streamqn.gles.GlUtil; | ||
| 8 | 8 | ||
| 9 | import java.nio.FloatBuffer; | 9 | import java.nio.FloatBuffer; |
| 10 | 10 |
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilterMosaic.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilterMosaic.java
| 1 | -package com.cnlive.demo.stream.filter; | 1 | +package com.cnlive.demo.streamqn.filter; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | import android.opengl.GLES20; | 4 | import android.opengl.GLES20; |
| 5 | 5 | ||
| 6 | -import com.cnlive.demo.stream.R; | ||
| 7 | -import com.cnlive.demo.stream.gles.GlUtil; | 6 | +import com.cnlive.demo.streamqn.R; |
| 7 | +import com.cnlive.demo.streamqn.gles.GlUtil; | ||
| 8 | 8 | ||
| 9 | import java.nio.FloatBuffer; | 9 | import java.nio.FloatBuffer; |
| 10 | 10 |
app/src/main/java/com/cnlive/demo/stream/filter/CameraFilterToneCurve.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/CameraFilterToneCurve.java
| 1 | -package com.cnlive.demo.stream.filter; | 1 | +package com.cnlive.demo.streamqn.filter; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | import android.graphics.Point; | 4 | import android.graphics.Point; |
| 5 | import android.graphics.PointF; | 5 | import android.graphics.PointF; |
| 6 | import android.opengl.GLES20; | 6 | import android.opengl.GLES20; |
| 7 | 7 | ||
| 8 | -import com.cnlive.demo.stream.R; | ||
| 9 | -import com.cnlive.demo.stream.gles.GlUtil; | 8 | +import com.cnlive.demo.streamqn.R; |
| 9 | +import com.cnlive.demo.streamqn.gles.GlUtil; | ||
| 10 | 10 | ||
| 11 | import java.io.IOException; | 11 | import java.io.IOException; |
| 12 | import java.io.InputStream; | 12 | import java.io.InputStream; |
app/src/main/java/com/cnlive/demo/stream/filter/IFilter.java renamed to app/src/main/java/com/cnlive/demo/streamqn/filter/IFilter.java
app/src/main/java/com/cnlive/demo/stream/gles/Drawable2d.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/Drawable2d.java
app/src/main/java/com/cnlive/demo/stream/gles/FBO.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/FBO.java
| 1 | -package com.cnlive.demo.stream.gles; | 1 | +package com.cnlive.demo.streamqn.gles; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | import android.opengl.GLES20; | 4 | import android.opengl.GLES20; |
| 5 | import android.util.Log; | 5 | import android.util.Log; |
| 6 | 6 | ||
| 7 | -import com.cnlive.demo.stream.Config; | ||
| 8 | -import com.cnlive.demo.stream.R; | ||
| 9 | -import com.cnlive.demo.stream.filter.CameraFilterBeauty; | 7 | +import com.cnlive.demo.streamqn.Config; |
| 8 | +import com.cnlive.demo.streamqn.R; | ||
| 9 | +import com.cnlive.demo.streamqn.filter.CameraFilterBeauty; | ||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | /** | 12 | /** |
app/src/main/java/com/cnlive/demo/stream/gles/FullFrameRect.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/FullFrameRect.java
| 1 | -package com.cnlive.demo.stream.gles; | 1 | +package com.cnlive.demo.streamqn.gles; |
| 2 | 2 | ||
| 3 | /** | 3 | /** |
| 4 | * Created by jerikc on 16/2/23. | 4 | * Created by jerikc on 16/2/23. |
| 5 | */ | 5 | */ |
| 6 | import android.opengl.Matrix; | 6 | import android.opengl.Matrix; |
| 7 | 7 | ||
| 8 | -import com.cnlive.demo.stream.filter.IFilter; | 8 | +import com.cnlive.demo.streamqn.filter.IFilter; |
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | * This class essentially represents a viewport-sized sprite that will be rendered with | 11 | * This class essentially represents a viewport-sized sprite that will be rendered with |
app/src/main/java/com/cnlive/demo/stream/gles/GlUtil.java renamed to app/src/main/java/com/cnlive/demo/streamqn/gles/GlUtil.java
app/src/main/java/com/cnlive/demo/stream/ui/CameraPreviewFrameView.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/CameraPreviewFrameView.java
app/src/main/java/com/cnlive/demo/stream/ui/FocusIndicatorRotateLayout.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/FocusIndicatorRotateLayout.java
| 1 | -package com.cnlive.demo.stream.ui; | 1 | +package com.cnlive.demo.streamqn.ui; |
| 2 | 2 | ||
| 3 | import android.annotation.TargetApi; | 3 | import android.annotation.TargetApi; |
| 4 | import android.content.Context; | 4 | import android.content.Context; |
| @@ -6,7 +6,7 @@ import android.os.Build; | @@ -6,7 +6,7 @@ import android.os.Build; | ||
| 6 | import android.util.AttributeSet; | 6 | import android.util.AttributeSet; |
| 7 | import android.util.Log; | 7 | import android.util.Log; |
| 8 | 8 | ||
| 9 | -import com.cnlive.demo.stream.R; | 9 | +import com.cnlive.demo.streamqn.R; |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | // A view that indicates the focus area or the metering area. | 12 | // A view that indicates the focus area or the metering area. |
app/src/main/java/com/cnlive/demo/stream/ui/Rotatable.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/Rotatable.java
app/src/main/java/com/cnlive/demo/stream/ui/RotateLayout.java renamed to app/src/main/java/com/cnlive/demo/streamqn/ui/RotateLayout.java
app/src/main/res/layout/activity_stream.xml
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | android:layout_alignParentTop="true" | 14 | android:layout_alignParentTop="true" |
| 15 | android:layout_centerHorizontal="true"> | 15 | android:layout_centerHorizontal="true"> |
| 16 | 16 | ||
| 17 | - <com.cnlive.demo.stream.ui.CameraPreviewFrameView | 17 | + <com.cnlive.demo.streamqn.ui.CameraPreviewFrameView |
| 18 | android:id="@+id/cameraPreview_surfaceView" | 18 | android:id="@+id/cameraPreview_surfaceView" |
| 19 | android:layout_width="match_parent" | 19 | android:layout_width="match_parent" |
| 20 | android:layout_height="match_parent" | 20 | android:layout_height="match_parent" |
app/src/main/res/layout/focus_indicator.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<com.cnlive.demo.stream.ui.FocusIndicatorRotateLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | +<com.cnlive.demo.streamqn.ui.FocusIndicatorRotateLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:id="@+id/focus_indicator_rotate_layout" | 3 | android:id="@+id/focus_indicator_rotate_layout" |
| 4 | android:layout_width="wrap_content" | 4 | android:layout_width="wrap_content" |
| 5 | android:layout_height="wrap_content" | 5 | android:layout_height="wrap_content" |
| @@ -9,4 +9,4 @@ | @@ -9,4 +9,4 @@ | ||
| 9 | android:id="@+id/focus_indicator" | 9 | android:id="@+id/focus_indicator" |
| 10 | android:layout_width="120dp" | 10 | android:layout_width="120dp" |
| 11 | android:layout_height="120dp" /> | 11 | android:layout_height="120dp" /> |
| 12 | -</com.cnlive.demo.stream.ui.FocusIndicatorRotateLayout> | ||
| 13 | \ No newline at end of file | 12 | \ No newline at end of file |
| 13 | +</com.cnlive.demo.streamqn.ui.FocusIndicatorRotateLayout> | ||
| 14 | \ No newline at end of file | 14 | \ No newline at end of file |
app/src/test/java/com/cnlive/demo/stream/ExampleUnitTest.java renamed to app/src/test/java/com/cnlive/demo/streamqn/ExampleUnitTest.java
doc/Android推流文档.pdf
0 → 100644
No preview for this file type