Skip to content

Commit

Permalink
fix demo
Browse files Browse the repository at this point in the history
  • Loading branch information
notedit committed Jan 9, 2020
1 parent 607cfa3 commit f2cc7c7
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 354 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ require (
github.com/notedit/gstreamer-go v0.3.0
github.com/notedit/gstreamer-rtmp v0.0.0-20181226050148-9295bf2f2ca8
github.com/notedit/media-server-go v0.1.17
github.com/notedit/rtmp-lib v0.0.1
github.com/notedit/rtmp-lib v0.0.2
github.com/notedit/sdp v0.0.0-20190418080450-702b42591eb2
github.com/sanity-io/litter v1.1.0
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
)

//replace github.com/notedit/media-server-go v0.1.12 => ../media-server-go
replace github.com/notedit/media-server-go v0.1.17 => ../media-server-go
33 changes: 2 additions & 31 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 h1:xz6Nv3zcwO2Lila35hcb0QloCQsc38Al13RNEzWRpX4=
github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9/go.mod h1:2wSM9zJkl1UQEFZgSd68NfCgRz1VL1jzy/RjCg+ULrs=
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=
Expand All @@ -19,47 +18,24 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/notedit/gstreamer-go v0.3.0 h1:M4QvNk+fdeDSgjmtiWvH0jlLDt6Rl4/yX1DC/9LA2ck=
github.com/notedit/gstreamer-go v0.3.0/go.mod h1:CGCLZR47aRzzEmup8uQcplfOdLqEtJjFihiu+A2aIZw=
github.com/notedit/gstreamer-rtmp v0.0.0-20181226050148-9295bf2f2ca8 h1:Bqzzyc2AnHdX87Yl1TTc2xsKCoKas8XsUZ16o2PhHgI=
github.com/notedit/gstreamer-rtmp v0.0.0-20181226050148-9295bf2f2ca8/go.mod h1:29rZyet7mlIPMGC4Ol9kGLL9JRIpt0YbBmg1NUXM5NY=
<<<<<<< HEAD
=======
github.com/notedit/media-server-go v0.0.0-20181224045827-96ce049ca27b h1:xuazzDG0IZWZ2+bXyAER0f6cTzEYhDE7lnRfLMz1qD4=
github.com/notedit/media-server-go v0.0.0-20181224045827-96ce049ca27b/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.0.0-20181225131450-848d7ad1e602 h1:zCwPCOdKfbkNi6U8XzCiuicIzCCBaT+Ec8+YidPYcrg=
github.com/notedit/media-server-go v0.0.0-20181225131450-848d7ad1e602/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.0.0-20181225141712-7ecbee38d4af h1:NdNB62hwYF3Un7GMaiZ6cmCYU1MMdgYh7xKE1kk2Lxc=
github.com/notedit/media-server-go v0.0.0-20181225141712-7ecbee38d4af/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.0.0-20181225171359-ceed668d6b67 h1:hIdTzZEifDEr2HW2SxP97DVXbt2avAfT7oocAady6LI=
github.com/notedit/media-server-go v0.0.0-20181225171359-ceed668d6b67/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.0.0-20181227070639-d11380ec126e h1:r28wl3DUW5nGnLA2gZcPwNU67sL1drXFxSEjdNOAlCM=
github.com/notedit/media-server-go v0.0.0-20181227070639-d11380ec126e/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.1.2 h1:L6qBjjIvQuKUrmwGQweJueJwu5VHMbV0m7I6cKwZqKU=
github.com/notedit/media-server-go v0.1.2/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.1.6 h1:ELqLHVFspdCNgAX8AAy08f73fePoD3ivD+dgzDsO4JI=
github.com/notedit/media-server-go v0.1.6/go.mod h1:a2tVGyH6IegghSpIrj03Y+kjr5jrYCEctNEFIloGrQc=
github.com/notedit/media-server-go v0.1.8 h1:g/PwEuPQOX5bpDbJipmu6wPCR54pGM+xpnJ/HD2lGyE=
github.com/notedit/media-server-go v0.1.16 h1:qRKIUMJ5U5JbSOd5qmVZiqJZ7O71+Lhq9oflCYtNgp8=
github.com/notedit/media-server-go v0.1.16/go.mod h1:Ry7LEaoTobAi101A02eBNNPCaiiAzOf6Vdz0llSVAes=
github.com/notedit/media-server-go v0.1.17 h1:bJWWpbNKZLPki5Utz5zUVDIpbf4TofAgsSjC39SLjo4=
github.com/notedit/media-server-go v0.1.17/go.mod h1:Ry7LEaoTobAi101A02eBNNPCaiiAzOf6Vdz0llSVAes=
>>>>>>> mediaframesession
github.com/notedit/rtmp-lib v0.0.1 h1:bezXVVCnyfefQYURECA//37cJ2RrAioIaiXC254iUT4=
github.com/notedit/rtmp-lib v0.0.1/go.mod h1:Ua4gNG+L57n+AkZfSrsV+VGoWDuOTd7eux+CBjGPeF0=
github.com/notedit/rtmp-lib v0.0.2 h1:rmr+Yk42LNypO1GhUMm5Ucu+YCc5/t+gngL61tv/cHc=
github.com/notedit/rtmp-lib v0.0.2/go.mod h1:Ua4gNG+L57n+AkZfSrsV+VGoWDuOTd7eux+CBjGPeF0=
github.com/notedit/sdp v0.0.0-20190418080450-702b42591eb2 h1:OBlsQl9n5djQqLqwHO5gou1irbitUPwS+SfOrt3yHTU=
github.com/notedit/sdp v0.0.0-20190418080450-702b42591eb2/go.mod h1:GbICVEB3gb4OfNreIqFKFqWASbpTgrB+Q6lErFpYeaY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand All @@ -70,16 +46,11 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 h1:EICbibRW4JNKMcY+LsWmuwob+CRS1BmdRdjphAm9mH4=
github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6 h1:IcgEB62HYgAhX0Nd/QrVgZlxlcyxbGQHElLUhW2X4Fo=
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
Expand Down
125 changes: 0 additions & 125 deletions raw-rtp-input/index.html

This file was deleted.

Binary file removed raw-rtp-input/output.aac
Binary file not shown.
Loading

0 comments on commit f2cc7c7

Please sign in to comment.