Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yutopp/go-rtmp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.3
Choose a base ref
...
head repository: yutopp/go-rtmp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.0.4
Choose a head ref
  • 4 commits
  • 13 files changed
  • 1 contributor

Commits on Jan 1, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    a1c9252 View commit details
  2. Update dependencies

    yutopp committed Jan 1, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    darinpope Darin Pope
    Copy the full SHA
    bd59a26 View commit details
  3. go get && go mod tidy

    yutopp committed Jan 1, 2023
    Copy the full SHA
    81c4033 View commit details
  4. make fmt

    yutopp committed Jan 1, 2023
    Copy the full SHA
    4b55cf2 View commit details
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
go: [ '1.14', '1.13' ]
go: [ '1.19', '1.18' ]
name: ${{ matrix.go }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup go
uses: actions/setup-go@v1
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go }}

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ check: fmt lint vet

.PHONY: download-ci-tools
download-ci-tools:
go get -u golang.org/x/tools/cmd/goimports
wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.36.0
wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s v0.11.0
go install golang.org/x/tools/cmd/goimports@latest
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1
curl -sSfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s v0.14.1

.PHONY: fmt
fmt:
6 changes: 3 additions & 3 deletions client_control_not_connected_handler.go
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ import (
var _ stateHandler = (*clientControlNotConnectedHandler)(nil)

// clientControlNotConnectedHandler Handle control messages from a server in flow of connecting.
// transitions:
// | "_result" -> controlStreamStateConnected
// | _ -> self
//
// transitions:
// | "_result" -> controlStreamStateConnected
// | _ -> self
type clientControlNotConnectedHandler struct {
sh *streamHandler
}
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ require (
github.com/mitchellh/mapstructure v1.4.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.7.0
github.com/stretchr/testify v1.2.2
github.com/stretchr/testify v1.8.1
github.com/yutopp/go-amf0 v0.0.0-20180803120851-48851794bb1f
github.com/yutopp/go-flv v0.2.0
golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65 // indirect
golang.org/x/sys v0.3.0 // indirect
)
19 changes: 15 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fortytw2/leaktest v1.2.0 h1:cj6GCiwJDH7l3tMHLjZDo0QqPtrXJiWSI9JgpeQKw+Q=
github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -16,12 +16,23 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/yutopp/go-amf0 v0.0.0-20180803120851-48851794bb1f h1:VIlyzrDymNB/eD+uJ2vdhgxsY1OGKpVSvVPV3oy97cI=
github.com/yutopp/go-amf0 v0.0.0-20180803120851-48851794bb1f/go.mod h1:miopb3mUO8ynCPmYD04SZ0JCMFsBt0eOdAuQ6HHHQ6Q=
github.com/yutopp/go-flv v0.2.0 h1:f/8z2SKymXJH78666m7Irpq+I1PsrGptBIR3RXGEw/A=
github.com/yutopp/go-flv v0.2.0/go.mod h1:xe1MPrWcfQfYeBT7E5WAF0zvKUyf1hmSpesDjBoUV4E=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65 h1:pTMjDVnP5eVRRlWO76rEWJ8JoC6Lf1CmyjPZXRiy2Sw=
golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5 changes: 0 additions & 5 deletions message/net_connection.go
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@ import (
"github.com/yutopp/go-amf0"
)

//
type NetConnectionConnectCode string

const (
@@ -22,7 +21,6 @@ const (
NetConnectionConnectCodeClosed NetConnectionConnectCode = "NetConnection.Connect.Closed"
)

//
type NetConnectionConnect struct {
Command NetConnectionConnectCommand
}
@@ -55,7 +53,6 @@ func (t *NetConnectionConnect) ToArgs(ty EncodingType) ([]interface{}, error) {
}, nil
}

//
type NetConnectionConnectResult struct {
Properties NetConnectionConnectResultProperties
Information NetConnectionConnectResultInformation
@@ -95,7 +92,6 @@ func (t *NetConnectionConnectResult) ToArgs(ty EncodingType) ([]interface{}, err
}, nil
}

//
type NetConnectionCreateStream struct {
}

@@ -129,7 +125,6 @@ func (t *NetConnectionCreateStreamResult) ToArgs(ty EncodingType) ([]interface{}
}, nil
}

//
type NetConnectionReleaseStream struct {
StreamName string
}
9 changes: 0 additions & 9 deletions message/net_stream.go
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@

package message

//
type NetStreamPublish struct {
CommandObject interface{}
PublishingName string
@@ -30,7 +29,6 @@ func (t *NetStreamPublish) ToArgs(ty EncodingType) ([]interface{}, error) {
}, nil
}

//
type NetStreamPlay struct {
CommandObject interface{}
StreamName string
@@ -49,7 +47,6 @@ func (t *NetStreamPlay) ToArgs(ty EncodingType) ([]interface{}, error) {
panic("Not implemented")
}

//
type NetStreamOnStatusLevel string

const (
@@ -98,7 +95,6 @@ func (t *NetStreamOnStatus) ToArgs(ty EncodingType) ([]interface{}, error) {
}, nil
}

//
type NetStreamDeleteStream struct {
StreamID uint32
}
@@ -114,7 +110,6 @@ func (t *NetStreamDeleteStream) ToArgs(ty EncodingType) ([]interface{}, error) {
panic("Not implemented")
}

//
type NetStreamFCPublish struct {
StreamName string
}
@@ -133,7 +128,6 @@ func (t *NetStreamFCPublish) ToArgs(ty EncodingType) ([]interface{}, error) {
}, nil
}

//
type NetStreamFCUnpublish struct {
StreamName string
}
@@ -188,7 +182,6 @@ func (t *NetStreamSetDataFrame) ToArgs(ty EncodingType) ([]interface{}, error) {
}, nil
}

//
type NetStreamGetStreamLength struct {
StreamName string
}
@@ -207,7 +200,6 @@ func (t *NetStreamGetStreamLength) ToArgs(ty EncodingType) ([]interface{}, error
}, nil
}

//
type NetStreamPing struct {
}

@@ -223,7 +215,6 @@ func (t *NetStreamPing) ToArgs(ty EncodingType) ([]interface{}, error) {
}, nil
}

//
type NetStreamCloseStream struct {
}

4 changes: 2 additions & 2 deletions message/net_stream_test.go
Original file line number Diff line number Diff line change
@@ -35,15 +35,15 @@ var netStreamTestCases = []netStreamTestCase{
PublishingType: "bbb",
},
},
netStreamTestCase{
{
Name: "NetStreamReleaseStream OK",
Box: &NetStreamReleaseStream{},
Args: []interface{}{nil, "theStream"}, // First argument is unknown
ExpectedMsg: &NetStreamReleaseStream{
StreamName: "theStream",
},
},
netStreamTestCase{
{
Name: "NetStreamFCPublish OK",
Box: &NetStreamFCPublish{},
Args: []interface{}{nil, "theStream"}, // First argument is unknown
6 changes: 3 additions & 3 deletions server_control_connected_handler.go
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@ import (
var _ stateHandler = (*serverControlConnectedHandler)(nil)

// serverControlConnectedHandler Handle control messages from a client at server side.
// transitions:
// | "createStream" -> spawn! serverDataInactiveHandler
// | _ -> self
//
// transitions:
// | "createStream" -> spawn! serverDataInactiveHandler
// | _ -> self
type serverControlConnectedHandler struct {
sh *streamHandler
}
6 changes: 3 additions & 3 deletions server_control_not_connected_handler.go
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@ import (
var _ stateHandler = (*serverControlNotConnectedHandler)(nil)

// serverControlNotConnectedHandler Handle control messages from a client which has not send connect at server side.
// transitions:
// | "connect" -> controlStreamStateConnected
// | _ -> self
//
// transitions:
// | "connect" -> controlStreamStateConnected
// | _ -> self
type serverControlNotConnectedHandler struct {
sh *streamHandler
}
9 changes: 5 additions & 4 deletions server_data_inactive_handler.go
Original file line number Diff line number Diff line change
@@ -17,10 +17,11 @@ import (
var _ stateHandler = (*serverDataInactiveHandler)(nil)

// serverDataInactiveHandler Handle data messages from a non operated client at server side.
// transitions:
// | "publish" -> serverDataPublishHandler
// | "play" -> serverDataPlayHandler
// | _ -> self
//
// transitions:
// | "publish" -> serverDataPublishHandler
// | "play" -> serverDataPlayHandler
// | _ -> self
type serverDataInactiveHandler struct {
sh *streamHandler
}
5 changes: 3 additions & 2 deletions server_data_play_handler.go
Original file line number Diff line number Diff line change
@@ -15,8 +15,9 @@ import (
var _ stateHandler = (*serverDataPlayHandler)(nil)

// serverDataPlayHandler Handle data messages from a player at server side (NOT IMPLEMENTED).
// transitions:
// | _ -> self
//
// transitions:
// | _ -> self
type serverDataPlayHandler struct {
sh *streamHandler
}
5 changes: 3 additions & 2 deletions server_data_publish_handler.go
Original file line number Diff line number Diff line change
@@ -15,8 +15,9 @@ import (
var _ stateHandler = (*serverDataPublishHandler)(nil)

// serverDataPublishHandler Handle data messages from a publisher at server side.
// transitions:
// | _ -> self
//
// transitions:
// | _ -> self
type serverDataPublishHandler struct {
sh *streamHandler
}