diff --git a/av/avconv/avconv.go b/av/avconv/avconv.go index fa8a5a76..ec1e8df5 100644 --- a/av/avconv/avconv.go +++ b/av/avconv/avconv.go @@ -4,17 +4,18 @@ 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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/av/pktque" + "github.com/youminxue/joy4/av/transcode" ) var Debug bool type Option struct { Transcode bool - Args []string + Args []string } type Options struct { @@ -23,7 +24,7 @@ type Options struct { type Demuxer struct { transdemux *transcode.Demuxer - streams []av.CodecData + streams []av.CodecData Options Demuxer av.Demuxer } @@ -56,10 +57,10 @@ func (self *Demuxer) prepare() (err error) { } /* - var streams []av.CodecData - if streams, err = self.Demuxer.Streams(); err != nil { - return - } + var streams []av.CodecData + if streams, err = self.Demuxer.Streams(); err != nil { + return + } */ supports := self.Options.OutputCodecTypes @@ -83,7 +84,7 @@ func (self *Demuxer) prepare() (err error) { ok = true var enctype av.CodecType - for _, typ:= range supports { + for _, typ := range supports { if typ.IsAudio() { if enc, _ = avutil.DefaultHandlers.NewAudioEncoder(typ); enc != nil { enctype = typ @@ -152,7 +153,7 @@ func ConvertCmdline(args []string) (err error) { flagt = false var f float64 fmt.Sscanf(arg, "%f", &f) - duration = time.Duration(f*float64(time.Second)) + duration = time.Duration(f * float64(time.Second)) default: output = arg @@ -223,7 +224,7 @@ func ConvertCmdline(args []string) (err error) { } filterdemux := &pktque.FilterDemuxer{ Demuxer: convdemux, - Filter: filters, + Filter: filters, } for { @@ -252,4 +253,3 @@ func ConvertCmdline(args []string) (err error) { return } - diff --git a/av/avutil/avutil.go b/av/avutil/avutil.go index 59ebd4a0..ce03fa4c 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/youminxue/joy4/av" "net/url" "os" "path" diff --git a/av/pktque/buf.go b/av/pktque/buf.go index 6624f559..3ea9180a 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/youminxue/joy4/av" ) type Buf struct { diff --git a/av/pktque/filters.go b/av/pktque/filters.go index 83b943d2..03fdc62e 100644 --- a/av/pktque/filters.go +++ b/av/pktque/filters.go @@ -1,10 +1,10 @@ - // Package pktque provides packet Filter interface and structures used by other components. package pktque import ( "time" - "github.com/nareix/joy4/av" + + "github.com/youminxue/joy4/av" ) type Filter interface { @@ -30,8 +30,8 @@ func (self Filters) ModifyPacket(pkt *av.Packet, streams []av.CodecData, videoid // Wrap origin Demuxer and Filter into a new Demuxer, when read this Demuxer filters will be called. type FilterDemuxer struct { av.Demuxer - Filter Filter - streams []av.CodecData + Filter Filter + streams []av.CodecData videoidx int audioidx int } @@ -81,9 +81,9 @@ func (self *WaitKeyFrame) ModifyPacket(pkt *av.Packet, streams []av.CodecData, v // Fix incorrect packet timestamps. type FixTime struct { - zerobase time.Duration - incrbase time.Duration - lasttime time.Duration + zerobase time.Duration + incrbase time.Duration + lasttime time.Duration StartFromZero bool // make timestamp start from zero MakeIncrement bool // force timestamp increment } @@ -114,14 +114,14 @@ func (self *FixTime) ModifyPacket(pkt *av.Packet, streams []av.CodecData, videoi // Drop incorrect packets to make A/V sync. type AVSync struct { MaxTimeDiff time.Duration - time []time.Duration + time []time.Duration } func (self *AVSync) ModifyPacket(pkt *av.Packet, streams []av.CodecData, videoidx int, audioidx int) (drop bool, err error) { if self.time == nil { self.time = make([]time.Duration, len(streams)) if self.MaxTimeDiff == 0 { - self.MaxTimeDiff = time.Millisecond*500 + self.MaxTimeDiff = time.Millisecond * 500 } } @@ -172,15 +172,19 @@ func (self *AVSync) check(i int) (start time.Duration, end time.Duration, correc // Make packets reading speed as same as walltime, effect like ffmpeg -re option. type Walltime struct { - firsttime time.Time + firsttime time.Time + firstSleep time.Duration } func (self *Walltime) ModifyPacket(pkt *av.Packet, streams []av.CodecData, videoidx int, audioidx int) (drop bool, err error) { if pkt.Idx == 0 { if self.firsttime.IsZero() { self.firsttime = time.Now() + self.firstSleep = pkt.Time + return } - pkttime := self.firsttime.Add(pkt.Time) + sub := (pkt.Time.Nanoseconds() - self.firstSleep.Nanoseconds()) / 1000 + pkttime := self.firsttime.Add(time.Duration(sub) * time.Microsecond) delta := pkttime.Sub(time.Now()) if delta > 0 { time.Sleep(delta) @@ -188,4 +192,3 @@ func (self *Walltime) ModifyPacket(pkt *av.Packet, streams []av.CodecData, video } return } - diff --git a/av/pubsub/queue.go b/av/pubsub/queue.go index 10b3f735..f503c0a0 100644 --- a/av/pubsub/queue.go +++ b/av/pubsub/queue.go @@ -2,11 +2,12 @@ package pubsub import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/pktque" "io" "sync" "time" + + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/pktque" ) // time diff --git a/av/transcode/transcode.go b/av/transcode/transcode.go index 6f512d97..75c98530 100644 --- a/av/transcode/transcode.go +++ b/av/transcode/transcode.go @@ -1,22 +1,22 @@ - // Package transcoder implements Transcoder based on Muxer/Demuxer and AudioEncoder/AudioDecoder interface. package transcode import ( "fmt" "time" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/pktque" + + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/pktque" ) var Debug bool type tStream struct { - codec av.CodecData - timeline *pktque.Timeline + codec av.CodecData + timeline *pktque.Timeline aencodec, adecodec av.AudioCodecData - aenc av.AudioEncoder - adec av.AudioDecoder + aenc av.AudioEncoder + adec av.AudioDecoder } type Options struct { @@ -27,7 +27,7 @@ type Options struct { } type Transcoder struct { - streams []*tStream + streams []*tStream } func NewTranscoder(streams []av.CodecData, options Options) (_self *Transcoder, err error) { @@ -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) { @@ -150,8 +150,8 @@ func (self *Transcoder) Close() (err error) { // Wrap transcoder and origin Muxer into new Muxer. // Write to new Muxer will do transcoding automatically. type Muxer struct { - av.Muxer // origin Muxer - Options // transcode options + av.Muxer // origin Muxer + Options // transcode options transcoder *Transcoder } @@ -195,7 +195,7 @@ type Demuxer struct { av.Demuxer Options transcoder *Transcoder - outpkts []av.Packet + outpkts []av.Packet } func (self *Demuxer) prepare() (err error) { diff --git a/cgo/ffmpeg/audio.go b/cgo/ffmpeg/audio.go index fbd676dc..af5d0e14 100644 --- a/cgo/ffmpeg/audio.go +++ b/cgo/ffmpeg/audio.go @@ -16,9 +16,9 @@ import ( "runtime" "fmt" "time" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/codec/aacparser" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/codec/aacparser" ) const debug = false diff --git a/cgo/ffmpeg/video.go b/cgo/ffmpeg/video.go index 085b229a..46ac6257 100644 --- a/cgo/ffmpeg/video.go +++ b/cgo/ffmpeg/video.go @@ -14,8 +14,8 @@ import ( "fmt" "image" "reflect" - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/h264parser" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/codec/h264parser" ) type VideoDecoder struct { diff --git a/codec/aacparser/parser.go b/codec/aacparser/parser.go index 75a6449f..60fea38c 100644 --- a/codec/aacparser/parser.go +++ b/codec/aacparser/parser.go @@ -2,7 +2,7 @@ package aacparser import ( "github.com/nareix/bits" - "github.com/nareix/joy4/av" + "github.com/youminxue/joy4/av" "time" "fmt" "bytes" diff --git a/codec/codec.go b/codec/codec.go index d37df77c..23b6598e 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -1,9 +1,10 @@ package codec import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/codec/fake" "time" + + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/codec/fake" ) type PCMUCodecData struct { @@ -50,7 +51,7 @@ func (self SpeexCodecData) PacketDuration(data []byte) (time.Duration, error) { // libavcodec/libspeexdec.c // samples = samplerate/50 // duration = 0.02s - return time.Millisecond*20, nil + return time.Millisecond * 20, nil } func NewSpeexCodecData(sr int, cl av.ChannelLayout) SpeexCodecData { @@ -61,4 +62,3 @@ func NewSpeexCodecData(sr int, cl av.ChannelLayout) SpeexCodecData { codec.ChannelLayout_ = cl return codec } - diff --git a/codec/fake/fake.go b/codec/fake/fake.go index 51e056f4..b10c9be9 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/youminxue/joy4/av" ) type CodecData struct { diff --git a/codec/h264parser/parser.go b/codec/h264parser/parser.go index af663226..06fb588a 100644 --- a/codec/h264parser/parser.go +++ b/codec/h264parser/parser.go @@ -2,7 +2,7 @@ package h264parser import ( - "github.com/nareix/joy4/av" + "github.com/youminxue/joy4/av" "github.com/nareix/bits" "github.com/nareix/bits/pio" "fmt" diff --git a/examples/audio_decode/main.go b/examples/audio_decode/main.go index 99594bed..6327fa1e 100644 --- a/examples/audio_decode/main.go +++ b/examples/audio_decode/main.go @@ -1,11 +1,10 @@ - package main import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/cgo/ffmpeg" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/cgo/ffmpeg" + "github.com/youminxue/joy4/format" ) // need ffmpeg installed @@ -37,4 +36,3 @@ func main() { file.Close() } - diff --git a/examples/http_flv_and_rtmp_server/main.go b/examples/http_flv_and_rtmp_server/main.go index 28916973..b5d040f8 100644 --- a/examples/http_flv_and_rtmp_server/main.go +++ b/examples/http_flv_and_rtmp_server/main.go @@ -1,14 +1,15 @@ package main 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" + "sync" + + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/av/pubsub" + "github.com/youminxue/joy4/format" + "github.com/youminxue/joy4/format/flv" + "github.com/youminxue/joy4/format/rtmp" ) func init() { @@ -78,7 +79,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 4960fdd9..11c95b99 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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/format" ) func init() { diff --git a/examples/rtmp_publish/main.go b/examples/rtmp_publish/main.go index 4c39af8b..ee180ee7 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/youminxue/joy4/av/pktque" + "github.com/youminxue/joy4/format" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/format/rtmp" ) func init() { diff --git a/examples/rtmp_server_channels/main.go b/examples/rtmp_server_channels/main.go index 36170c0d..73403be4 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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/av/pktque" + "github.com/youminxue/joy4/av/pubsub" + "github.com/youminxue/joy4/format" + "github.com/youminxue/joy4/format/rtmp" "sync" "time" ) diff --git a/examples/rtmp_server_proxy/main.go b/examples/rtmp_server_proxy/main.go index 43fd20d8..4fbee843 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/youminxue/joy4/format" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/format/rtmp" ) func init() { diff --git a/examples/rtmp_server_speex_to_aac/main.go b/examples/rtmp_server_speex_to_aac/main.go index 3f00b371..7dde4cbc 100644 --- a/examples/rtmp_server_speex_to_aac/main.go +++ b/examples/rtmp_server_speex_to_aac/main.go @@ -1,12 +1,12 @@ package main import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/transcode" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/format/rtmp" - "github.com/nareix/joy4/cgo/ffmpeg" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/transcode" + "github.com/youminxue/joy4/format" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/format/rtmp" + "github.com/youminxue/joy4/cgo/ffmpeg" ) // need ffmpeg with libspeex and libfdkaac installed diff --git a/examples/transcode/main.go b/examples/transcode/main.go index 29101193..f339e476 100644 --- a/examples/transcode/main.go +++ b/examples/transcode/main.go @@ -1,11 +1,11 @@ package main import ( - "github.com/nareix/joy4/av" - "github.com/nareix/joy4/av/transcode" - "github.com/nareix/joy4/format" - "github.com/nareix/joy4/av/avutil" - "github.com/nareix/joy4/cgo/ffmpeg" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/transcode" + "github.com/youminxue/joy4/format" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/cgo/ffmpeg" ) // need ffmpeg with libfdkaac installed diff --git a/format/aac/aac.go b/format/aac/aac.go index 0ddce3b7..3e2b3f6c 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/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/codec/aacparser" "time" "fmt" "io" diff --git a/format/flv/flv.go b/format/flv/flv.go index 694d980a..d62f2c6e 100644 --- a/format/flv/flv.go +++ b/format/flv/flv.go @@ -4,13 +4,13 @@ import ( "bufio" "fmt" "github.com/nareix/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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/codec" + "github.com/youminxue/joy4/codec/aacparser" + "github.com/youminxue/joy4/codec/fake" + "github.com/youminxue/joy4/codec/h264parser" + "github.com/youminxue/joy4/format/flv/flvio" "io" ) diff --git a/format/flv/flvio/flvio.go b/format/flv/flvio/flvio.go index eb063a5c..4c6d18cb 100644 --- a/format/flv/flvio/flvio.go +++ b/format/flv/flvio/flvio.go @@ -3,7 +3,7 @@ package flvio import ( "fmt" "github.com/nareix/bits/pio" - "github.com/nareix/joy4/av" + "github.com/youminxue/joy4/av" "io" "time" ) diff --git a/format/format.go b/format/format.go index 1c07ac8f..e7205671 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/youminxue/joy4/format/mp4" + "github.com/youminxue/joy4/format/ts" + "github.com/youminxue/joy4/format/rtmp" + "github.com/youminxue/joy4/format/rtsp" + "github.com/youminxue/joy4/format/flv" + "github.com/youminxue/joy4/format/aac" + "github.com/youminxue/joy4/av/avutil" ) func RegisterAll() { diff --git a/format/mp4/demuxer.go b/format/mp4/demuxer.go index dbd91376..a994f889 100644 --- a/format/mp4/demuxer.go +++ b/format/mp4/demuxer.go @@ -3,10 +3,10 @@ package mp4 import ( "time" "fmt" - "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/youminxue/joy4/av" + "github.com/youminxue/joy4/codec/aacparser" + "github.com/youminxue/joy4/codec/h264parser" + "github.com/youminxue/joy4/format/mp4/mp4io" "io" ) diff --git a/format/mp4/handler.go b/format/mp4/handler.go index aeef1cc3..39907735 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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" ) var CodecTypes = []av.CodecType{av.H264, av.AAC} diff --git a/format/mp4/muxer.go b/format/mp4/muxer.go index 342ecf6b..c5c0e639 100644 --- a/format/mp4/muxer.go +++ b/format/mp4/muxer.go @@ -3,10 +3,10 @@ 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/youminxue/joy4/av" + "github.com/youminxue/joy4/codec/aacparser" + "github.com/youminxue/joy4/codec/h264parser" + "github.com/youminxue/joy4/format/mp4/mp4io" "github.com/nareix/bits/pio" "io" "bufio" diff --git a/format/mp4/stream.go b/format/mp4/stream.go index b837cd99..b6fc8887 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/youminxue/joy4/av" + "github.com/youminxue/joy4/format/mp4/mp4io" "time" ) diff --git a/format/rtmp/rtmp.go b/format/rtmp/rtmp.go index 2ba98476..57c8f612 100644 --- a/format/rtmp/rtmp.go +++ b/format/rtmp/rtmp.go @@ -8,16 +8,17 @@ import ( "crypto/sha256" "encoding/hex" "fmt" - "github.com/nareix/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" "io" "net" "net/url" "strings" "time" + + "github.com/nareix/bits/pio" + "github.com/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/format/flv" + "github.com/youminxue/joy4/format/flv/flvio" ) var Debug bool @@ -697,7 +698,7 @@ func (self *Conn) connectPublish() (err error) { if Debug { fmt.Printf("rtmp: > publish('%s')\n", publishpath) } - if err = self.writeCommandMsg(8, self.avmsgsid, "publish", transid, nil, publishpath); err != nil { + if err = self.writeCommandMsg(8, self.avmsgsid, "publish", transid, nil, publishpath, "live"); err != nil { return } transid++ diff --git a/format/rtsp/client.go b/format/rtsp/client.go index c9fca834..26743214 100644 --- a/format/rtsp/client.go +++ b/format/rtsp/client.go @@ -9,12 +9,12 @@ import ( "encoding/hex" "fmt" "github.com/nareix/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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" + "github.com/youminxue/joy4/codec" + "github.com/youminxue/joy4/codec/aacparser" + "github.com/youminxue/joy4/codec/h264parser" + "github.com/youminxue/joy4/format/rtsp/sdp" "io" "net" "net/textproto" diff --git a/format/rtsp/sdp/parser.go b/format/rtsp/sdp/parser.go index a092ddfc..c431ba49 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/youminxue/joy4/av" "strconv" "strings" ) diff --git a/format/rtsp/stream.go b/format/rtsp/stream.go index f3497cdb..c11f8034 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/youminxue/joy4/av" + "github.com/youminxue/joy4/format/rtsp/sdp" "time" ) diff --git a/format/ts/demuxer.go b/format/ts/demuxer.go index 20cb0be1..194c7a08 100644 --- a/format/ts/demuxer.go +++ b/format/ts/demuxer.go @@ -5,10 +5,10 @@ import ( "fmt" "time" "github.com/nareix/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/youminxue/joy4/av" + "github.com/youminxue/joy4/format/ts/tsio" + "github.com/youminxue/joy4/codec/aacparser" + "github.com/youminxue/joy4/codec/h264parser" "io" ) diff --git a/format/ts/handler.go b/format/ts/handler.go index 068ddf97..14d77da8 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/youminxue/joy4/av" + "github.com/youminxue/joy4/av/avutil" ) func Handler(h *avutil.RegisterHandler) { diff --git a/format/ts/muxer.go b/format/ts/muxer.go index 030a1c13..b068d7d0 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/youminxue/joy4/av" + "github.com/youminxue/joy4/codec/aacparser" + "github.com/youminxue/joy4/codec/h264parser" + "github.com/youminxue/joy4/format/ts/tsio" "io" "time" ) diff --git a/format/ts/stream.go b/format/ts/stream.go index 36b8831f..561bad6b 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/youminxue/joy4/av" + "github.com/youminxue/joy4/format/ts/tsio" ) type Stream struct {