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

402 Commits (e4fb3956e449d586c5b8bfebeae694db3d84598d)
 

Author SHA1 Message Date
Leo Ma 7b7bd272f5 Update UI 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 7ecaf736ec Separate external and internal sampler shader 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 15f6d481a0 Add GL debug function 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma e66268d889 Update gradle building 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 4264e9357a Optimize blur shader drawing 
For external OES sampler, there is much overhead when drawing to the
window surface directly due to I/O sampling operation. So an optimized
approach is to draw the external OES sampler into FBO texture whose
resolution might be smaller than the window surface. And then we can
draw it as GLES internel sampler to the window surface with less
overhead.

There are two stages of drawing with a filter shader as external OES
sampler and another default shader as common 2D sampler.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 1706a896e7 Simplification 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 7e3b61bd30 Bind FBO texture for drawing 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 8b4898505c Adjust preview and output resolution 
Reduce preview resolution for skin blur shader drawing optimization.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 51571ce94a Substitute RBO for texture as FBO color attachment 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 81696ed5ad Simplify GPU image filter implementation 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 44d9e47484 Use EGL version 3 for EGL extension (KHR) 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 4a33be9c80 Simplify vertex data 
Only x and y components are needed for shader.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 89df395ffc Substitute VBO for vertex array 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 6476e13a72 Text formatting 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 537074d980 Update 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 16ecb8c74a Fix bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 35c1d0bd97 Update 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 28ec5f2a85 Remove camera preview callback in GLSurfaceView 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 0638231992 Simplification 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 87296629b5 Add some defense 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma a4e39d8963 Magic filter streaming 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma dea9e8631e Romove 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma cc90c1a594 Fix magic filter not be drawn into memory 
The magic filter should be drawn into FBO and then read into memory.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 330bf18f42 Update 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 3432938159 Rename 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma b06cd0cc89 Set preview texture in onSurfaceCreated callback 
Camera preview on activity creation

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 2da354eeef Fix bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 05304fd614 Add AV output bitrate statistics 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 0a736fafdf Add AV output bitrate statistics 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma c3b264ce28 Fix aac specific config reset on stop 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 5b0f39b6e1 Fix audio sequence header missing 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 06efebdddc Layout adjustment 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma ce80229c72 Recover beauty glsl 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 9114fa30dc Always reset in shutdown 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma e6bc026809 Fix shutdown bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 5211eb4169 Camera filter switch 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 5294709150 Forbid beauty in camera default filter 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 340078a9d4 Preview size setting on creation 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 40880dec4f Optimization 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 367cbb3989 Simplify RTMP connection process 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma d2be32a030 Fix shutdown bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 53132193c7 Optimize RTMP read thread off 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 7e8e23387a Not do networking and IO operation on main thread 
On Android 7.0 application is under strict mode by default which is a
development tool to forbid networking and IO operation on main thread.
Otherwise a NetworkOnMainThreadException will be thrown.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 072021325b Update Android Studio scripts 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma cb6d638042 Add libyuv mips ABI support 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma cf144ea392 Supplement 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma b7af586963 Portrait and landscape resolution setting 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 23953cb2c4 Use getApplicationContext for context reference 
UI context should not be referred by static object whose life cycle is
as long as the program in case of memory leak.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma f7b2f8da83 Remove getNumberOfCameras method 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 92129f8291 Fix bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago