xymp
/
MpLive
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
432 Commits
3 Branches
0 Tags
26 MiB
nx_mplive
master
camera2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'master'
${ noResults }
Commit Graph

163 Commits (master)

Author SHA1 Message Date
Zohaad 417c99c7f5 Implement Pause and Resume functionality 6 years ago
liyan01 d4b295d571 Error:A problem occurred receiving StreamBegin from server 7 years ago
begeekmyfriend fea87c86f8 Fix white line on left side of the screen 
The buffer address is forced to be aligned by allocateDirect method in
ByteBuffer so the valid data may not be stored from the first byte of the
buffer witch is still returned by the array method in ByteBuffer. So we need
to substitute allocate method for allocate direct method when fetching the
image from the camera.

Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
 7 years ago
jiangwang 51b17f2e9e 修复概率性花屏/绿屏（前帧的BufferInfo被后帧所覆盖，导致帧的宽高参数出错，从而花屏/绿屏） 7 years ago
jiangwang e4befce97e 修复软编码时概率性崩溃（前帧的BufferInfo参数被后帧所覆盖，byteBuffer无法执行limit(int newlimit)方法） 7 years ago
Ccapton af78d56cc8
设置Camera.PreviewCallback 回调函数，修改旋转角度 
1.获取Camera.PreviewCallback 回调函数内的byte数组原始图像数据
2.手机旋转时，预览结果也相应正确地旋转
 7 years ago
Leonew 3d2428a1f9 fix C2 may not send during rtmp handshake 8 years ago
Leo Ma 7c36e6b31b Update 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 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 1e2daa5359 Add arm64-v8a 
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
Jeffer 58324fdd19 Bugfix:Fix push stream failed over timestamp 0xffffff. 8 years ago
Leo Ma d8de3cd6cd Upgrade libx264 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
begeekmyfriend 0984dd5907 Use volatile flag for communication 
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
 8 years ago
begeekmyfriend 9a3984d463 Move disconnection into handler thread 
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
 8 years ago
begeekmyfriend fd27c36c4f Use volatile variable for communication 
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
 8 years ago
Jeffer 80bbecf363 Bugfix. Add sps pps reset to flv reset() 8 years ago
Leo Ma cdb653070a Merge branch 'master' into master 8 years ago
Jeffer 4ebc531b43 Bugfix. 8 years ago
Jeffer 330942cb82 Bugfix. 8 years ago
Leo Ma b7a613fbb7 Improve code quality 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Jeffer dc0be00732 only search startcode 4 byte(00 00 00 01 standard h264 encoder) in searchAnnexb 8 years ago
Leo Ma 77c692ae39 Merge branch 'master' into master 8 years ago
Jeffer c617aff822 only search startcode 4 byte(00 00 00 01 standard h264 encoder) in searchAnnexb 8 years ago
Leo Ma 84b10e1870 Annexb search optimization 
Assume there always be single slice for each video frame when sps and
pps are found. That would promote efficiency on some low-end devices.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma da8ca49ebb Ignore annexb exception processing 
Some devices produce unstandard H.264 slice without startcode. So we
ignore the annexb exception processing since it does not matter for
streaming.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 88dd496f1a Disable multi-slice for iOS HW decoding 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
begeekmyfriend f6dfbe3f62 Fix audio sampling in FLV muxer Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com> # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date with 'origin/master'. # # Changes to be committed: # modified: library/src/main/java/net/ossrs/yasea/SrsFlvMuxer.java # 8 years ago
vkuzub f759800d87 Added startTorch and stopTorch methods (#462) 8 years ago
Leo Ma 9f4e114308 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 027335249b Add new files for mp4 parser 
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 Ma 283d52ef73 Modify x264 configure to activate pthread on NDK 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 4e69fd9204 Update libx264.a 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma dbd8c8545f Update libx264 cross building scripts 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma b8fb3ec1c8 Add x264_config.h 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma af436378bc Add libx264.a 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 957a64f452 upgrade libx264 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma ab9e285eb7 Remove gradle configuration 
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 70d7964cc8 Add arm64-v8a build script for libx264 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 8e4fcdb90f Quit PCM loop on interrupt 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma b1a0be2911 Improve audio mute feature 
Add an latency in PCM loop. It is trivial but it works.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma a50b40b41f Improve audio record switch 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 875a5cdc0d Add MagicFilterFactory 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 86d0bd218d Remove MagicFilterFactory 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma f9101d465d Simplify GLES vertex setting 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma c2a93b6ba1 Simplify GLES vertex setting 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma c03254ae24 Fix bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 7f27ca32d0 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 6d92307149 Bug fix 
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 470b338588 Remove out-of-date comment 
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 1dca4f2792 Use unified constant variable 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma a0a7321e9c Fix FLV tag buffer overflow 
The length of tag should be calculated completly.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 6d7e296205 Fix FLV tag buffer overflow 
Add header size in encoded stream

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma bbbb29ef7d Fix FLV allocation buffer overflow 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 4d84f0fab1 Updrade Android Studio 2.3 
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 ad45075ac1 Fix soft encoding mosaic 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma e1d985ed77 Fix x264 preset parameter 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma c7d8e589b2 App name and stream name must not be null 
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 8917fbc559 Fix 'NULL' into 'null' 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 3eb1c0e0c9 Do not start encoding thread in camera preview mode 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 239efc00a2 Forget to enable encoding thread on camera switch 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 3765273cf0 Replace ByteBuffer.allocate with allocateDirect 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 9f5673a0d8 Decouple camera and encoding 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma a36039093a Settle API 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 8 years ago
Leo Ma 2cfb8336ab Forget to enable encoder on camera switch 
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 a50396c567 Clear frame cache before close consumer thread 
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
Leo Ma 2767ac5400 GC optimization 
Reduce the count of garbage collection in data flow and improve the
reusability of the data buffer.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma e24eeb9bbb Add condition before pushing to the encoder 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 4c57223703 Separate publishing control from camera preview 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma d49144ae53 Comment out unnecessary code 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Nikhil Kilivayil 4cc35613a3 Spelling mistakes corrected (#295) 9 years ago
Leo Ma 42fd31eb5c Fix camera switch bug 
The encoder should be available when camera is opened.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma f6f071a6b6 Audio record improvement 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma ad73ed4397 Fix record bug 
It should not start recording when AV format not assigned.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 6cff148e3f Change NDK platform into API 19 
Fix libc compatibility for elder platform.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
z2045217 e38864abb1 Improve beauty filter shader (#267) 9 years ago
Leo Ma a361ef4fd4 Replace magic number 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 6080e3d72c Simplify gpuimage shader loading approach 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 0f9e5f0589 Set surface view fixed size adapting to preview 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 652cff57e4 Adjust SDK level for video display upside down 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 3700fc7fbe Remove dead code 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 79748eba58 Add x86 jniLibs 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 9e12df1b70 Add abiFilters property in gradle building 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma d55ad9602b Fix video upside down 
For some Android SDK versions (maybe Android M+) the camera preview rotation
will show upside down constract to the older ones. So we need to adjust
the preview rotation on dynamic orientation change as well as camera
face switch.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 74bfa1049d Delete 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago