432 Commits (master)
 

Author SHA1 Message Date
Matthew 55ffc1c8dc 实现rtsp服务 3 months ago
liuguijing 98d5e96650 增加页面定时关闭 7 months ago
liuguijing f8848c1135 关闭rtmpserver 7 months ago
Matthew 4d53cbd39d 装置端实现RTMP Server 7 months ago
Matthew ab6dbcf3e0 Merge branch 'master' of http://dev.xinyingpower.com:8081/git/xymp/MpLive 7 months ago
Matthew fa48cdad1d 增加日志 7 months ago
liuguijing 8e064912de Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive
# Conflicts:
#	app/src/main/java/com/xypower/mplive/MainActivity.java
7 months ago
Matthew 80c53d731f 更新RTMP server 7 months ago
liuguijing 9b6d2accca Camera2 修改旋转角度 7 months ago
liuguijing 4723d82cff Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive
# Conflicts:
#	app/src/main/java/com/xypower/mplive/MainActivity.java
7 months ago
liuguijing e525f7d2c9 Camera2 修改旋转角度 7 months ago
Matthew 699a3f84c2 增加RTMP Server支持 7 months ago
liuguijing 8b42f2ce75 Camera2 修改旋转角度 7 months ago
liuguijing 8e026beec7 Camera2 修改旋转角度 7 months ago
liuguijing d5fcee1731 Camera2 修改adb调用 8 months ago
liuguijing 33347213db Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive 8 months ago
liuguijing 101298534f Camera2 修改adb调用 8 months ago
Matthew 442956ff57 Update version to 1.0.2 8 months ago
liuguijing a76456bb64 Camera2 修改屏幕角度 8 months ago
Matthew 53d1f21764 更新版本格式 8 months ago
Matthew 13a9f9458f 合并camera2代码 8 months ago
Matthew 8cf7934629 修正bug 8 months ago
Matthew 13a31186e6 修改类型 8 months ago
Matthew b10d9cda67 和微拍对接改造 8 months ago
Leo Ma bad9753a48
Merge pull request #844 from thegobot/patch-10
pause implementation
4 years ago
Leo Ma ad4bd90762
Merge pull request #843 from thegobot/patch-9
adjusting timestamps when hot switching the camera
4 years ago
thegobot bfbdd0c0ef
pause implementation
Why wasn't it used?
4 years ago
thegobot 76bc16fba1
adjusting timestamps when hot switching the camera
When switching cameras, the encoders must be paused. Otherwise, there will be problems with the DTS on the client,  SRS  server with enabled time_jitter incorrectly corrects video DTS (with enabled ATC  there is no problem)
4 years ago
Leo Ma 7f0fe5a82d
Merge pull request #841 from thegobot/patch-8
SrsFlvFrameBytes constructor
4 years ago
Leo Ma e4fb3956e4
Merge pull request #838 from thegobot/patch-5
ignore IDE warning
4 years ago
Leo Ma 3a748c4d66
Merge pull request #839 from thegobot/patch-6
onError
4 years ago
Leo Ma 8285391310
Merge pull request #840 from thegobot/patch-7
change resolution on fly
4 years ago
thegobot b1cb9348cb
SrsFlvFrameBytes constructor 4 years ago
thegobot db7eba428c
change resolution on fly
It is also necessary to send the SPS\PPS along with the keyframe, in addition to the AVCSequenceHeader

Now all players do not freeze and change resolution anywhere in the stream!
Tested: PotPlayer, MPC (hard accel\soft), Chrome, Forefox, FFplay (also with h264_qsv decoder)

See
https://github.com/begeekmyfriend/yasea/issues/832
4 years ago
thegobot 3e39a34c88
onError 4 years ago
thegobot 3e549e1ca3
ignore IDE warning 4 years ago
Leo Ma 7f6312a034
Merge pull request #834 from thegobot/patch-3
May be a buffer overflow in enableEncoding()
4 years ago
thegobot b6b205d231
May be a buffer overflow in enableEncoding()
mPreviewWidth changed but onSurfaceCreated() fired after start of the encoder thread (mIsEncoding = true)
4 years ago
Leo Ma f118e6e1c3
Merge pull request #827 from thegobot/patch-2
AcousticEchoCanceler
4 years ago
thegobot e909604fe1
Update SrsPublisher.java 4 years ago
begeekmyfriend fba1588ad6 Update
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
4 years ago
begeekmyfriend ae2c11406a Fix URL server ID number parsing
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
4 years ago
begeekmyfriend f5f7e3224e Expand GOP size for lower bitrate
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
5 years ago
begeekmyfriend 27ce865923 Update
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
5 years ago
马力 777c944083 Reduce GOP cache size to reduce delay
Signed-off-by: 马力 <mali0921@HPCL202007007deMacBook-Pro.local>
5 years ago
begeekmyfriend 3841839235 Add GitAds
Signed-off-by: begeekmyfriend <begeekmyfriend@gmail.com>
5 years ago
Leo Ma fb858ee854
Merge pull request #757 from obarong/master
support minSdkVersion=18 targetSdkVersion=26
5 years ago
obarong d6919266e0 Add write storage permission 5 years ago
obarong c803f50827 Update libyuv to commit 2020-02-19 45f1f2b. Add libenc.so libyuv.so. 5 years ago
obarong a648920edf Add runtime request permission for sdk26.
Add keystore.jks.
5 years ago