Commit Graph

  • a39804142c Update version to 1.0.6 nx_mplive liuguijing 2025-06-11 16:25:08 +0800
  • 0212be3396 界面调整 liuguijing 2025-06-11 16:09:47 +0800
  • f7da5c3f6f 代码完善 liuguijing 2025-06-04 19:37:12 +0800
  • 7c2b5e0911 rtsp适配控制 liuguijing 2025-05-22 19:07:23 +0800
  • 55cab57cdc 开启rtsp端口 liuguijing 2025-04-17 21:03:39 +0800
  • cc709a87c7 开启rtsp端口 liuguijing 2025-04-17 20:30:36 +0800
  • 4a71482346 修复视频流摄像头翻转的bug liuguijing 2025-04-16 10:04:59 +0800
  • 27809fd87b 用服务启动尝试(不行) liuguijing 2025-04-10 18:57:49 +0800
  • 81f2c074d2 Update version to 1.0.4 liuguijing 2025-04-10 10:24:59 +0800
  • e025d3bf8a mplive建立分支 liuguijing 2025-04-10 10:22:47 +0800
  • 55ffc1c8dc 实现rtsp服务 master Matthew 2025-03-19 14:24:41 +0800
  • 98d5e96650 增加页面定时关闭 liuguijing 2024-11-08 16:04:17 +0800
  • f8848c1135 关闭rtmpserver liuguijing 2024-11-08 11:28:22 +0800
  • 4d53cbd39d 装置端实现RTMP Server Matthew 2024-11-07 22:30:51 +0800
  • ab6dbcf3e0 Merge branch 'master' of http://dev.xinyingpower.com:8081/git/xymp/MpLive Matthew 2024-11-07 21:50:25 +0800
  • 280d470409 Camera2 删除rtmp服务 liuguijing 2024-11-06 19:19:01 +0800
  • fa48cdad1d 增加日志 Matthew 2024-11-06 18:38:07 +0800
  • 8e064912de Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive liuguijing 2024-11-06 18:04:12 +0800
  • 80c53d731f 更新RTMP server Matthew 2024-11-06 17:59:30 +0800
  • 9b6d2accca Camera2 修改旋转角度 liuguijing 2024-11-06 17:42:48 +0800
  • 4723d82cff Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive liuguijing 2024-11-06 17:39:58 +0800
  • e525f7d2c9 Camera2 修改旋转角度 liuguijing 2024-11-06 17:36:57 +0800
  • 699a3f84c2 增加RTMP Server支持 Matthew 2024-11-06 15:49:57 +0800
  • 8b42f2ce75 Camera2 修改旋转角度 liuguijing 2024-11-06 14:25:09 +0800
  • 8e026beec7 Camera2 修改旋转角度 liuguijing 2024-11-06 14:01:55 +0800
  • d5fcee1731 Camera2 修改adb调用 liuguijing 2024-10-28 17:05:58 +0800
  • 33347213db Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive liuguijing 2024-10-28 17:04:02 +0800
  • 101298534f Camera2 修改adb调用 liuguijing 2024-10-28 17:03:36 +0800
  • 442956ff57 Update version to 1.0.2 Matthew 2024-10-28 13:24:10 +0800
  • a76456bb64 Camera2 修改屏幕角度 liuguijing 2024-10-25 18:00:14 +0800
  • bff3e7ad0f Camera2 修改屏幕角度 camera2 liuguijing 2024-10-25 17:30:19 +0800
  • 11f8cfdbdd Camera2 修改屏幕角度 liuguijing 2024-10-25 17:30:04 +0800
  • 53d1f21764 更新版本格式 Matthew 2024-10-23 11:17:44 +0800
  • 13a9f9458f 合并camera2代码 Matthew 2024-10-23 11:10:23 +0800
  • eaeab28829 Camera2改写 liuguijing 2024-10-21 11:43:24 +0800
  • b1190cd970 Camera2改写 liuguijing 2024-10-18 16:55:55 +0800
  • 8cf7934629 修正bug Matthew 2024-10-13 23:49:43 +0800
  • 13a31186e6 修改类型 Matthew 2024-10-13 22:53:56 +0800
  • b10d9cda67 和微拍对接改造 Matthew 2024-10-13 22:45:02 +0800
  • bad9753a48
    Merge pull request #844 from thegobot/patch-10 Leo Ma 2021-12-06 21:05:54 +0800
  • ad4bd90762
    Merge pull request #843 from thegobot/patch-9 Leo Ma 2021-12-06 21:05:35 +0800
  • bfbdd0c0ef
    pause implementation thegobot 2021-12-06 12:19:09 +0800
  • 76bc16fba1
    adjusting timestamps when hot switching the camera thegobot 2021-12-06 12:16:34 +0800
  • 7f0fe5a82d
    Merge pull request #841 from thegobot/patch-8 Leo Ma 2021-11-29 10:57:48 +0800
  • e4fb3956e4
    Merge pull request #838 from thegobot/patch-5 Leo Ma 2021-11-29 10:56:56 +0800
  • 3a748c4d66
    Merge pull request #839 from thegobot/patch-6 Leo Ma 2021-11-29 10:41:24 +0800
  • 8285391310
    Merge pull request #840 from thegobot/patch-7 Leo Ma 2021-11-29 10:36:50 +0800
  • b1cb9348cb
    SrsFlvFrameBytes constructor thegobot 2021-11-28 13:58:03 +0800
  • db7eba428c
    change resolution on fly thegobot 2021-11-28 13:54:30 +0800
  • 3e39a34c88
    onError thegobot 2021-11-28 08:59:21 +0800
  • 3e549e1ca3
    ignore IDE warning thegobot 2021-11-28 08:47:33 +0800
  • 7f6312a034
    Merge pull request #834 from thegobot/patch-3 Leo Ma 2021-11-11 12:55:05 +0800
  • b6b205d231
    May be a buffer overflow in enableEncoding() thegobot 2021-11-11 11:27:03 +0800
  • f118e6e1c3
    Merge pull request #827 from thegobot/patch-2 Leo Ma 2021-09-12 09:26:23 +0800
  • e909604fe1
    Update SrsPublisher.java thegobot 2021-09-12 09:24:09 +0800
  • fba1588ad6 Update begeekmyfriend 2021-03-22 13:17:17 +0800
  • ae2c11406a Fix URL server ID number parsing begeekmyfriend 2021-03-22 13:05:07 +0800
  • f5f7e3224e Expand GOP size for lower bitrate begeekmyfriend 2021-01-06 16:48:02 +0800
  • 27ce865923 Update begeekmyfriend 2020-12-25 22:01:51 +0800
  • 777c944083 Reduce GOP cache size to reduce delay 马力 2020-10-19 11:21:58 +0800
  • 3841839235 Add GitAds begeekmyfriend 2020-07-31 12:23:27 +0800
  • fb858ee854
    Merge pull request #757 from obarong/master Leo Ma 2020-04-17 16:02:47 +0800
  • d6919266e0 Add write storage permission obarong 2020-04-16 10:26:45 +0800
  • c803f50827 Update libyuv to commit 2020-02-19 45f1f2b. Add libenc.so libyuv.so. obarong 2020-04-16 10:07:33 +0800
  • a648920edf Add runtime request permission for sdk26. Add keystore.jks. obarong 2020-04-15 17:44:51 +0800
  • 9fbb0d4d0d Update libx264.a and support minSdkVersion 18 obarong 2020-04-15 16:47:34 +0800
  • 143301e235 添加libx264 mips编译脚本 obarong 2020-03-28 22:11:45 +0800
  • 37d13984a5 Update .gitignore Add gradle obarong 2020-03-05 15:10:32 +0800
  • 4b188ba462
    Update MainActivity.java Leo Ma 2019-07-22 17:45:54 +0800
  • 6b439bb1d4
    Merge pull request #724 from deathemperor/master Leo Ma 2019-07-22 17:43:35 +0800
  • 549f4bd30c fix android build deathemperor 2019-07-22 16:38:29 +0700
  • f5fcc76a52
    AudioSource configuration for AEC Leo Ma 2019-05-30 14:50:56 +0800
  • 0462d6dbcf
    Fix bug Leo Ma 2019-05-06 14:52:16 +0800
  • a18f87cd88
    Merge pull request #708 from Zohaad97/develop Leo Ma 2019-04-22 09:50:27 +0800
  • 8a1f71cda9 Added 'isAllFramesUploaded' and 'getVideoFrameCacheCount' methods. Zohaad Afzal 2019-04-21 21:12:52 +0100
  • d5386ed8b7
    Merge pull request #701 from thegobot/master Leo Ma 2019-04-02 09:39:33 +0800
  • 9105912ba8
    Update MainActivity.java thegobot 2019-04-02 06:49:45 +0800
  • b12737ecd1
    Update SrsCameraView.java thegobot 2019-04-02 06:45:31 +0800
  • 901dce2271
    Merge pull request #700 from thegobot/master Leo Ma 2019-03-31 10:49:58 +0800
  • dac06009b5
    Update SrsCameraView.java thegobot 2019-03-31 10:08:22 +0800
  • 8ceba91cf4
    setPreviewOrientation in different directions thegobot 2019-03-31 10:06:51 +0800
  • 5e946797f5
    Merge pull request #696 from thegobot/master Leo Ma 2019-03-23 11:31:25 +0800
  • 6d3e549f2c
    Update SrsCameraView.java thegobot 2019-03-23 10:19:13 +0800
  • 9ca202c61a
    Update MainActivity.java thegobot 2019-03-19 16:20:41 +0800
  • 707985f7d1
    Update SrsCameraView.java thegobot 2019-03-19 16:14:59 +0800
  • 6e00e91d67
    Update SrsPublisher.java thegobot 2019-03-19 15:07:50 +0800
  • 13d40cd9f3
    Merge pull request #695 from thegobot/master Leo Ma 2019-03-07 14:14:08 +0800
  • 0ed6343411
    Update SrsCameraView.java thegobot 2019-03-07 13:08:53 +0800
  • 7b32ebee62
    Merge pull request #694 from thegobot/master Leo Ma 2019-03-06 18:30:00 +0800
  • 826a8226e1
    Update SrsEncoder.java thegobot 2019-03-06 16:15:48 +0800
  • 3ce4b85f2a
    Update SrsCameraView.java thegobot 2019-03-06 16:05:26 +0800
  • e7307d019e
    Merge pull request #692 from thegobot/master Leo Ma 2019-03-03 15:05:10 +0800
  • 4490f57e6f
    setPreviewResolution surface holder size thegobot 2019-03-03 14:29:51 +0800
  • 71d2c75484
    Merge pull request #691 from thegobot/master Leo Ma 2019-03-03 14:04:03 +0800
  • a5415b2875
    BufferOverflowException fix thegobot 2019-03-03 12:08:05 +0800
  • cf65d9c16a
    Merge pull request #688 from anderslangballe/fps-improvement Leo Ma 2019-02-17 20:48:54 +0800
  • b17c5df0cb Corrected spelling mistakes Anders Jakobsen 2019-02-17 13:16:20 +0100
  • 4e234a1ae4 Set recording hint to true Anders Jakobsen 2019-02-17 13:10:25 +0100
  • 612ce41481
    Merge pull request #686 from Zohaad97/feature/pauseResume Leo Ma 2019-02-05 20:15:03 +0800
  • 5995f66933 updated UI with pause button Zohaad Afzal 2019-02-05 12:00:43 +0000