From 87468848a404d0da095c303933c93d4f7889cb62 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 9 Apr 2020 18:14:35 +0200 Subject: [PATCH] Fix import paths --- README.md | 23 +++++++++++------------ av/avconv/avconv.go | 8 ++++---- av/avutil/avutil.go | 2 +- av/pktque/buf.go | 2 +- av/pktque/filters.go | 2 +- av/pubsub/queue.go | 4 ++-- av/transcode/transcode.go | 6 +++--- codec/aacparser/parser.go | 4 ++-- codec/codec.go | 4 ++-- codec/fake/fake.go | 2 +- codec/h264parser/parser.go | 8 ++++---- examples/http_flv_and_rtmp_server/main.go | 12 ++++++------ examples/open_probe_file/main.go | 6 +++--- examples/rtmp_publish/main.go | 8 ++++---- examples/rtmp_server_channels/main.go | 12 ++++++------ examples/rtmp_server_proxy/main.go | 6 +++--- format/aac/aac.go | 6 +++--- format/flv/flv.go | 16 ++++++++-------- format/flv/flvio/amf0.go | 2 +- format/flv/flvio/flvio.go | 4 ++-- format/format.go | 14 +++++++------- format/mp4/demuxer.go | 8 ++++---- format/mp4/handler.go | 4 ++-- format/mp4/mp4io/atoms.go | 2 +- format/mp4/mp4io/gen/gen.go | 2 +- format/mp4/mp4io/mp4io.go | 2 +- format/mp4/muxer.go | 10 +++++----- format/mp4/stream.go | 4 ++-- format/rtmp/rtmp.go | 10 +++++----- format/rtsp/client.go | 16 ++++++++-------- format/rtsp/sdp/parser.go | 2 +- format/rtsp/stream.go | 4 ++-- format/ts/demuxer.go | 10 +++++----- format/ts/handler.go | 4 ++-- format/ts/muxer.go | 8 ++++---- format/ts/stream.go | 4 ++-- format/ts/tsio/tsio.go | 2 +- 37 files changed, 121 insertions(+), 122 deletions(-) diff --git a/README.md b/README.md index f59e363..cc99581 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,9 @@ JOY4 is powerful library written in golang, well-designed interface makes a few Well-designed and easy-to-use interfaces: -- Muxer / Demuxer ([doc](https://godoc.org/github.com/nareix/joy4/av#Demuxer) [example](https://github.com/nareix/joy4/blob/master/examples/open_probe_file/main.go)) -- Audio Decoder ([doc](https://godoc.org/github.com/nareix/joy4/av#AudioDecoder) [example](https://github.com/nareix/joy4/blob/master/examples/audio_decode/main.go)) -- Transcoding ([doc](https://godoc.org/github.com/nareix/joy4/av/transcode) [example](https://github.com/nareix/joy4/blob/master/examples/transcode/main.go)) -- Streaming server ([example](https://github.com/nareix/joy4/blob/master/examples/http_flv_and_rtmp_server/main.go)) +- Muxer / Demuxer ([doc](https://godoc.org/github.com/datarhei/joy4/av#Demuxer) [example](https://github.com/datarhei/joy4/blob/master/examples/open_probe_file/main.go)) +- Transcoding ([doc](https://godoc.org/github.com/datarhei/joy4/av/transcode) [example](https://github.com/datarhei/joy4/blob/master/examples/transcode/main.go)) +- Streaming server ([example](https://github.com/datarhei/joy4/blob/master/examples/http_flv_and_rtmp_server/main.go)) Support container formats: @@ -34,26 +33,26 @@ RTMP / HTTP-FLV Server - High performance -Publisher-subscriber packet buffer queue ([doc](https://godoc.org/github.com/nareix/joy4/av/pubsub)) +Publisher-subscriber packet buffer queue ([doc](https://godoc.org/github.com/datarhei/joy4/av/pubsub)) - Customize publisher buffer time and subscriber read position -- Multiple channels live streaming ([example](https://github.com/nareix/joy4/blob/master/examples/rtmp_server_channels/main.go)) +- Multiple channels live streaming ([example](https://github.com/datarhei/joy4/blob/master/examples/rtmp_server_channels/main.go)) -Packet filters ([doc](https://godoc.org/github.com/nareix/joy4/av/pktque)) +Packet filters ([doc](https://godoc.org/github.com/datarhei/joy4/av/pktque)) - Wait first keyframe - Fix timestamp - Make A/V sync -- Customize ([example](https://github.com/nareix/joy4/blob/master/examples/rtmp_server_channels/main.go#L19)) +- Customize ([example](https://github.com/datarhei/joy4/blob/master/examples/rtmp_server_channels/main.go#L19)) Support codec and container parsers: -- H264 SPS/PPS/AVCDecoderConfigure parser ([doc](https://godoc.org/github.com/nareix/joy4/codec/h264parser)) -- AAC ADTSHeader/MPEG4AudioConfig parser ([doc](https://godoc.org/github.com/nareix/joy4/codec/aacparser)) -- MP4 Atoms parser ([doc](https://godoc.org/github.com/nareix/joy4/format/mp4/mp4io)) -- FLV AMF0 object parser ([doc](https://godoc.org/github.com/nareix/joy4/format/flv/flvio)) +- H264 SPS/PPS/AVCDecoderConfigure parser ([doc](https://godoc.org/github.com/datarhei/joy4/codec/h264parser)) +- AAC ADTSHeader/MPEG4AudioConfig parser ([doc](https://godoc.org/github.com/datarhei/joy4/codec/aacparser)) +- MP4 Atoms parser ([doc](https://godoc.org/github.com/datarhei/joy4/format/mp4/mp4io)) +- FLV AMF0 object parser ([doc](https://godoc.org/github.com/datarhei/joy4/format/flv/flvio)) # Requirements diff --git a/av/avconv/avconv.go b/av/avconv/avconv.go index fa8a5a7..c5d3b9f 100644 --- a/av/avconv/avconv.go +++ b/av/avconv/avconv.go @@ -4,10 +4,10 @@ import ( "fmt" "io" "time" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/pktque" - "github.com/nareix/joy4/av/transcode" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/pktque" + "github.com/datarhei/joy4/av/transcode" ) var Debug bool diff --git a/av/avutil/avutil.go b/av/avutil/avutil.go index 1e980cd..c905a3c 100644 --- a/av/avutil/avutil.go +++ b/av/avutil/avutil.go @@ -5,7 +5,7 @@ import ( "strings" "fmt" "bytes" - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/av" "net/url" "os" "path" diff --git a/av/pktque/buf.go b/av/pktque/buf.go index 6624f55..3c6759c 100644 --- a/av/pktque/buf.go +++ b/av/pktque/buf.go @@ -1,7 +1,7 @@ package pktque import ( - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/av" ) type Buf struct { diff --git a/av/pktque/filters.go b/av/pktque/filters.go index 83b943d..da36e78 100644 --- a/av/pktque/filters.go +++ b/av/pktque/filters.go @@ -4,7 +4,7 @@ package pktque import ( "time" - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/av" ) type Filter interface { diff --git a/av/pubsub/queue.go b/av/pubsub/queue.go index 10b3f73..d371aa5 100644 --- a/av/pubsub/queue.go +++ b/av/pubsub/queue.go @@ -2,8 +2,8 @@ package pubsub import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/pktque" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/pktque" "io" "sync" "time" diff --git a/av/transcode/transcode.go b/av/transcode/transcode.go index 6f512d9..a974e72 100644 --- a/av/transcode/transcode.go +++ b/av/transcode/transcode.go @@ -5,8 +5,8 @@ package transcode import ( "fmt" "time" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/pktque" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/pktque" ) var Debug bool @@ -108,7 +108,7 @@ func (self *tStream) audioDecodeAndEncode(inpkt av.Packet) (outpkts []av.Packet, } // Do the transcode. -// +// // In audio transcoding one Packet may transcode into many Packets // packet time will be adjusted automatically. func (self *Transcoder) Do(pkt av.Packet) (out []av.Packet, err error) { diff --git a/codec/aacparser/parser.go b/codec/aacparser/parser.go index 6432574..879a1aa 100644 --- a/codec/aacparser/parser.go +++ b/codec/aacparser/parser.go @@ -1,8 +1,8 @@ package aacparser import ( - "github.com/nareix/joy4/utils/bits" - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/utils/bits" + "github.com/datarhei/joy4/av" "time" "fmt" "bytes" diff --git a/codec/codec.go b/codec/codec.go index d37df77..5139c29 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -1,8 +1,8 @@ package codec import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/fake" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/codec/fake" "time" ) diff --git a/codec/fake/fake.go b/codec/fake/fake.go index 51e056f..cb248ee 100644 --- a/codec/fake/fake.go +++ b/codec/fake/fake.go @@ -1,7 +1,7 @@ package fake import ( - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/av" ) type CodecData struct { diff --git a/codec/h264parser/parser.go b/codec/h264parser/parser.go index 35c8d83..c301f79 100644 --- a/codec/h264parser/parser.go +++ b/codec/h264parser/parser.go @@ -2,9 +2,9 @@ package h264parser import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/utils/bits" - "github.com/nareix/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/utils/bits" + "github.com/datarhei/joy4/utils/bits/pio" "fmt" "bytes" ) @@ -131,7 +131,7 @@ Annex B is commonly used in live and streaming formats such as transport streams 2. AVCC The other common method of storing an H.264 stream is the AVCC format. In this format, each NALU is preceded with its length (in big endian format). This method is easier to parse, but you lose the byte alignment features of Annex B. Just to complicate things, the length may be encoded using 1, 2 or 4 bytes. This value is stored in a header object. This header is often called ‘extradata’ or ‘sequence header’. Its basic format is as follows: -bits +bits 8 version ( always 0x01 ) 8 avc profile ( sps[0][1] ) 8 avc compatibility ( sps[0][2] ) diff --git a/examples/http_flv_and_rtmp_server/main.go b/examples/http_flv_and_rtmp_server/main.go index 2891697..ac358d4 100644 --- a/examples/http_flv_and_rtmp_server/main.go +++ b/examples/http_flv_and_rtmp_server/main.go @@ -4,11 +4,11 @@ import ( "sync" "io" "net/http" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/av/pubsub" - "github.com/nareix/joy4/format/rtmp" - "github.com/nareix/joy4/format/flv" + "github.com/datarhei/joy4/format" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/av/pubsub" + "github.com/datarhei/joy4/format/rtmp" + "github.com/datarhei/joy4/format/flv" ) func init() { @@ -78,7 +78,7 @@ func main() { if ch != nil { w.Header().Set("Content-Type", "video/x-flv") - w.Header().Set("Transfer-Encoding", "chunked") + w.Header().Set("Transfer-Encoding", "chunked") w.Header().Set("Access-Control-Allow-Origin", "*") w.WriteHeader(200) flusher := w.(http.Flusher) diff --git a/examples/open_probe_file/main.go b/examples/open_probe_file/main.go index 4960fdd..9912017 100644 --- a/examples/open_probe_file/main.go +++ b/examples/open_probe_file/main.go @@ -2,9 +2,9 @@ package main import ( "fmt" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/format" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/format" ) func init() { diff --git a/examples/rtmp_publish/main.go b/examples/rtmp_publish/main.go index 4c39af8..7d695e6 100644 --- a/examples/rtmp_publish/main.go +++ b/examples/rtmp_publish/main.go @@ -1,10 +1,10 @@ package main import ( - "github.com/nareix/joy4/av/pktque" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/format/rtmp" + "github.com/datarhei/joy4/av/pktque" + "github.com/datarhei/joy4/format" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/format/rtmp" ) func init() { diff --git a/examples/rtmp_server_channels/main.go b/examples/rtmp_server_channels/main.go index 36170c0..977a6d8 100644 --- a/examples/rtmp_server_channels/main.go +++ b/examples/rtmp_server_channels/main.go @@ -2,12 +2,12 @@ package main import ( "fmt" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/av/pktque" - "github.com/nareix/joy4/av/pubsub" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/format/rtmp" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/av/pktque" + "github.com/datarhei/joy4/av/pubsub" + "github.com/datarhei/joy4/format" + "github.com/datarhei/joy4/format/rtmp" "sync" "time" ) diff --git a/examples/rtmp_server_proxy/main.go b/examples/rtmp_server_proxy/main.go index 43fd20d..2911d91 100644 --- a/examples/rtmp_server_proxy/main.go +++ b/examples/rtmp_server_proxy/main.go @@ -3,9 +3,9 @@ package main import ( "fmt" "strings" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/format/rtmp" + "github.com/datarhei/joy4/format" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/format/rtmp" ) func init() { diff --git a/format/aac/aac.go b/format/aac/aac.go index 5a65a87..7032e8c 100644 --- a/format/aac/aac.go +++ b/format/aac/aac.go @@ -2,9 +2,9 @@ package aac import ( - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/aacparser" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/codec/aacparser" "time" "fmt" "io" diff --git a/format/flv/flv.go b/format/flv/flv.go index 6f07da6..85586c2 100644 --- a/format/flv/flv.go +++ b/format/flv/flv.go @@ -3,14 +3,14 @@ package flv import ( "bufio" "fmt" - "github.com/nareix/joy4/utils/bits/pio" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/codec" - "github.com/nareix/joy4/codec/aacparser" - "github.com/nareix/joy4/codec/fake" - "github.com/nareix/joy4/codec/h264parser" - "github.com/nareix/joy4/format/flv/flvio" + "github.com/datarhei/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/codec" + "github.com/datarhei/joy4/codec/aacparser" + "github.com/datarhei/joy4/codec/fake" + "github.com/datarhei/joy4/codec/h264parser" + "github.com/datarhei/joy4/format/flv/flvio" "io" ) diff --git a/format/flv/flvio/amf0.go b/format/flv/flvio/amf0.go index 05b4a03..a2b6b49 100644 --- a/format/flv/flvio/amf0.go +++ b/format/flv/flvio/amf0.go @@ -5,7 +5,7 @@ import ( "math" "fmt" "time" - "github.com/nareix/joy4/utils/bits/pio" + "github.com/datarhei/joy4/utils/bits/pio" ) type AMF0ParseError struct { diff --git a/format/flv/flvio/flvio.go b/format/flv/flvio/flvio.go index aca0770..78f54d9 100644 --- a/format/flv/flvio/flvio.go +++ b/format/flv/flvio/flvio.go @@ -2,8 +2,8 @@ package flvio import ( "fmt" - "github.com/nareix/joy4/utils/bits/pio" - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" "io" "time" ) diff --git a/format/format.go b/format/format.go index 1c07ac8..2d6bdd4 100644 --- a/format/format.go +++ b/format/format.go @@ -1,13 +1,13 @@ package format import ( - "github.com/nareix/joy4/format/mp4" - "github.com/nareix/joy4/format/ts" - "github.com/nareix/joy4/format/rtmp" - "github.com/nareix/joy4/format/rtsp" - "github.com/nareix/joy4/format/flv" - "github.com/nareix/joy4/format/aac" - "github.com/nareix/joy4/av/avutil" + "github.com/datarhei/joy4/format/mp4" + "github.com/datarhei/joy4/format/ts" + "github.com/datarhei/joy4/format/rtmp" + "github.com/datarhei/joy4/format/rtsp" + "github.com/datarhei/joy4/format/flv" + "github.com/datarhei/joy4/format/aac" + "github.com/datarhei/joy4/av/avutil" ) func RegisterAll() { diff --git a/format/mp4/demuxer.go b/format/mp4/demuxer.go index b102c73..477ffa7 100644 --- a/format/mp4/demuxer.go +++ b/format/mp4/demuxer.go @@ -6,10 +6,10 @@ import ( "io" "time" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/aacparser" - "github.com/nareix/joy4/codec/h264parser" - "github.com/nareix/joy4/format/mp4/mp4io" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/codec/aacparser" + "github.com/datarhei/joy4/codec/h264parser" + "github.com/datarhei/joy4/format/mp4/mp4io" ) type Demuxer struct { diff --git a/format/mp4/handler.go b/format/mp4/handler.go index aeef1cc..e0df298 100644 --- a/format/mp4/handler.go +++ b/format/mp4/handler.go @@ -2,8 +2,8 @@ package mp4 import ( "io" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" ) var CodecTypes = []av.CodecType{av.H264, av.AAC} diff --git a/format/mp4/mp4io/atoms.go b/format/mp4/mp4io/atoms.go index c90485c..93e660c 100644 --- a/format/mp4/mp4io/atoms.go +++ b/format/mp4/mp4io/atoms.go @@ -1,6 +1,6 @@ package mp4io -import "github.com/nareix/joy4/utils/bits/pio" +import "github.com/datarhei/joy4/utils/bits/pio" import "time" const MOOF = Tag(0x6d6f6f66) diff --git a/format/mp4/mp4io/gen/gen.go b/format/mp4/mp4io/gen/gen.go index 1a2857f..a747c4b 100644 --- a/format/mp4/mp4io/gen/gen.go +++ b/format/mp4/mp4io/gen/gen.go @@ -967,7 +967,7 @@ func genatoms(filename, outfilename string) { &ast.GenDecl{ Tok: token.IMPORT, Specs: []ast.Spec{ - &ast.ImportSpec{Path: &ast.BasicLit{Kind: token.STRING, Value: `"github.com/nareix/joy4/utils/bits/pio"`}}, + &ast.ImportSpec{Path: &ast.BasicLit{Kind: token.STRING, Value: `"github.com/datarhei/joy4/utils/bits/pio"`}}, }, }, &ast.GenDecl{ diff --git a/format/mp4/mp4io/mp4io.go b/format/mp4/mp4io/mp4io.go index 0227a84..5b268ca 100644 --- a/format/mp4/mp4io/mp4io.go +++ b/format/mp4/mp4io/mp4io.go @@ -2,7 +2,7 @@ package mp4io import ( - "github.com/nareix/joy4/utils/bits/pio" + "github.com/datarhei/joy4/utils/bits/pio" "os" "io" "fmt" diff --git a/format/mp4/muxer.go b/format/mp4/muxer.go index d1ef7e0..3e9e454 100644 --- a/format/mp4/muxer.go +++ b/format/mp4/muxer.go @@ -3,11 +3,11 @@ package mp4 import ( "fmt" "time" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/aacparser" - "github.com/nareix/joy4/codec/h264parser" - "github.com/nareix/joy4/format/mp4/mp4io" - "github.com/nareix/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/codec/aacparser" + "github.com/datarhei/joy4/codec/h264parser" + "github.com/datarhei/joy4/format/mp4/mp4io" + "github.com/datarhei/joy4/utils/bits/pio" "io" "bufio" ) diff --git a/format/mp4/stream.go b/format/mp4/stream.go index b837cd9..d341542 100644 --- a/format/mp4/stream.go +++ b/format/mp4/stream.go @@ -1,8 +1,8 @@ package mp4 import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/format/mp4/mp4io" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/format/mp4/mp4io" "time" ) diff --git a/format/rtmp/rtmp.go b/format/rtmp/rtmp.go index 9a7ecac..71537be 100644 --- a/format/rtmp/rtmp.go +++ b/format/rtmp/rtmp.go @@ -8,11 +8,11 @@ import ( "crypto/sha256" "encoding/hex" "fmt" - "github.com/nareix/joy4/utils/bits/pio" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/format/flv" - "github.com/nareix/joy4/format/flv/flvio" + "github.com/datarhei/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/format/flv" + "github.com/datarhei/joy4/format/flv/flvio" "io" "net" "net/url" diff --git a/format/rtsp/client.go b/format/rtsp/client.go index 28f8592..3e098f4 100644 --- a/format/rtsp/client.go +++ b/format/rtsp/client.go @@ -8,13 +8,13 @@ import ( "encoding/binary" "encoding/hex" "fmt" - "github.com/nareix/joy4/utils/bits/pio" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/codec" - "github.com/nareix/joy4/codec/aacparser" - "github.com/nareix/joy4/codec/h264parser" - "github.com/nareix/joy4/format/rtsp/sdp" + "github.com/datarhei/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" + "github.com/datarhei/joy4/codec" + "github.com/datarhei/joy4/codec/aacparser" + "github.com/datarhei/joy4/codec/h264parser" + "github.com/datarhei/joy4/format/rtsp/sdp" "io" "net" "net/textproto" @@ -1161,7 +1161,7 @@ func (self *Client) handleBlock(block []byte) (pkt av.Packet, ok bool, err error TODO: sync AV by rtcp NTP timestamp TODO: handle timestamp overflow https://tools.ietf.org/html/rfc3550 - A receiver can then synchronize presentation of the audio and video packets by relating + A receiver can then synchronize presentation of the audio and video packets by relating their RTP timestamps using the timestamp pairs in RTCP SR packets. */ if stream.firsttimestamp == 0 { diff --git a/format/rtsp/sdp/parser.go b/format/rtsp/sdp/parser.go index a092ddf..829935b 100644 --- a/format/rtsp/sdp/parser.go +++ b/format/rtsp/sdp/parser.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "encoding/hex" "fmt" - "github.com/nareix/joy4/av" + "github.com/datarhei/joy4/av" "strconv" "strings" ) diff --git a/format/rtsp/stream.go b/format/rtsp/stream.go index f3497cd..590980f 100644 --- a/format/rtsp/stream.go +++ b/format/rtsp/stream.go @@ -1,8 +1,8 @@ package rtsp import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/format/rtsp/sdp" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/format/rtsp/sdp" "time" ) diff --git a/format/ts/demuxer.go b/format/ts/demuxer.go index df9c0cf..5cdd66e 100644 --- a/format/ts/demuxer.go +++ b/format/ts/demuxer.go @@ -4,11 +4,11 @@ import ( "bufio" "fmt" "time" - "github.com/nareix/joy4/utils/bits/pio" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/format/ts/tsio" - "github.com/nareix/joy4/codec/aacparser" - "github.com/nareix/joy4/codec/h264parser" + "github.com/datarhei/joy4/utils/bits/pio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/format/ts/tsio" + "github.com/datarhei/joy4/codec/aacparser" + "github.com/datarhei/joy4/codec/h264parser" "io" ) diff --git a/format/ts/handler.go b/format/ts/handler.go index 068ddf9..0e8666a 100644 --- a/format/ts/handler.go +++ b/format/ts/handler.go @@ -2,8 +2,8 @@ package ts import ( "io" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/av/avutil" ) func Handler(h *avutil.RegisterHandler) { diff --git a/format/ts/muxer.go b/format/ts/muxer.go index 030a1c1..8e7b123 100644 --- a/format/ts/muxer.go +++ b/format/ts/muxer.go @@ -2,10 +2,10 @@ package ts import ( "fmt" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/aacparser" - "github.com/nareix/joy4/codec/h264parser" - "github.com/nareix/joy4/format/ts/tsio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/codec/aacparser" + "github.com/datarhei/joy4/codec/h264parser" + "github.com/datarhei/joy4/format/ts/tsio" "io" "time" ) diff --git a/format/ts/stream.go b/format/ts/stream.go index 36b8831..175cc39 100644 --- a/format/ts/stream.go +++ b/format/ts/stream.go @@ -2,8 +2,8 @@ package ts import ( "time" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/format/ts/tsio" + "github.com/datarhei/joy4/av" + "github.com/datarhei/joy4/format/ts/tsio" ) type Stream struct { diff --git a/format/ts/tsio/tsio.go b/format/ts/tsio/tsio.go index ee4563e..c09f84f 100644 --- a/format/ts/tsio/tsio.go +++ b/format/ts/tsio/tsio.go @@ -5,7 +5,7 @@ import ( "io" "time" "fmt" - "github.com/nareix/joy4/utils/bits/pio" + "github.com/datarhei/joy4/utils/bits/pio" ) const (