fix: fmp4 play h265, rtmp send seqhead reset timestamp bug

langhuihui · Feb 11, 2024 · e07c375 · e07c375
1 parent e5bcdb2
commit e07c375
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -87,5 +87,10 @@ jobs:
         tar -zxvf bin/m7s_linux_amd64.tar.gz
         mv m7s monibuca_linux
         docker login -u langhuihui -p ${{ secrets.DOCKER_PASSWORD }}
-        docker build -t langhuihui/monibuca:${{ env.version }} .
+        docker build -t langhuihui/monibuca:latest .
+        docker push langhuihui/monibuca:latest
+    - name: docker push
+      if: success() && !contains(env.version, 'beta')
+      run:  |
+        docker tag langhuihui/monibuca:latest langhuihui/monibuca:${{ env.version }}
         docker push langhuihui/monibuca:${{ env.version }}
diff --git a/go.mod b/go.mod
@@ -4,9 +4,9 @@ go 1.20
 
 require (
 	go.uber.org/zap v1.26.0
-	m7s.live/engine/v4 v4.14.7-0.20240122075901-e82bc7e5d06f
+	m7s.live/engine/v4 v4.14.7-0.20240208144125-2891ee83926b
 	m7s.live/plugin/debug/v4 v4.0.3-0.20240124064804-dfa1a464eecc
-	m7s.live/plugin/fmp4/v4 v4.0.5
+	m7s.live/plugin/fmp4/v4 v4.0.6-0.20240207073644-4ea6db4e7f52
 	m7s.live/plugin/gb28181/v4 v4.4.4
 	m7s.live/plugin/hdl/v4 v4.1.10
 	m7s.live/plugin/hls/v4 v4.3.8
@@ -16,7 +16,7 @@ require (
 	m7s.live/plugin/monitor/v4 v4.0.5
 	m7s.live/plugin/preview/v4 v4.1.4
 	m7s.live/plugin/record/v4 v4.4.6
-	m7s.live/plugin/room/v4 v4.0.12
+	m7s.live/plugin/room/v4 v4.0.13-0.20240201093613-7e397d53b72b
 	m7s.live/plugin/rtmp/v4 v4.2.11-0.20240119065647-2fc87b15dc71
 	m7s.live/plugin/rtsp/v4 v4.3.4
 	m7s.live/plugin/snap/v4 v4.0.8

diff --git a/go.sum b/go.sum
@@ -436,12 +436,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 m7s.live/engine/v4 v4.14.7-0.20240122075901-e82bc7e5d06f h1:EHJfih7/yel77SBJvYluzxT7XIQQHNhyBuOK3J50Hk0=
 m7s.live/engine/v4 v4.14.7-0.20240122075901-e82bc7e5d06f/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g=
+m7s.live/engine/v4 v4.14.7-0.20240202021533-fea867a28747 h1:MHB+fE1D/2p44mZj+wkA/InhAxSr42+LCV5HlU+gKa0=
+m7s.live/engine/v4 v4.14.7-0.20240202021533-fea867a28747/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g=
+m7s.live/engine/v4 v4.14.7-0.20240208144125-2891ee83926b h1:GMKO97s2q9UyZcHX3rfhJCvqThVNqeQr3+tJn2DUbgE=
+m7s.live/engine/v4 v4.14.7-0.20240208144125-2891ee83926b/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g=
 m7s.live/plugin/debug/v4 v4.0.2 h1:JWiECbI4V7s/5RIjAJR/TscS0Wae2Lv+sg/D8HVJZpU=
 m7s.live/plugin/debug/v4 v4.0.2/go.mod h1:muzikl1KrHfbT/+2aHzKg9qDGfpArViQAtpcfFrST88=
 m7s.live/plugin/debug/v4 v4.0.3-0.20240124064804-dfa1a464eecc h1:Mo1qVoc0qPZnTiVIpDlC67TY02u8YuAQeMTX2S1yIBA=
 m7s.live/plugin/debug/v4 v4.0.3-0.20240124064804-dfa1a464eecc/go.mod h1:muzikl1KrHfbT/+2aHzKg9qDGfpArViQAtpcfFrST88=
 m7s.live/plugin/fmp4/v4 v4.0.5 h1:0madI/TKvrLkYVAKuPK1HBvbVf0RJg0g2WruET3S+9c=
 m7s.live/plugin/fmp4/v4 v4.0.5/go.mod h1:4ShxA9Ud2LeYZ/xQaPTWEVfjpK844ijoXxLqhCA607A=
+m7s.live/plugin/fmp4/v4 v4.0.6-0.20240207073644-4ea6db4e7f52 h1:okHAq1P/GGov+baT/YsUQYwbj69T8hgvxo1jlvuEfIE=
+m7s.live/plugin/fmp4/v4 v4.0.6-0.20240207073644-4ea6db4e7f52/go.mod h1:0P3IbefEJ6Cs9AeMME0FbEiOK7XNn1fJ5xHohtefIQA=
 m7s.live/plugin/gb28181/v4 v4.4.4 h1:2ZeHCYk1qyYoF9YwEJPFkqZzH/FmkadSxT2GC+tkKFk=
 m7s.live/plugin/gb28181/v4 v4.4.4/go.mod h1:mK5embLQwDULFJjA7jBls1Cwvow98lTWS6n/uZ7Ampk=
 m7s.live/plugin/hdl/v4 v4.1.10 h1:6/3aCaVvqpc4m/oyhW1jgQeYfPHINiKGAP+FGptVNqU=
@@ -464,6 +470,8 @@ m7s.live/plugin/record/v4 v4.4.6 h1:uXhJIudBQ8T3hsNkkOgEbtWsC8feiIT1o/+Ij1SWU0A=
 m7s.live/plugin/record/v4 v4.4.6/go.mod h1:4fSAA/AYCNsFA0Ii0UVuBqsbhoTXC1s3lC/en5qabjg=
 m7s.live/plugin/room/v4 v4.0.12 h1:jT2Ovpd/tV9F+F3gUhwxqDunrCPfa90/kSXnqqCbiZ4=
 m7s.live/plugin/room/v4 v4.0.12/go.mod h1:4GBdAHUYtdp+nkHcGIClI8xkIUo/VTrD9Y0YMlTE7HU=
+m7s.live/plugin/room/v4 v4.0.13-0.20240201093613-7e397d53b72b h1:33giws3MPXL8KSeUh9lpcuR0IwPtrmVJd7f+EqK2v44=
+m7s.live/plugin/room/v4 v4.0.13-0.20240201093613-7e397d53b72b/go.mod h1:4GBdAHUYtdp+nkHcGIClI8xkIUo/VTrD9Y0YMlTE7HU=
 m7s.live/plugin/rtmp/v4 v4.2.11-0.20240119065647-2fc87b15dc71 h1:uBnwgjIDT7qhcnS2f5L6psx/TGp6lLZbf7QZKME0iCM=
 m7s.live/plugin/rtmp/v4 v4.2.11-0.20240119065647-2fc87b15dc71/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E=
 m7s.live/plugin/rtsp/v4 v4.3.4 h1:dwRCdmXEFORzvVhPHfIV+5Pdlhx/OMjk5xmaKDpRDXw=