Merged in av-restructure (pull request #175)

av: restructured directories

Approved-by: Alan Noble <anoble@gmail.com>
This commit is contained in:
Saxon Milton 2019-03-28 06:57:18 +00:00
commit 7c31f6fd6c
41 changed files with 27 additions and 24 deletions

View File

@ -36,9 +36,9 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/ausocean/av/container/mts"
"bitbucket.org/ausocean/av/container/mts/meta"
"bitbucket.org/ausocean/av/revid" "bitbucket.org/ausocean/av/revid"
"bitbucket.org/ausocean/av/stream/mts"
"bitbucket.org/ausocean/av/stream/mts/meta"
"bitbucket.org/ausocean/iot/pi/netsender" "bitbucket.org/ausocean/iot/pi/netsender"
"bitbucket.org/ausocean/iot/pi/sds" "bitbucket.org/ausocean/iot/pi/sds"
"bitbucket.org/ausocean/iot/pi/smartlogger" "bitbucket.org/ausocean/iot/pi/smartlogger"

View File

@ -32,9 +32,9 @@ import (
"io" "io"
"time" "time"
"bitbucket.org/ausocean/av/stream/mts/meta" "bitbucket.org/ausocean/av/container/mts/meta"
"bitbucket.org/ausocean/av/stream/mts/pes" "bitbucket.org/ausocean/av/container/mts/pes"
"bitbucket.org/ausocean/av/stream/mts/psi" "bitbucket.org/ausocean/av/container/mts/psi"
) )
// Some common manifestations of PSI // Some common manifestations of PSI

View File

@ -31,8 +31,8 @@ import (
"bytes" "bytes"
"testing" "testing"
"bitbucket.org/ausocean/av/stream/mts/meta" "bitbucket.org/ausocean/av/container/mts/meta"
"bitbucket.org/ausocean/av/stream/mts/psi" "bitbucket.org/ausocean/av/container/mts/psi"
) )
const ( const (

View File

@ -34,7 +34,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"bitbucket.org/ausocean/av/audio/adpcm" "bitbucket.org/ausocean/av/codec/adpcm"
) )
// This program accepts an input file encoded in adpcm and outputs a decoded pcm file. // This program accepts an input file encoded in adpcm and outputs a decoded pcm file.

View File

@ -34,7 +34,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"bitbucket.org/ausocean/av/audio/adpcm" "bitbucket.org/ausocean/av/codec/adpcm"
) )
// This program accepts an input pcm file and outputs an encoded adpcm file. // This program accepts an input pcm file and outputs an encoded adpcm file.

View File

@ -40,7 +40,7 @@ import (
"io" "io"
"os" "os"
"bitbucket.org/ausocean/av/stream/mts" "bitbucket.org/ausocean/av/container/mts"
"github.com/Comcast/gots/packet" "github.com/Comcast/gots/packet"
) )

1
go.mod
View File

@ -15,6 +15,7 @@ require (
github.com/pkg/errors v0.8.1 // indirect github.com/pkg/errors v0.8.1 // indirect
github.com/sergi/go-diff v1.0.0 // indirect github.com/sergi/go-diff v1.0.0 // indirect
github.com/stretchr/testify v1.3.0 // indirect github.com/stretchr/testify v1.3.0 // indirect
github.com/yobert/alsa v0.0.0-20180630182551-d38d89fa843e
go.uber.org/atomic v1.3.2 // indirect go.uber.org/atomic v1.3.2 // indirect
go.uber.org/multierr v1.1.0 // indirect go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.9.1 // indirect go.uber.org/zap v1.9.1 // indirect

2
go.sum
View File

@ -31,6 +31,8 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/yobert/alsa v0.0.0-20180630182551-d38d89fa843e h1:3NIzz7weXhh3NToPgbtlQtKiVgerEaG4/nY2skGoGG0=
github.com/yobert/alsa v0.0.0-20180630182551-d38d89fa843e/go.mod h1:CaowXBWOiSGWEpBBV8LoVnQTVPV4ycyviC9IBLj8dRw=
go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=

View File

@ -39,7 +39,7 @@ import (
"strconv" "strconv"
"time" "time"
"bitbucket.org/ausocean/av/rtmp/amf" "bitbucket.org/ausocean/av/protocol/rtmp/amf"
) )
// Conn represents an RTMP connection. // Conn represents an RTMP connection.

View File

@ -38,7 +38,7 @@ import (
"encoding/binary" "encoding/binary"
"io" "io"
"bitbucket.org/ausocean/av/rtmp/amf" "bitbucket.org/ausocean/av/protocol/rtmp/amf"
) )
// Packet types. // Packet types.

View File

@ -43,7 +43,7 @@ import (
"strconv" "strconv"
"time" "time"
"bitbucket.org/ausocean/av/rtmp/amf" "bitbucket.org/ausocean/av/protocol/rtmp/amf"
) )
const ( const (

View File

@ -38,8 +38,8 @@ import (
"testing" "testing"
"time" "time"
"bitbucket.org/ausocean/av/stream/flv" "bitbucket.org/ausocean/av/codec/lex"
"bitbucket.org/ausocean/av/stream/lex" "bitbucket.org/ausocean/av/container/flv"
) )
const ( const (

View File

@ -40,9 +40,9 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/ausocean/av/stream/flv" "bitbucket.org/ausocean/av/codec/lex"
"bitbucket.org/ausocean/av/stream/lex" "bitbucket.org/ausocean/av/container/flv"
"bitbucket.org/ausocean/av/stream/mts" "bitbucket.org/ausocean/av/container/mts"
"bitbucket.org/ausocean/iot/pi/netsender" "bitbucket.org/ausocean/iot/pi/netsender"
"bitbucket.org/ausocean/utils/logger" "bitbucket.org/ausocean/utils/logger"
"bitbucket.org/ausocean/utils/ring" "bitbucket.org/ausocean/utils/ring"

View File

@ -37,9 +37,9 @@ import (
"github.com/Comcast/gots/packet" "github.com/Comcast/gots/packet"
"bitbucket.org/ausocean/av/rtmp" "bitbucket.org/ausocean/av/container/mts"
"bitbucket.org/ausocean/av/stream/mts" "bitbucket.org/ausocean/av/protocol/rtmp"
"bitbucket.org/ausocean/av/stream/rtp" "bitbucket.org/ausocean/av/protocol/rtp"
"bitbucket.org/ausocean/iot/pi/netsender" "bitbucket.org/ausocean/iot/pi/netsender"
"bitbucket.org/ausocean/utils/logger" "bitbucket.org/ausocean/utils/logger"
) )

View File

@ -38,8 +38,8 @@ import (
"github.com/Comcast/gots/packet" "github.com/Comcast/gots/packet"
"github.com/Comcast/gots/pes" "github.com/Comcast/gots/pes"
"bitbucket.org/ausocean/av/stream/mts" "bitbucket.org/ausocean/av/container/mts"
"bitbucket.org/ausocean/av/stream/mts/meta" "bitbucket.org/ausocean/av/container/mts/meta"
"bitbucket.org/ausocean/utils/logger" "bitbucket.org/ausocean/utils/logger"
"bitbucket.org/ausocean/utils/ring" "bitbucket.org/ausocean/utils/ring"
) )