MpLive

c5d4f3efdc

Merge pull request #684 from Zohaad97/feature/pauseResume Leo Ma 2019-02-03 23:30:29 +0800
417c99c7f5 Implement Pause and Resume functionality Zohaad 2019-02-03 13:23:03 +0000
189aea48b0

Update README.md Leo Ma 2018-12-06 09:53:28 +0800
1059bd6eb0

Merge pull request #675 from lomoya90/rtmp Leo Ma 2018-11-26 14:12:35 +0800
d4b295d571 Error:A problem occurred receiving StreamBegin from server liyan01 2018-11-26 13:40:49 +0800
fea87c86f8 Fix white line on left side of the screen begeekmyfriend 2018-06-15 16:28:44 +0800
c1709810aa

Merge pull request #624 from jw20082009/master Leo Ma 2018-06-12 17:39:00 +0800
51b17f2e9e 修复概率性花屏/绿屏（前帧的BufferInfo被后帧所覆盖，导致帧的宽高参数出错，从而花屏/绿屏） jiangwang 2018-06-12 17:23:05 +0800
e4befce97e 修复软编码时概率性崩溃（前帧的BufferInfo参数被后帧所覆盖，byteBuffer无法执行limit(int newlimit)方法） jiangwang 2018-06-12 16:02:16 +0800
dac714ad49

Merge pull request #617 from Ccapton/patch-1 Leo Ma 2018-05-17 19:25:33 +0800
af78d56cc8

设置Camera.PreviewCallback 回调函数，修改旋转角度 Ccapton 2018-05-17 19:05:22 +0800
d3fc0a1dab Update Leo Ma 2018-01-17 14:24:29 +0800
e4ba70fa8e

