fix random timestamp offset in examples (#628)

This commit is contained in:
Alessandro Ros
2024-10-07 17:01:27 +02:00
committed by GitHub
parent 2ca0bffa20
commit 53b2d2c6bf
2 changed files with 32 additions and 2 deletions

View File

@@ -1,6 +1,7 @@
package main package main
import ( import (
"crypto/rand"
"fmt" "fmt"
"log" "log"
"os" "os"
@@ -27,6 +28,15 @@ func findTrack(r *mpegts.Reader) (*mpegts.Track, error) {
return nil, fmt.Errorf("H264 track not found") return nil, fmt.Errorf("H264 track not found")
} }
func randUint32() (uint32, error) {
var b [4]byte
_, err := rand.Read(b[:])
if err != nil {
return 0, err
}
return uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]), nil
}
func main() { func main() {
// open a file in MPEG-TS format // open a file in MPEG-TS format
f, err := os.Open("myvideo.ts") f, err := os.Open("myvideo.ts")
@@ -73,6 +83,11 @@ func main() {
panic(err) panic(err)
} }
randomStart, err := randUint32()
if err != nil {
panic(err)
}
timeDecoder := mpegts.NewTimeDecoder2() timeDecoder := mpegts.NewTimeDecoder2()
var firstDTS *int64 var firstDTS *int64
var startTime time.Time var startTime time.Time
@@ -105,7 +120,7 @@ func main() {
// we don't have to perform any conversion // we don't have to perform any conversion
// since H264 clock rate is the same in both MPEG-TS and RTSP // since H264 clock rate is the same in both MPEG-TS and RTSP
for _, packet := range packets { for _, packet := range packets {
packet.Timestamp = uint32(pts) packet.Timestamp = randomStart + uint32(pts)
} }
// write packets to the server // write packets to the server

View File

@@ -2,6 +2,7 @@ package main
import ( import (
"bytes" "bytes"
"crypto/rand"
"image" "image"
"image/color" "image/color"
"image/jpeg" "image/jpeg"
@@ -25,6 +26,15 @@ func multiplyAndDivide(v, m, d int64) int64 {
return (secs*m + dec*m/d) return (secs*m + dec*m/d)
} }
func randUint32() (uint32, error) {
var b [4]byte
_, err := rand.Read(b[:])
if err != nil {
return 0, err
}
return uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]), nil
}
func createRandomImage(i int) *image.RGBA { func createRandomImage(i int) *image.RGBA {
img := image.NewRGBA(image.Rect(0, 0, 640, 480)) img := image.NewRGBA(image.Rect(0, 0, 640, 480))
@@ -73,6 +83,11 @@ func main() {
start := time.Now() start := time.Now()
randomStart, err := randUint32()
if err != nil {
panic(err)
}
// setup a ticker to sleep between frames // setup a ticker to sleep between frames
ticker := time.NewTicker(200 * time.Millisecond) ticker := time.NewTicker(200 * time.Millisecond)
defer ticker.Stop() defer ticker.Stop()
@@ -102,7 +117,7 @@ func main() {
// write packets to the server // write packets to the server
for _, pkt := range pkts { for _, pkt := range pkts {
pkt.Timestamp = pts pkt.Timestamp = randomStart + pts
err = c.WritePacketRTP(desc.Medias[0], pkt) err = c.WritePacketRTP(desc.Medias[0], pkt)
if err != nil { if err != nil {