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

209 Commits (a36039093adb4f30beba920bcf7b7d3dba48c30a)

Author SHA1 Message Date
Leo Ma da863658e3 Open camera after connection and encoder enabled 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 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
Leo Ma 43ca4b0e8e Upgrade gradle building environment to 2.2.3 
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
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 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
shishuo 3ea631d61c Update AndroidManifest.xml (#268) 
Fix build error:
Execution failed for task ':app:processDebugManifest'.
> Manifest merger failed with multiple errors, see logs
 9 years ago
Leo Ma bd6f929b1a Add feature in manifest 
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 6c44514793 Substitute message handler for exception 
Reduce try-catch blocks for the whole project.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma c22ce5d9db Fix app module packet bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 2a6588a3bc Fix bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 766be308ea Seperate RTMP packet 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma adccd4cfb0 Seperate library module from app module 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 715cef59de Fix camera focus mode setting 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 4036d5db2a Add ADTS header for AAC ES 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 68cb5a37d1 Egl context version compatibility 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 3b7d80db76 Fix camera face swith bug 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma 0c24613585 Seperate handler from thread to UI 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma a1050c902b Improve camera open method 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma c6150ad655 Adjust surface aspect ratio 
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
Leo Ma f369302ae4 Multiply orthografic projection matrix 
According to the camera preview size aspect ratio.

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
 9 years ago
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