External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2025-12-20 02:00:05 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rpi: route original absolute timestamp of packets (#1300) (#4382)
Some checks failed
code_lint / golangci_lint (push) Has been cancelled
Details
code_lint / mod_tidy (push) Has been cancelled
Details
code_lint / api_docs (push) Has been cancelled
Details
code_test / test_64 (push) Has been cancelled
Details
code_test / test_32 (push) Has been cancelled
Details
code_test / test_highlevel (push) Has been cancelled
Details

Browse source
This commit is contained in:
Alessandro Ros 2025-03-31 13:18:56 +02:00 • committed by GitHub
parent 8b98c02903
commit a05da3a205
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 46 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/staticsources/rpicamera/source.go
View file

@ -14,12 +14,6 @@ import (
"github.com/bluenviron/mediamtx/internal/unit"
)
func multiplyAndDivide(v, m, d int64) int64 {
secs := v / d
dec := v % d
return (secs*m + dec*m/d)
}
func paramsFromConf(logLevel conf.LogLevel, cnf *conf.Path) params {
return params{
LogLevel: func() string {
@ -95,7 +89,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
medias := []*description.Media{medi}
var stream *stream.Stream
onData := func(dts time.Duration, au [][]byte) {
onData := func(pts int64, ntp time.Time, au [][]byte) {
if stream == nil {
res := s.Parent.SetReady(defs.PathSourceStaticSetReadyReq{
Desc: &description.Session{Medias: medias},
@ -110,8 +104,8 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
stream.WriteUnit(medi, medi.Formats[0], &unit.H264{
Base: unit.Base{
NTP: time.Now(),
PTS: multiplyAndDivide(int64(dts), 90000, int64(time.Second)),
PTS: pts,
NTP: ntp,
},
AU: au,
})
@ -124,8 +118,8 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
}()
cam := &camera{
Params: paramsFromConf(s.LogLevel, params.Conf),
OnData: onData,
params: paramsFromConf(s.LogLevel, params.Conf),
onData: onData,
}
err := cam.initialize()
if err != nil {