256 Commits (master)

Author SHA1 Message Date
Matthew 55ffc1c8dc 实现rtsp服务 3 months ago
liuguijing 98d5e96650 增加页面定时关闭 7 months ago
liuguijing f8848c1135 关闭rtmpserver 7 months ago
Matthew 4d53cbd39d 装置端实现RTMP Server 7 months ago
liuguijing 8e064912de Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive
# Conflicts:
#	app/src/main/java/com/xypower/mplive/MainActivity.java
7 months ago
Matthew 80c53d731f 更新RTMP server 7 months ago
liuguijing 9b6d2accca Camera2 修改旋转角度 7 months ago
liuguijing 4723d82cff Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive
# Conflicts:
#	app/src/main/java/com/xypower/mplive/MainActivity.java
7 months ago
liuguijing e525f7d2c9 Camera2 修改旋转角度 7 months ago
Matthew 699a3f84c2 增加RTMP Server支持 7 months ago
liuguijing 8b42f2ce75 Camera2 修改旋转角度 7 months ago
liuguijing 8e026beec7 Camera2 修改旋转角度 7 months ago
liuguijing d5fcee1731 Camera2 修改adb调用 8 months ago
liuguijing 33347213db Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive 8 months ago
liuguijing 101298534f Camera2 修改adb调用 8 months ago
Matthew 442956ff57 Update version to 1.0.2 8 months ago
Matthew 53d1f21764 更新版本格式 8 months ago
Matthew 13a9f9458f 合并camera2代码 8 months ago
Matthew 8cf7934629 修正bug 8 months ago
Matthew 13a31186e6 修改类型 8 months ago
Matthew b10d9cda67 和微拍对接改造 8 months ago
obarong d6919266e0 Add write storage permission 5 years ago
obarong a648920edf Add runtime request permission for sdk26.
Add keystore.jks.
5 years ago
obarong 9fbb0d4d0d Update libx264.a and support minSdkVersion 18 5 years ago
Leo Ma 4b188ba462
Update MainActivity.java 6 years ago
deathemperor 549f4bd30c fix android build 6 years ago
thegobot 9105912ba8
Update MainActivity.java 6 years ago
thegobot 9ca202c61a
Update MainActivity.java 6 years ago
Anders Jakobsen b17c5df0cb Corrected spelling mistakes 6 years ago
Zohaad Afzal 5995f66933 updated UI with pause button 6 years ago
Zohaad 417c99c7f5 Implement Pause and Resume functionality 6 years ago
Leo Ma ecb473300d Change API level into 21
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 39b31a24dd Android Studio 3.0.0
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 805ba647fc Add arm64-v8a
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma a8c36e3b43 Parameter adjustment
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 1e5c7c1675 Fix NDK r15 undeclared identifier
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 4b67a0640f Rename
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo de Penning 27261b2310 lisa-4 RTMP publishing (#424)
* lisa-4 RTMP publishing

- Merged changes from JvT (Greg Long) to Illuminoo fork of yasea
- Optimized memory allocation for crop/scaled conversion to I420 in lib_enc.cc
- Integrated optimized yasea library in LISA

* lisa-4 RTMP publishing
8 years ago
Leo Ma 6e3ba0dda5 Update
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 5e039d6539 Fix preview rotation bug
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 81e1d9f291 Roll back gradle build version for compatibility
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma c2ffb005d5 Update
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 1c528bf09f Set preview resolution as 640x360
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 23aab4bdd8 Add audio mute feature
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 464bbcd9c8 Update gradle building
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 6acb7726fc Camera flash mode detect
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma a5e37b814d Camera audo focus feature
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma da863658e3 Open camera after connection and encoder enabled
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
8 years ago
Leo Ma 3e0874b080 Fix camera freezing on orientation change
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
9 years ago
Leo Ma 3b5892e869 Add camera flash permission
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
9 years ago