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
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
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
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
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
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
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
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
ad45075ac1
Fix soft encoding mosaic
...
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>
9 years ago
Leo Ma
2cfb8336ab
Forget to enable encoder on camera switch
...
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
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