Merge pull request #570 from Leonew/master Leo Ma 2018-01-05 17:44:06 +0800
3d2428a1f9 fix C2 may not send during rtmp handshake Leonew 2018-01-05 16:10:27 +0800
e2828e1594 Update Leo Ma 2017-10-28 12:33:22 +0800
7c36e6b31b Update Leo Ma 2017-10-28 12:04:41 +0800
ecb473300d Change API level into 21 Leo Ma 2017-10-28 11:36:11 +0800
39b31a24dd Android Studio 3.0.0 Leo Ma 2017-10-28 10:51:37 +0800
1e2daa5359 Add arm64-v8a Leo Ma 2017-10-28 10:21:24 +0800
805ba647fc Add arm64-v8a Leo Ma 2017-10-28 10:15:33 +0800
9136499ed1 Merge pull request #528 from zzugyl/master Leo Ma 2017-09-29 18:37:59 +0800
58324fdd19 Bugfix:Fix push stream failed over timestamp 0xffffff. Jeffer 2017-09-29 16:53:55 +0800
d8de3cd6cd Upgrade libx264 Leo Ma 2017-08-30 17:50:50 +0800
0984dd5907 Use volatile flag for communication begeekmyfriend 2017-08-29 16:47:11 +0800
9a3984d463 Move disconnection into handler thread begeekmyfriend 2017-08-29 16:30:24 +0800
fd27c36c4f Use volatile variable for communication begeekmyfriend 2017-08-29 16:26:29 +0800
d577b3dc45 Merge pull request #507 from zzugyl/master Leo Ma 2017-08-25 12:49:56 +0800
80bbecf363 Bugfix. Add sps pps reset to flv reset() Jeffer 2017-08-25 11:11:40 +0800
18e9f7a2eb Merge pull request #506 from zzugyl/master Leo Ma 2017-08-24 18:10:41 +0800
cdb653070a Merge branch 'master' into master Leo Ma 2017-08-24 18:10:29 +0800
4ebc531b43 Bugfix. Jeffer 2017-08-24 15:54:29 +0800
330942cb82 Bugfix. Jeffer 2017-08-24 15:52:57 +0800
b7a613fbb7 Improve code quality Leo Ma 2017-08-12 10:11:26 +0800
4844254b92 Merge pull request #496 from zzugyl/master Leo Ma 2017-08-11 18:24:53 +0800
dc0be00732 only search startcode 4 byte(00 00 00 01 standard h264 encoder) in searchAnnexb Jeffer 2017-08-11 18:20:18 +0800
6816a4ca86 Merge pull request #495 from zzugyl/master Leo Ma 2017-08-11 17:33:24 +0800
77c692ae39 Merge branch 'master' into master Leo Ma 2017-08-11 17:33:04 +0800
c617aff822 only search startcode 4 byte(00 00 00 01 standard h264 encoder) in searchAnnexb Jeffer 2017-08-11 17:10:40 +0800
84b10e1870 Annexb search optimization Leo Ma 2017-08-10 17:58:03 +0800
da8ca49ebb Ignore annexb exception processing Leo Ma 2017-08-10 14:08:38 +0800
88dd496f1a Disable multi-slice for iOS HW decoding Leo Ma 2017-07-19 17:00:59 +0800
ebb92c06ea Merge pull request #476 from 0xFF0000FF/master Leo Ma 2017-07-18 12:22:41 +0800
98afa75c65 add proguard for release build Moo 2017-07-18 12:05:03 +0800
f6dfbe3f62 Fix audio sampling in FLV muxer begeekmyfriend 2017-06-29 21:57:55 +0800
f759800d87 Added startTorch and stopTorch methods (#462) vkuzub 2017-06-28 16:20:49 +0300
a8c36e3b43 Parameter adjustment Leo Ma 2017-06-26 10:38:34 +0800
9f4e114308 Parameter adjustment Leo Ma 2017-06-26 10:37:34 +0800
1e5c7c1675 Fix NDK r15 undeclared identifier Leo Ma 2017-06-17 10:12:22 +0800
027335249b Add new files for mp4 parser Leo Ma 2017-05-16 15:31:18 +0800
4b67a0640f Rename Leo Ma 2017-05-12 10:50:04 +0800
283d52ef73 Modify x264 configure to activate pthread on NDK Leo Ma 2017-05-05 10:06:02 +0800
4e69fd9204 Update libx264.a Leo Ma 2017-05-04 18:33:09 +0800
dbd8c8545f Update libx264 cross building scripts Leo Ma 2017-05-04 16:35:31 +0800
b8fb3ec1c8 Add x264_config.h Leo Ma 2017-05-04 15:14:13 +0800
af436378bc Add libx264.a Leo Ma 2017-05-04 15:07:03 +0800
957a64f452 upgrade libx264 Leo Ma 2017-05-04 15:00:12 +0800
ab9e285eb7 Remove gradle configuration Leo Ma 2017-05-04 14:10:05 +0800
27261b2310 lisa-4 RTMP publishing (#424) Leo de Penning 2017-05-04 04:14:52 +0200
70d7964cc8 Add arm64-v8a build script for libx264 Leo Ma 2017-04-13 18:15:01 +0800
8e4fcdb90f Quit PCM loop on interrupt Leo Ma 2017-04-12 16:33:12 +0800
b1a0be2911 Improve audio mute feature Leo Ma 2017-04-12 15:20:09 +0800
a50b40b41f Improve audio record switch Leo Ma 2017-04-12 11:43:33 +0800
875a5cdc0d Add MagicFilterFactory Leo Ma 2017-04-10 20:03:09 +0800
86d0bd218d Remove MagicFilterFactory Leo Ma 2017-04-07 16:55:26 +0800
f9101d465d Simplify GLES vertex setting Leo Ma 2017-04-07 11:33:35 +0800
c2a93b6ba1 Simplify GLES vertex setting Leo Ma 2017-04-07 11:30:00 +0800
c03254ae24 Fix bug Leo Ma 2017-04-06 23:12:25 +0800
6e3ba0dda5 Update Leo Ma 2017-04-06 13:49:44 +0800
7f27ca32d0 Update Leo Ma 2017-04-06 11:36:15 +0800
5e039d6539 Fix preview rotation bug Leo Ma 2017-04-06 11:35:31 +0800
6d92307149 Bug fix Leo Ma 2017-04-04 19:36:58 +0800
48c4049774 Update Leo Ma 2017-04-03 10:36:57 +0800
81e1d9f291 Roll back gradle build version for compatibility Leo Ma 2017-04-01 16:27:15 +0800
c2ffb005d5 Update Leo Ma 2017-03-28 09:32:15 +0800
1c528bf09f Set preview resolution as 640x360 Leo Ma 2017-03-27 11:07:15 +0800
470b338588 Remove out-of-date comment Leo Ma 2017-03-18 12:25:42 +0800
23aab4bdd8 Add audio mute feature Leo Ma 2017-03-18 12:19:24 +0800
1dca4f2792 Use unified constant variable Leo Ma 2017-03-15 17:30:11 +0800
a0a7321e9c Fix FLV tag buffer overflow Leo Ma 2017-03-07 17:32:46 +0800
6d7e296205 Fix FLV tag buffer overflow Leo Ma 2017-03-07 16:11:18 +0800
bbbb29ef7d Fix FLV allocation buffer overflow Leo Ma 2017-03-07 11:11:14 +0800
4d84f0fab1 Updrade Android Studio 2.3 Leo Ma 2017-03-03 13:00:07 +0800
464bbcd9c8 Update gradle building Leo Ma 2017-03-02 14:50:37 +0800
ad45075ac1 Fix soft encoding mosaic Leo Ma 2017-03-02 14:39:48 +0800
e1d985ed77 Fix x264 preset parameter Leo Ma 2017-03-01 18:29:31 +0800
c7d8e589b2 App name and stream name must not be null Leo Ma 2017-03-01 10:54:17 +0800
6acb7726fc Camera flash mode detect Leo Ma 2017-03-01 10:50:33 +0800
a5e37b814d Camera audo focus feature Leo Ma 2017-03-01 10:31:01 +0800
8917fbc559 Fix 'NULL' into 'null' Leo Ma 2017-02-21 10:59:27 +0800
3eb1c0e0c9 Do not start encoding thread in camera preview mode Leo Ma 2017-02-18 14:05:01 +0800
239efc00a2 Forget to enable encoding thread on camera switch Leo Ma 2017-02-14 10:17:41 +0800
3765273cf0 Replace ByteBuffer.allocate with allocateDirect Leo Ma 2017-02-08 16:52:14 +0800
9f5673a0d8 Decouple camera and encoding Leo Ma 2017-02-07 16:18:53 +0800
a36039093a Settle API Leo Ma 2017-02-01 13:29:44 +0800
2cfb8336ab Forget to enable encoder on camera switch Leo Ma 2017-02-01 11:50:42 +0800
da863658e3 Open camera after connection and encoder enabled Leo Ma 2017-02-01 11:29:17 +0800
3e0874b080 Fix camera freezing on orientation change Leo Ma 2017-01-21 09:34:54 +0800
a50396c567 Clear frame cache before close consumer thread Leo Ma 2017-01-20 17:36:54 +0800
3b5892e869 Add camera flash permission Leo Ma 2017-01-20 16:42:29 +0800
2767ac5400 GC optimization Leo Ma 2017-01-20 16:24:23 +0800

Commit Graph Select branches Hide Pull Requests camera2 master nx_mplive Mono Color

Commit Graph

Select branches

Hide Pull Requests

camera2

master

nx_mplive