Merged in av-restructure (pull request #175)

av: restructured directories

Approved-by: Alan Noble <anoble@gmail.com>

cmd/revid-cli/main.go

@@ -36,9 +36,9 @@ import (
 	"strings"
 	"time"
 
+	"bitbucket.org/ausocean/av/container/mts"
+	"bitbucket.org/ausocean/av/container/mts/meta"
 	"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/sds"
 	"bitbucket.org/ausocean/iot/pi/smartlogger"

container/mts/encoder.go

@@ -32,9 +32,9 @@ import (
 	"io"
 	"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

container/mts/metaEncode_test.go

@@ -31,8 +31,8 @@ import (
 	"bytes"
 	"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 (

exp/adpcm/decode-pcm/decode-pcm.go

@@ -34,7 +34,7 @@ import (
 	"io/ioutil"
 	"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.

exp/adpcm/encode-pcm/encode-pcm.go

@@ -34,7 +34,7 @@ import (
 	"io/ioutil"
 	"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.

exp/ts-repair/main.go

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

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/sergi/go-diff v1.0.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/multierr v1.1.0 // indirect
 	go.uber.org/zap v1.9.1 // indirect

go.sum

@@ -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/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 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/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=

protocol/rtmp/conn.go

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

protocol/rtmp/packet.go

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

protocol/rtmp/parseurl_test.go

@@ -40,7 +40,7 @@ var parseURLTests = []struct {
 	wantErr      error
 }{
 	{
-		url:      "rtmp://addr",
+		url:     "rtmp://addr",
 		wantErr: errInvalidURL,
 	},
 	{

protocol/rtmp/rtmp.go

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

protocol/rtmp/rtmp_test.go

@@ -38,8 +38,8 @@ import (
 	"testing"
 	"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 (

revid/revid.go

@@ -40,9 +40,9 @@ import (
 	"sync"
 	"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/utils/logger"
 	"bitbucket.org/ausocean/utils/ring"

revid/senders.go

@@ -37,9 +37,9 @@ import (
 
 	"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/utils/logger"
 )

revid/senders_test.go

@@ -38,8 +38,8 @@ import (
 	"github.com/Comcast/gots/packet"
 	"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/ring"
 )