mirror of
https://github.com/pion/mediadevices.git
synced 2025-09-27 21:02:17 +08:00
Compare commits
45 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8ad810e61e | ||
![]() |
6f204fa3d1 | ||
![]() |
5215057409 | ||
![]() |
3bcbed0286 | ||
![]() |
907e0d68e2 | ||
![]() |
9fd2d01dbe | ||
![]() |
285f8cd23c | ||
![]() |
b309c30ca0 | ||
![]() |
601f27c014 | ||
![]() |
2a04a14225 | ||
![]() |
416bbc33f3 | ||
![]() |
4a682a48c1 | ||
![]() |
14db2b8130 | ||
![]() |
a3c15d1fb0 | ||
![]() |
43272ea965 | ||
![]() |
e32fc1bdb8 | ||
![]() |
2af325d1a5 | ||
![]() |
5e0df5e5cf | ||
![]() |
d038133783 | ||
![]() |
cd6aaa1393 | ||
![]() |
82cc32308b | ||
![]() |
8fce8a2bb5 | ||
![]() |
5b99500290 | ||
![]() |
e371c0d955 | ||
![]() |
69f9cbe008 | ||
![]() |
b5acc5d7f6 | ||
![]() |
55e65027f9 | ||
![]() |
f0ff9261b4 | ||
![]() |
08a396571f | ||
![]() |
0d09f7f458 | ||
![]() |
e780bdc6f9 | ||
![]() |
ff18b21629 | ||
![]() |
eaf9ff42a8 | ||
![]() |
5ba49e03e7 | ||
![]() |
1250e06923 | ||
![]() |
651c847674 | ||
![]() |
3b2316081e | ||
![]() |
70261260cb | ||
![]() |
548cdac668 | ||
![]() |
79f9fc31f6 | ||
![]() |
1f92ea40da | ||
![]() |
4beb7e5a23 | ||
![]() |
9bb5755cd2 | ||
![]() |
e316b30964 | ||
![]() |
596b8c4e11 |
22
.github/workflows/ci.yaml
vendored
22
.github/workflows/ci.yaml
vendored
@@ -13,13 +13,13 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
go: [ '1.16', '1.15' ]
|
go: [ '1.18', '1.17' ]
|
||||||
name: Linux Go ${{ matrix.go }}
|
name: Linux Go ${{ matrix.go }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v3
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go }}
|
go-version: ${{ matrix.go }}
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
@@ -32,20 +32,20 @@ jobs:
|
|||||||
libx264-dev
|
libx264-dev
|
||||||
- name: Run Test Suite
|
- name: Run Test Suite
|
||||||
run: make test
|
run: make test
|
||||||
- uses: codecov/codecov-action@v2
|
- uses: codecov/codecov-action@v3
|
||||||
if: matrix.go == '1.16'
|
if: matrix.go == '1.18'
|
||||||
build-darwin:
|
build-darwin:
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
go: [ '1.16', '1.15' ]
|
go: [ '1.18', '1.17' ]
|
||||||
name: Darwin Go ${{ matrix.go }}
|
name: Darwin Go ${{ matrix.go }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v3
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go }}
|
go-version: ${{ matrix.go }}
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
@@ -62,11 +62,11 @@ jobs:
|
|||||||
name: Check Licenses
|
name: Check Licenses
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v3
|
||||||
with:
|
with:
|
||||||
go-version: '1.16'
|
go-version: '1.17'
|
||||||
- name: Installing go-licenses
|
- name: Installing go-licenses
|
||||||
run: go get github.com/google/go-licenses
|
run: go get github.com/google/go-licenses
|
||||||
- name: Checking licenses
|
- name: Checking licenses
|
||||||
|
2
.github/workflows/renovate-go-mod-fix.yaml
vendored
2
.github/workflows/renovate-go-mod-fix.yaml
vendored
@@ -9,7 +9,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
- name: fix
|
- name: fix
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -13,3 +13,5 @@
|
|||||||
|
|
||||||
scripts/cross
|
scripts/cross
|
||||||
coverage.txt
|
coverage.txt
|
||||||
|
|
||||||
|
.idea
|
||||||
|
3
Makefile
3
Makefile
@@ -16,7 +16,8 @@ supported_platforms := \
|
|||||||
linux-arm64 \
|
linux-arm64 \
|
||||||
linux-x64 \
|
linux-x64 \
|
||||||
windows-x64 \
|
windows-x64 \
|
||||||
darwin-x64
|
darwin-x64 \
|
||||||
|
darwin-arm64
|
||||||
cmd_build := build
|
cmd_build := build
|
||||||
cmd_test := test
|
cmd_test := test
|
||||||
examples_dir := examples
|
examples_dir := examples
|
||||||
|
47
dockerfiles/darwin-arm64.Dockerfile
Normal file
47
dockerfiles/darwin-arm64.Dockerfile
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
FROM dockercore/golang-cross as m1cross
|
||||||
|
|
||||||
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
RUN apt-get update -qq && apt-get install -y -q --no-install-recommends \
|
||||||
|
cmake \
|
||||||
|
git \
|
||||||
|
libssl-dev \
|
||||||
|
libxml2-dev \
|
||||||
|
libz-dev \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
ENV SDK_VERSION=11.3 \
|
||||||
|
TARGET_DIR=/osxcross/target \
|
||||||
|
UNATTENDED=1
|
||||||
|
|
||||||
|
WORKDIR /work
|
||||||
|
RUN git clone --depth=1 https://github.com/tpoechtrager/osxcross.git /work \
|
||||||
|
&& cd /work/tarballs \
|
||||||
|
&& wget -q https://github.com/phracker/MacOSX-SDKs/releases/download/${SDK_VERSION}/MacOSX${SDK_VERSION}.sdk.tar.xz
|
||||||
|
|
||||||
|
# Build cross compile toolchain for Apple silicon
|
||||||
|
RUN ./build.sh
|
||||||
|
|
||||||
|
|
||||||
|
FROM dockcross/base
|
||||||
|
|
||||||
|
ENV OSX_CROSS_PATH=/osxcross
|
||||||
|
|
||||||
|
COPY --from=m1cross "${OSX_CROSS_PATH}/." "${OSX_CROSS_PATH}/"
|
||||||
|
ENV PATH=${OSX_CROSS_PATH}/target/bin:$PATH
|
||||||
|
|
||||||
|
COPY init.sh /tmp/init.sh
|
||||||
|
RUN bash /tmp/init.sh
|
||||||
|
|
||||||
|
ENV CC=arm64-apple-darwin20.4-clang \
|
||||||
|
CXX=arm64-apple-darwin20.4-clang++ \
|
||||||
|
CPP=arm64-apple-darwin20.4-clang++ \
|
||||||
|
AR=arm64-apple-darwin20.4-ar \
|
||||||
|
AS=arm64-apple-darwin20.4-as \
|
||||||
|
LD=arm64-apple-darwin20.4-ld
|
||||||
|
|
||||||
|
COPY darwin-arm64.cmake ${OSX_CROSS_PATH}/
|
||||||
|
ENV CMAKE_TOOLCHAIN_FILE ${OSX_CROSS_PATH}/darwin-arm64.cmake
|
||||||
|
|
||||||
|
ARG IMAGE=lherman/cross-darwin-arm64
|
||||||
|
ARG VERSION=latest
|
||||||
|
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
|
8
dockerfiles/darwin-arm64.cmake
Normal file
8
dockerfiles/darwin-arm64.cmake
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
set(CMAKE_SYSTEM_NAME Darwin)
|
||||||
|
set(CMAKE_SYSTEM_VERSION 1)
|
||||||
|
set(CMAKE_SYSTEM_PROCESSOR arm64)
|
||||||
|
|
||||||
|
set(CMAKE_C_COMPILER $ENV{CC})
|
||||||
|
set(CMAKE_CXX_COMPILER $ENV{CXX})
|
||||||
|
set(CMAKE_AR $ENV{AR})
|
||||||
|
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
|
@@ -3,9 +3,9 @@ module github.com/pion/mediadevices/examples
|
|||||||
go 1.14
|
go 1.14
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/esimov/pigo v1.4.3
|
github.com/esimov/pigo v1.4.5
|
||||||
github.com/pion/mediadevices v0.0.0
|
github.com/pion/mediadevices v0.0.0
|
||||||
github.com/pion/webrtc/v3 v3.0.20
|
github.com/pion/webrtc/v3 v3.1.43
|
||||||
)
|
)
|
||||||
|
|
||||||
replace github.com/pion/mediadevices v0.0.0 => ../
|
replace github.com/pion/mediadevices v0.0.0 => ../
|
||||||
|
157
examples/go.sum
157
examples/go.sum
@@ -1,18 +1,18 @@
|
|||||||
github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
github.com/blackjack/webcam v0.0.0-20220329180758-ba064708e165 h1:QsIbRyO2tn5eSJZ/skuDqSTo0GWI5H4G1AT7Mm2H0Nw=
|
||||||
github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539 h1:1aIqYfg9s9RETAJHGfVKZW4ok0b22p4QTwk8MsdRtPs=
|
github.com/blackjack/webcam v0.0.0-20220329180758-ba064708e165/go.mod h1:G0X+rEqYPWSq0dG8OMf8M446MtKytzpPjgS3HbdOJZ4=
|
||||||
github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539/go.mod h1:G0X+rEqYPWSq0dG8OMf8M446MtKytzpPjgS3HbdOJZ4=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/disintegration/imaging v1.6.1/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
|
github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
|
||||||
github.com/esimov/pigo v1.4.3 h1:xl098Z9CHmouywvyRZepuKx8aSWHBs/0lZtp7Yt5g28=
|
github.com/esimov/pigo v1.4.5 h1:ySG0QqMh02VNALvHnx04L1ScRu66N6XA5vLLga8GiLg=
|
||||||
github.com/esimov/pigo v1.4.3/go.mod h1:aOTYpOWsqniACzXKdSOGkqI6CnWQpP8tFjgtUOARoEs=
|
github.com/esimov/pigo v1.4.5/go.mod h1:SGkOUpm4wlEmQQJKlaymAkThY8/8iP+XE0gFo7g8G6w=
|
||||||
github.com/fogleman/gg v1.0.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
|
github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||||
github.com/gen2brain/malgo v0.10.29 h1:bTYiUTUKJsEomNby+W0hgyLrOttUXIk4lTEnKA54iqM=
|
github.com/gen2brain/malgo v0.10.35 h1:D6aNo/Q0SnzQLHomTydTXxj4AJFdGJcVoE7I8JxPoUo=
|
||||||
github.com/gen2brain/malgo v0.10.29/go.mod h1:zHSUNZAXfCeNsZou0RtQ6Zk7gDYLIcKOrUWtAdksnEs=
|
github.com/gen2brain/malgo v0.10.35/go.mod h1:zHSUNZAXfCeNsZou0RtQ6Zk7gDYLIcKOrUWtAdksnEs=
|
||||||
github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo=
|
github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo=
|
||||||
|
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
||||||
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
|
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
|
||||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||||
@@ -21,13 +21,17 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
|
|||||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
|
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||||
|
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
github.com/kbinani/screenshot v0.0.0-20210326165202-b96eb3309bb0/go.mod h1:ZceVWGtzUZmxyN+/1I+oG31oOm1dOA2QUNbua9TLVdE=
|
github.com/jezek/xgb v0.0.0-20210312150743-0e0f116e1240/go.mod h1:3P4UH/k22rXyHIJD2w4h2XMqPX4Of/eySEZq9L6wqc4=
|
||||||
|
github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329/go.mod h1:2VPVQDR4wO7KXHwP+DAypEy67rXf+okUx2zjgpCxZw4=
|
||||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
|
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
|
||||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||||
@@ -36,78 +40,96 @@ 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/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
|
github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
|
||||||
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
||||||
|
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
||||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
||||||
github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
|
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
|
||||||
|
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
||||||
github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
|
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
||||||
github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0=
|
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
|
||||||
github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg=
|
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
|
||||||
github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg=
|
github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
|
||||||
github.com/pion/dtls/v2 v2.0.8/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10=
|
github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
|
||||||
github.com/pion/ice/v2 v2.0.16 h1:K6bzD8ef9vMKbGMTHaUweHXEyuNGnvr2zdqKoLKZPn0=
|
github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
|
||||||
github.com/pion/ice/v2 v2.0.16/go.mod h1:SJNJzC27gDZoOW0UoxIoC8Hf2PDxG28hQyNdSexDu38=
|
github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig=
|
||||||
github.com/pion/interceptor v0.0.12 h1:eC1iVneBIAQJEfaNAfDqAncJWhMDAnaXPRCJsltdokE=
|
github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE=
|
||||||
github.com/pion/interceptor v0.0.12/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4=
|
github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
|
||||||
|
github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
|
||||||
|
github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
|
||||||
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
|
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
|
||||||
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
|
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
|
||||||
github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
|
github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
|
||||||
github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
|
github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
|
||||||
github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
|
github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
|
||||||
github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
|
github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
|
||||||
github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo=
|
github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
|
||||||
github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
|
github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc=
|
||||||
github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U=
|
github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I=
|
||||||
github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
|
||||||
github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0=
|
github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
||||||
github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY=
|
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
||||||
github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
|
||||||
github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8=
|
github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
||||||
github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
|
github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU=
|
||||||
github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU=
|
github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
|
||||||
github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0=
|
github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w=
|
||||||
|
github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA=
|
||||||
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
||||||
github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
|
github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
|
||||||
github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE=
|
|
||||||
github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A=
|
|
||||||
github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
|
github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
|
||||||
github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw=
|
|
||||||
github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
|
github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
|
||||||
github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA=
|
github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g=
|
||||||
github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw=
|
github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA=
|
||||||
github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI=
|
github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg=
|
||||||
github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths=
|
github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
|
||||||
github.com/pion/webrtc/v3 v3.0.20 h1:Jj0sk45MqQdkR24E1wbFRmOzb1Lv258ot9zd2fYB/Pw=
|
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
|
||||||
github.com/pion/webrtc/v3 v3.0.20/go.mod h1:0eJnCpQrUMpRnvyonw4ZiWClToerpixrZ2KcoTxvX9M=
|
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/pion/webrtc/v3 v3.1.43 h1:YT3ZTO94UT4kSBvZnRAH82+0jJPUruiKr9CEstdlQzk=
|
||||||
|
github.com/pion/webrtc/v3 v3.1.43/go.mod h1:G/J8k0+grVsjC/rjCZ24AKoCCxcFFODgh7zThNZGs0M=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
||||||
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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
|
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
|
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
|
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
|
||||||
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk=
|
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
|
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
|
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 h1:/eM0PCrQI2xd471rI+snWuu251/+/jpBpZqir2mPdnU=
|
||||||
|
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
|
||||||
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
|
||||||
golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E=
|
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
|
||||||
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
|
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
|
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
|
golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
|
golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw=
|
||||||
|
golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
@@ -116,21 +138,31 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 h1:pDMpM2zh2MT0kHy037cKlSby2nEhD50SYqwQk76Nm40=
|
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
|
||||||
|
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20191110171634-ad39bd3f0407/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
golang.org/x/term v0.0.0-20191110171634-ad39bd3f0407/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
|
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||||
@@ -138,6 +170,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
|
|||||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
|
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
@@ -147,5 +181,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
|
|||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
46
examples/vnc/README.md
Normal file
46
examples/vnc/README.md
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
## Instructions
|
||||||
|
|
||||||
|
### Install required codecs
|
||||||
|
|
||||||
|
In this example, we'll be using x264 and opus as our video and audio codecs. Therefore, we need to make sure that these codecs are installed within our system.
|
||||||
|
|
||||||
|
Installation steps:
|
||||||
|
|
||||||
|
* [x264](https://github.com/pion/mediadevices#x264)
|
||||||
|
|
||||||
|
### Download vnc example
|
||||||
|
|
||||||
|
```
|
||||||
|
git clone https://github.com/pion/mediadevices.git
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Compile vnc example
|
||||||
|
|
||||||
|
```
|
||||||
|
cd mediadevices/examples/vnc && go build
|
||||||
|
```
|
||||||
|
|
||||||
|
### Open example page
|
||||||
|
|
||||||
|
[jsfiddle.net](https://jsfiddle.net/gh/get/library/pure/pion/mediadevices/tree/master/examples/internal/jsfiddle/audio-and-video) you should see two text-areas and a 'Start Session' button
|
||||||
|
|
||||||
|
### Run the webrtc example with your browsers SessionDescription as stdin
|
||||||
|
|
||||||
|
In the jsfiddle the top textarea is your browser, copy that, and store the session description in an environment variable, `export SDP=<put_the_sdp_here>`
|
||||||
|
|
||||||
|
Run `echo $SDP | ./vnc`
|
||||||
|
|
||||||
|
In Windows
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
type sdp.txt| .\vnc.exe
|
||||||
|
```
|
||||||
|
### Input webrtc's SessionDescription into your browser
|
||||||
|
|
||||||
|
Copy the text that `./webrtc` just emitted and copy into second text area
|
||||||
|
|
||||||
|
### Hit 'Start Session' in jsfiddle, enjoy your video!
|
||||||
|
|
||||||
|
A video should start playing in your browser above the input boxes, and will continue playing until you close the application.
|
||||||
|
|
||||||
|
Congrats, you have used pion-MediaDevices! Now start building something cool
|
127
examples/vnc/main.go
Normal file
127
examples/vnc/main.go
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/pion/mediadevices/pkg/driver"
|
||||||
|
"github.com/pion/mediadevices/pkg/driver/vncdriver"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices"
|
||||||
|
"github.com/pion/mediadevices/examples/internal/signal"
|
||||||
|
"github.com/pion/webrtc/v3"
|
||||||
|
|
||||||
|
// If you don't like x264, you can also use vpx by importing as below
|
||||||
|
// "github.com/pion/mediadevices/pkg/codec/vpx" // This is required to use VP8/VP9 video encoder
|
||||||
|
// or you can also use openh264 for alternative h264 implementation
|
||||||
|
// "github.com/pion/mediadevices/pkg/codec/openh264"
|
||||||
|
// or if you use a raspberry pi like, you can use mmal for using its hardware encoder
|
||||||
|
// "github.com/pion/mediadevices/pkg/codec/mmal"
|
||||||
|
"github.com/pion/mediadevices/pkg/codec/x264" // This is required to use h264 video encoder
|
||||||
|
|
||||||
|
// Note: If you don't have a camera or microphone or your adapters are not supported,
|
||||||
|
// you can always swap your adapters with our dummy adapters below.
|
||||||
|
// _ "github.com/pion/mediadevices/pkg/driver/videotest"
|
||||||
|
// _ "github.com/pion/mediadevices/pkg/driver/audiotest"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
config := webrtc.Configuration{
|
||||||
|
ICEServers: []webrtc.ICEServer{
|
||||||
|
{
|
||||||
|
URLs: []string{"stun:stun.l.google.com:19302"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
driver.GetManager().Register(
|
||||||
|
vncdriver.NewVnc("127.0.0.1:5900"),
|
||||||
|
driver.Info{Label: "VNC", DeviceType: driver.Camera, Priority: driver.PriorityLow},
|
||||||
|
)
|
||||||
|
// Wait for the offer to be pasted
|
||||||
|
offer := webrtc.SessionDescription{}
|
||||||
|
signal.Decode(signal.MustReadStdin(), &offer)
|
||||||
|
|
||||||
|
// Create a new RTCPeerConnection
|
||||||
|
x264Params, err := x264.NewParams()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
x264Params.BitRate = 500_000 // 500kbps
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
codecSelector := mediadevices.NewCodecSelector(
|
||||||
|
mediadevices.WithVideoEncoders(&x264Params),
|
||||||
|
)
|
||||||
|
|
||||||
|
mediaEngine := webrtc.MediaEngine{}
|
||||||
|
codecSelector.Populate(&mediaEngine)
|
||||||
|
api := webrtc.NewAPI(webrtc.WithMediaEngine(&mediaEngine))
|
||||||
|
peerConnection, err := api.NewPeerConnection(config)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the handler for ICE connection state
|
||||||
|
// This will notify you when the peer has connected/disconnected
|
||||||
|
peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
|
||||||
|
fmt.Printf("Connection State has changed %s \n", connectionState.String())
|
||||||
|
})
|
||||||
|
|
||||||
|
s, err := mediadevices.GetUserMedia(mediadevices.MediaStreamConstraints{
|
||||||
|
Video: func(c *mediadevices.MediaTrackConstraints) {
|
||||||
|
|
||||||
|
},
|
||||||
|
Codec: codecSelector,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, track := range s.GetTracks() {
|
||||||
|
track.OnEnded(func(err error) {
|
||||||
|
fmt.Printf("Track (ID: %s) ended with error: %v\n",
|
||||||
|
track.ID(), err)
|
||||||
|
})
|
||||||
|
|
||||||
|
_, err = peerConnection.AddTransceiverFromTrack(track,
|
||||||
|
webrtc.RtpTransceiverInit{
|
||||||
|
Direction: webrtc.RTPTransceiverDirectionSendonly,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the remote SessionDescription
|
||||||
|
err = peerConnection.SetRemoteDescription(offer)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create an answer
|
||||||
|
answer, err := peerConnection.CreateAnswer(nil)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create channel that is blocked until ICE Gathering is complete
|
||||||
|
gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
|
||||||
|
|
||||||
|
// Sets the LocalDescription, and starts our UDP listeners
|
||||||
|
err = peerConnection.SetLocalDescription(answer)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Block until ICE Gathering is complete, disabling trickle ICE
|
||||||
|
// we do this because we only can exchange one signaling message
|
||||||
|
// in a production application you should exchange ICE Candidates via OnICECandidate
|
||||||
|
<-gatherComplete
|
||||||
|
|
||||||
|
// Output the answer in base64 so we can paste it in browser
|
||||||
|
fmt.Println(signal.Encode(*peerConnection.LocalDescription()))
|
||||||
|
|
||||||
|
// Block forever
|
||||||
|
select {}
|
||||||
|
}
|
10
go.mod
10
go.mod
@@ -3,13 +3,15 @@ module github.com/pion/mediadevices
|
|||||||
go 1.13
|
go 1.13
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539
|
github.com/blackjack/webcam v0.0.0-20220329180758-ba064708e165
|
||||||
github.com/gen2brain/malgo v0.10.35
|
github.com/gen2brain/malgo v0.10.35
|
||||||
github.com/google/uuid v1.3.0
|
github.com/google/uuid v1.3.0
|
||||||
github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329
|
github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329
|
||||||
|
github.com/pion/interceptor v0.1.12
|
||||||
github.com/pion/logging v0.2.2
|
github.com/pion/logging v0.2.2
|
||||||
github.com/pion/rtp v1.7.4
|
github.com/pion/rtcp v1.2.10
|
||||||
github.com/pion/webrtc/v3 v3.1.10
|
github.com/pion/rtp v1.7.13
|
||||||
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
|
github.com/pion/webrtc/v3 v3.1.43
|
||||||
|
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||||
)
|
)
|
||||||
|
107
go.sum
107
go.sum
@@ -1,5 +1,5 @@
|
|||||||
github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539 h1:1aIqYfg9s9RETAJHGfVKZW4ok0b22p4QTwk8MsdRtPs=
|
github.com/blackjack/webcam v0.0.0-20220329180758-ba064708e165 h1:QsIbRyO2tn5eSJZ/skuDqSTo0GWI5H4G1AT7Mm2H0Nw=
|
||||||
github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539/go.mod h1:G0X+rEqYPWSq0dG8OMf8M446MtKytzpPjgS3HbdOJZ4=
|
github.com/blackjack/webcam v0.0.0-20220329180758-ba064708e165/go.mod h1:G0X+rEqYPWSq0dG8OMf8M446MtKytzpPjgS3HbdOJZ4=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
@@ -17,10 +17,12 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
|
|||||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
|
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
@@ -40,84 +42,88 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
|
|||||||
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
||||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
||||||
github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
|
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
|
||||||
|
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
||||||
github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
|
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
||||||
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
|
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
|
||||||
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
|
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
|
||||||
github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho=
|
github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
|
||||||
github.com/pion/dtls/v2 v2.0.10 h1:wgys7gPR1NMbWjmjJ3CW7lkUGaun8djgH8nahpNLnxI=
|
github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
|
||||||
github.com/pion/dtls/v2 v2.0.10/go.mod h1:00OxfeCRWHShcqT9jx8pKKmBWuTt0NCZoVPCaC4VKvU=
|
github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
|
||||||
github.com/pion/ice/v2 v2.1.14 h1:nD9GZs3MiR1/dPa5EiMRMe8hLBG3/qqCdx/hTS2g8VE=
|
github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig=
|
||||||
github.com/pion/ice/v2 v2.1.14/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU=
|
github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE=
|
||||||
github.com/pion/interceptor v0.1.0 h1:SlXKaDlEvSl7cr4j8fJykzVz4UdH+7UDtcvx+u01wLU=
|
github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
|
||||||
github.com/pion/interceptor v0.1.0/go.mod h1:j5NIl3tJJPB3u8+Z2Xz8MZs/VV6rc+If9mXEKNuFmEM=
|
github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
|
||||||
|
github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
|
||||||
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
|
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
|
||||||
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
|
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
|
||||||
github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
|
github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
|
||||||
github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
|
github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
|
||||||
github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
|
github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
|
||||||
github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
|
github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
|
||||||
github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
|
|
||||||
github.com/pion/rtcp v1.2.8/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
|
|
||||||
github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
|
|
||||||
github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
|
github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
|
||||||
github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc=
|
||||||
github.com/pion/rtp v1.7.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I=
|
||||||
github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA=
|
github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
|
||||||
github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
|
||||||
github.com/pion/sctp v1.8.0 h1:6erMF2qmQwXr+0iB1lm0AUSmDr9LdmpaBzgSVAEgehw=
|
|
||||||
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
||||||
github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8=
|
github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
|
||||||
github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
|
github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
|
||||||
github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ=
|
github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU=
|
||||||
github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A=
|
github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
|
||||||
|
github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w=
|
||||||
|
github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA=
|
||||||
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
||||||
github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
|
github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
|
||||||
github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A=
|
|
||||||
github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
|
github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
|
||||||
github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw=
|
|
||||||
github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
|
github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
|
||||||
github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA=
|
github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g=
|
||||||
github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw=
|
github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA=
|
||||||
|
github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg=
|
||||||
|
github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
|
||||||
|
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
|
||||||
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
|
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
|
||||||
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
|
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
|
||||||
github.com/pion/webrtc/v3 v3.1.10 h1:DO99F6/X1HrQho3LxTWHPjI3c388btBf56lR5UNRNNk=
|
github.com/pion/webrtc/v3 v3.1.43 h1:YT3ZTO94UT4kSBvZnRAH82+0jJPUruiKr9CEstdlQzk=
|
||||||
github.com/pion/webrtc/v3 v3.1.10/go.mod h1:eL2HHZOvX+W+Q+lenuidTrWfMD9gG3aobtGcCqJ5G48=
|
github.com/pion/webrtc/v3 v3.1.43/go.mod h1:G/J8k0+grVsjC/rjCZ24AKoCCxcFFODgh7zThNZGs0M=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
||||||
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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
|
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
|
||||||
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
|
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
|
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 h1:/eM0PCrQI2xd471rI+snWuu251/+/jpBpZqir2mPdnU=
|
||||||
|
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
|
||||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
|
||||||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
|
||||||
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI=
|
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
|
golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
|
golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw=
|
||||||
|
golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
@@ -132,22 +138,25 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
|
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
|
||||||
|
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||||
@@ -155,6 +164,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
|
|||||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
|
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
|
24
ioreader.go
24
ioreader.go
@@ -1,5 +1,7 @@
|
|||||||
package mediadevices
|
package mediadevices
|
||||||
|
|
||||||
|
import "github.com/pion/mediadevices/pkg/codec"
|
||||||
|
|
||||||
type EncodedBuffer struct {
|
type EncodedBuffer struct {
|
||||||
Data []byte
|
Data []byte
|
||||||
Samples uint32
|
Samples uint32
|
||||||
@@ -8,11 +10,13 @@ type EncodedBuffer struct {
|
|||||||
type EncodedReadCloser interface {
|
type EncodedReadCloser interface {
|
||||||
Read() (EncodedBuffer, func(), error)
|
Read() (EncodedBuffer, func(), error)
|
||||||
Close() error
|
Close() error
|
||||||
|
codec.Controllable
|
||||||
}
|
}
|
||||||
|
|
||||||
type encodedReadCloserImpl struct {
|
type encodedReadCloserImpl struct {
|
||||||
readFn func() (EncodedBuffer, func(), error)
|
readFn func() (EncodedBuffer, func(), error)
|
||||||
closeFn func() error
|
closeFn func() error
|
||||||
|
controllerFn func() codec.EncoderController
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *encodedReadCloserImpl) Read() (EncodedBuffer, func(), error) {
|
func (r *encodedReadCloserImpl) Read() (EncodedBuffer, func(), error) {
|
||||||
@@ -23,9 +27,14 @@ func (r *encodedReadCloserImpl) Close() error {
|
|||||||
return r.closeFn()
|
return r.closeFn()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *encodedReadCloserImpl) Controller() codec.EncoderController {
|
||||||
|
return r.controllerFn()
|
||||||
|
}
|
||||||
|
|
||||||
type encodedIOReadCloserImpl struct {
|
type encodedIOReadCloserImpl struct {
|
||||||
readFn func([]byte) (int, error)
|
readFn func([]byte) (int, error)
|
||||||
closeFn func() error
|
closeFn func() error
|
||||||
|
controller func() codec.EncoderController
|
||||||
}
|
}
|
||||||
|
|
||||||
func newEncodedIOReadCloserImpl(reader EncodedReadCloser) *encodedIOReadCloserImpl {
|
func newEncodedIOReadCloserImpl(reader EncodedReadCloser) *encodedIOReadCloserImpl {
|
||||||
@@ -48,7 +57,8 @@ func newEncodedIOReadCloserImpl(reader EncodedReadCloser) *encodedIOReadCloserIm
|
|||||||
encoded.Data = encoded.Data[n:]
|
encoded.Data = encoded.Data[n:]
|
||||||
return n, nil
|
return n, nil
|
||||||
},
|
},
|
||||||
closeFn: reader.Close,
|
closeFn: reader.Close,
|
||||||
|
controller: reader.Controller,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,3 +69,7 @@ func (r *encodedIOReadCloserImpl) Read(b []byte) (int, error) {
|
|||||||
func (r *encodedIOReadCloserImpl) Close() error {
|
func (r *encodedIOReadCloserImpl) Close() error {
|
||||||
return r.closeFn()
|
return r.closeFn()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *encodedIOReadCloserImpl) Controller() codec.EncoderController {
|
||||||
|
return r.controller()
|
||||||
|
}
|
||||||
|
@@ -8,6 +8,7 @@ import (
|
|||||||
"github.com/pion/mediadevices/pkg/driver"
|
"github.com/pion/mediadevices/pkg/driver"
|
||||||
_ "github.com/pion/mediadevices/pkg/driver/audiotest"
|
_ "github.com/pion/mediadevices/pkg/driver/audiotest"
|
||||||
_ "github.com/pion/mediadevices/pkg/driver/videotest"
|
_ "github.com/pion/mediadevices/pkg/driver/videotest"
|
||||||
|
"github.com/pion/mediadevices/pkg/frame"
|
||||||
"github.com/pion/mediadevices/pkg/prop"
|
"github.com/pion/mediadevices/pkg/prop"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -97,37 +98,145 @@ func TestSelectBestDriverConstraintsResultIsSetProperly(t *testing.T) {
|
|||||||
t.Fatal("expect to get at least 1 property")
|
t.Fatal("expect to get at least 1 property")
|
||||||
}
|
}
|
||||||
expectedProp := driver.Properties()[0]
|
expectedProp := driver.Properties()[0]
|
||||||
// Since this is a continuous value, bestConstraints should be set with the value that user specified
|
|
||||||
expectedProp.FrameRate = 30.0
|
|
||||||
|
|
||||||
wantConstraints := MediaTrackConstraints{
|
// By reducing the value from the driver by a tiny amount, this property should be chosen.
|
||||||
MediaConstraints: prop.MediaConstraints{
|
// At the same time, we'll be able to find out if the return constraints will be properly set
|
||||||
VideoConstraints: prop.VideoConstraints{
|
// to the best constraints.
|
||||||
// By reducing the width from the driver by a tiny amount, this property should be chosen.
|
cases := map[string]struct {
|
||||||
// At the same time, we'll be able to find out if the return constraints will be properly set
|
width, height int
|
||||||
// to the best constraints.
|
frameFormat frame.Format
|
||||||
Width: prop.Int(expectedProp.Width - 1),
|
frameRate float32
|
||||||
Height: prop.Int(expectedProp.Width),
|
}{
|
||||||
FrameFormat: prop.FrameFormat(expectedProp.FrameFormat),
|
"DifferentWidth": {
|
||||||
FrameRate: prop.Float(30.0),
|
width: expectedProp.Width - 1,
|
||||||
},
|
height: expectedProp.Height,
|
||||||
|
frameFormat: expectedProp.FrameFormat,
|
||||||
|
frameRate: expectedProp.FrameRate,
|
||||||
|
},
|
||||||
|
"DifferentHeight": {
|
||||||
|
width: expectedProp.Width,
|
||||||
|
height: expectedProp.Height - 1,
|
||||||
|
frameFormat: expectedProp.FrameFormat,
|
||||||
|
frameRate: expectedProp.FrameRate,
|
||||||
|
},
|
||||||
|
"DifferentFrameFormat": {
|
||||||
|
width: expectedProp.Width,
|
||||||
|
height: expectedProp.Height,
|
||||||
|
frameFormat: frame.FormatI420,
|
||||||
|
frameRate: expectedProp.FrameRate,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
bestDriver, bestConstraints, err := selectBestDriver(filterFn, wantConstraints)
|
for name, c := range cases {
|
||||||
|
c := c
|
||||||
|
t.Run(name, func(t *testing.T) {
|
||||||
|
var vc prop.VideoConstraints
|
||||||
|
|
||||||
|
if c.frameRate >= 0 {
|
||||||
|
vc = prop.VideoConstraints{
|
||||||
|
Width: prop.Int(c.width),
|
||||||
|
Height: prop.Int(c.height),
|
||||||
|
FrameFormat: prop.FrameFormat(c.frameFormat),
|
||||||
|
FrameRate: prop.Float(c.frameRate),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// do not specify the framerate
|
||||||
|
vc = prop.VideoConstraints{
|
||||||
|
Width: prop.Int(c.width),
|
||||||
|
Height: prop.Int(c.height),
|
||||||
|
FrameFormat: prop.FrameFormat(c.frameFormat),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
wantConstraints := MediaTrackConstraints{
|
||||||
|
MediaConstraints: prop.MediaConstraints{
|
||||||
|
VideoConstraints: vc,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
bestDriver, bestConstraints, err := selectBestDriver(filterFn, wantConstraints)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if driver != bestDriver {
|
||||||
|
t.Fatal("best driver is not expected")
|
||||||
|
}
|
||||||
|
|
||||||
|
s := bestConstraints.selectedMedia
|
||||||
|
if s.Width != expectedProp.Width ||
|
||||||
|
s.Height != expectedProp.Height ||
|
||||||
|
s.FrameFormat != expectedProp.FrameFormat ||
|
||||||
|
s.FrameRate != expectedProp.FrameRate {
|
||||||
|
t.Fatalf("failed to return best constraints\nexpected:\n%v\n\ngot:\n%v", expectedProp, bestConstraints.selectedMedia)
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSelectBestDriverConstraintsNoFit(t *testing.T) {
|
||||||
|
filterFn := driver.FilterVideoRecorder()
|
||||||
|
drivers := driver.GetManager().Query(filterFn)
|
||||||
|
if len(drivers) == 0 {
|
||||||
|
t.Fatal("expect to get at least 1 driver")
|
||||||
|
}
|
||||||
|
|
||||||
|
driver := drivers[0]
|
||||||
|
err := driver.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal("expect to open driver successfully")
|
||||||
|
}
|
||||||
|
defer driver.Close()
|
||||||
|
|
||||||
|
if len(driver.Properties()) == 0 {
|
||||||
|
t.Fatal("expect to get at least 1 property")
|
||||||
|
}
|
||||||
|
expectedProp := driver.Properties()[0]
|
||||||
|
|
||||||
|
cases := map[string]struct {
|
||||||
|
width, height int
|
||||||
|
frameFormat frame.Format
|
||||||
|
frameRate float32
|
||||||
|
}{
|
||||||
|
"DifferentWidth": {
|
||||||
|
width: expectedProp.Width - 1,
|
||||||
|
height: expectedProp.Height,
|
||||||
|
frameFormat: expectedProp.FrameFormat,
|
||||||
|
frameRate: expectedProp.FrameRate,
|
||||||
|
},
|
||||||
|
"DifferentHeight": {
|
||||||
|
width: expectedProp.Width,
|
||||||
|
height: expectedProp.Height - 1,
|
||||||
|
frameFormat: expectedProp.FrameFormat,
|
||||||
|
frameRate: expectedProp.FrameRate,
|
||||||
|
},
|
||||||
|
"DifferentFrameFormat": {
|
||||||
|
width: expectedProp.Width,
|
||||||
|
height: expectedProp.Height,
|
||||||
|
frameFormat: frame.FormatI420,
|
||||||
|
frameRate: expectedProp.FrameRate,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if driver != bestDriver {
|
for name, c := range cases {
|
||||||
t.Fatal("best driver is not expected")
|
c := c
|
||||||
}
|
t.Run(name, func(t *testing.T) {
|
||||||
|
wantConstraints := MediaTrackConstraints{
|
||||||
|
MediaConstraints: prop.MediaConstraints{
|
||||||
|
VideoConstraints: prop.VideoConstraints{
|
||||||
|
Width: prop.IntExact(c.width),
|
||||||
|
Height: prop.IntExact(c.height),
|
||||||
|
FrameFormat: prop.FrameFormatExact(c.frameFormat),
|
||||||
|
FrameRate: prop.FloatExact(c.frameRate),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
s := bestConstraints.selectedMedia
|
_, _, err := selectBestDriver(filterFn, wantConstraints)
|
||||||
if s.Width != expectedProp.Width ||
|
if err == nil {
|
||||||
s.Height != expectedProp.Height ||
|
t.Fatal("expect to not find a driver that fits the constraints")
|
||||||
s.FrameFormat != expectedProp.FrameFormat ||
|
}
|
||||||
s.FrameRate != expectedProp.FrameRate {
|
})
|
||||||
t.Fatalf("failed to return best constraints\nexpected:\n%v\n\ngot:\n%v", expectedProp, bestConstraints.selectedMedia)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -19,6 +19,10 @@ func (track *mockMediaStreamTrack) StreamID() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (track *mockMediaStreamTrack) RID() string {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
func (track *mockMediaStreamTrack) Close() error {
|
func (track *mockMediaStreamTrack) Close() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@@ -11,8 +11,10 @@ package avfoundation
|
|||||||
// }
|
// }
|
||||||
import "C"
|
import "C"
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"sync"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
"github.com/pion/mediadevices/pkg/frame"
|
"github.com/pion/mediadevices/pkg/frame"
|
||||||
@@ -93,9 +95,13 @@ func Devices(mediaType MediaType) ([]Device, error) {
|
|||||||
// ReadCloser is a wrapper around the data callback from AVFoundation. The data received from the
|
// ReadCloser is a wrapper around the data callback from AVFoundation. The data received from the
|
||||||
// the underlying callback can be retrieved by calling Read.
|
// the underlying callback can be retrieved by calling Read.
|
||||||
type ReadCloser struct {
|
type ReadCloser struct {
|
||||||
dataChan chan []byte
|
dataChan chan []byte
|
||||||
id handleID
|
id handleID
|
||||||
onClose func()
|
onClose func()
|
||||||
|
cancelCtx context.Context
|
||||||
|
cancelFunc func()
|
||||||
|
closeWG sync.WaitGroup
|
||||||
|
lock sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
func newReadCloser(onClose func()) *ReadCloser {
|
func newReadCloser(onClose func()) *ReadCloser {
|
||||||
@@ -103,12 +109,25 @@ func newReadCloser(onClose func()) *ReadCloser {
|
|||||||
rc.dataChan = make(chan []byte, 1)
|
rc.dataChan = make(chan []byte, 1)
|
||||||
rc.onClose = onClose
|
rc.onClose = onClose
|
||||||
rc.id = register(rc.dataCb)
|
rc.id = register(rc.dataCb)
|
||||||
|
cancelCtx, cancelFunc := context.WithCancel(context.Background())
|
||||||
|
rc.cancelCtx = cancelCtx
|
||||||
|
rc.cancelFunc = cancelFunc
|
||||||
return &rc
|
return &rc
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rc *ReadCloser) dataCb(data []byte) {
|
func (rc *ReadCloser) dataCb(data []byte) {
|
||||||
|
rc.closeWG.Add(1)
|
||||||
|
defer rc.closeWG.Done()
|
||||||
|
|
||||||
// TODO: add a policy for slow reader
|
// TODO: add a policy for slow reader
|
||||||
rc.dataChan <- data
|
if rc.cancelCtx.Err() != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
// Use the Done channel to avoid waiting for new data from closed camera
|
||||||
|
case <-rc.cancelCtx.Done():
|
||||||
|
case rc.dataChan <- data:
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read reads raw data, the format is determined by the media type and property:
|
// Read reads raw data, the format is determined by the media type and property:
|
||||||
@@ -124,17 +143,28 @@ func (rc *ReadCloser) Read() ([]byte, func(), error) {
|
|||||||
|
|
||||||
// Close closes the capturing session, and no data will flow anymore
|
// Close closes the capturing session, and no data will flow anymore
|
||||||
func (rc *ReadCloser) Close() {
|
func (rc *ReadCloser) Close() {
|
||||||
|
rc.lock.Lock()
|
||||||
|
defer rc.lock.Unlock()
|
||||||
|
|
||||||
|
if rc.cancelCtx.Err() != nil {
|
||||||
|
return // already closed
|
||||||
|
}
|
||||||
|
|
||||||
if rc.onClose != nil {
|
if rc.onClose != nil {
|
||||||
rc.onClose()
|
rc.onClose()
|
||||||
}
|
}
|
||||||
close(rc.dataChan)
|
rc.cancelFunc()
|
||||||
unregister(rc.id)
|
unregister(rc.id)
|
||||||
|
rc.closeWG.Wait()
|
||||||
|
close(rc.dataChan)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Session represents a capturing session.
|
// Session represents a capturing session.
|
||||||
type Session struct {
|
type Session struct {
|
||||||
device Device
|
device Device
|
||||||
cSession C.PAVBindSession
|
cSession C.PAVBindSession
|
||||||
|
lock sync.Mutex
|
||||||
|
closed bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewSession creates a new capturing session
|
// NewSession creates a new capturing session
|
||||||
@@ -152,6 +182,13 @@ func NewSession(device Device) (*Session, error) {
|
|||||||
|
|
||||||
// Close stops capturing session and frees up resources
|
// Close stops capturing session and frees up resources
|
||||||
func (session *Session) Close() error {
|
func (session *Session) Close() error {
|
||||||
|
session.lock.Lock()
|
||||||
|
defer session.lock.Unlock()
|
||||||
|
if session.closed {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
session.closed = true
|
||||||
|
|
||||||
if session.cSession == nil {
|
if session.cSession == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@@ -112,15 +112,37 @@ type VideoEncoderBuilder interface {
|
|||||||
BuildVideoEncoder(r video.Reader, p prop.Media) (ReadCloser, error)
|
BuildVideoEncoder(r video.Reader, p prop.Media) (ReadCloser, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadCloser is an io.ReadCloser with methods for rate limiting: SetBitRate and ForceKeyFrame
|
// ReadCloser is an io.ReadCloser with a controller
|
||||||
type ReadCloser interface {
|
type ReadCloser interface {
|
||||||
Read() (b []byte, release func(), err error)
|
Read() (b []byte, release func(), err error)
|
||||||
Close() error
|
Close() error
|
||||||
|
Controllable
|
||||||
|
}
|
||||||
|
|
||||||
|
// EncoderController is the interface allowing to control the encoder behaviour after it's initialisation.
|
||||||
|
// It will possibly have common control method in the future.
|
||||||
|
// A controller can have optional methods represented by *Controller interfaces
|
||||||
|
type EncoderController interface{}
|
||||||
|
|
||||||
|
// Controllable is a interface representing a encoder which can be controlled
|
||||||
|
// after it's initialisation with an EncoderController
|
||||||
|
type Controllable interface {
|
||||||
|
Controller() EncoderController
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyFrameController is a interface representing an encoder that can be forced to produce key frame on demand
|
||||||
|
type KeyFrameController interface {
|
||||||
|
EncoderController
|
||||||
|
// ForceKeyFrame forces the next frame to be a keyframe, aka intra-frame.
|
||||||
|
ForceKeyFrame() error
|
||||||
|
}
|
||||||
|
|
||||||
|
// BitRateController is a interface representing an encoder which can have a variable bit rate
|
||||||
|
type BitRateController interface {
|
||||||
|
EncoderController
|
||||||
// SetBitRate sets current target bitrate, lower bitrate means smaller data will be transmitted
|
// SetBitRate sets current target bitrate, lower bitrate means smaller data will be transmitted
|
||||||
// but this also means that the quality will also be lower.
|
// but this also means that the quality will also be lower.
|
||||||
SetBitRate(int) error
|
SetBitRate(int) error
|
||||||
// ForceKeyFrame forces the next frame to be a keyframe, aka intra-frame.
|
|
||||||
ForceKeyFrame() error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// BaseParams represents an codec's encoding properties
|
// BaseParams represents an codec's encoding properties
|
||||||
|
@@ -91,12 +91,8 @@ func (e *encoder) Read() ([]byte, func(), error) {
|
|||||||
return encoded, func() {}, err
|
return encoded, func() {}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) SetBitRate(b int) error {
|
func (e *encoder) Controller() codec.EncoderController {
|
||||||
panic("SetBitRate is not implemented")
|
return e
|
||||||
}
|
|
||||||
|
|
||||||
func (e *encoder) ForceKeyFrame() error {
|
|
||||||
panic("ForceKeyFrame is not implemented")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) Close() error {
|
func (e *encoder) Close() error {
|
||||||
|
@@ -4,6 +4,7 @@ import (
|
|||||||
"image"
|
"image"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
||||||
"github.com/pion/mediadevices/pkg/frame"
|
"github.com/pion/mediadevices/pkg/frame"
|
||||||
"github.com/pion/mediadevices/pkg/prop"
|
"github.com/pion/mediadevices/pkg/prop"
|
||||||
@@ -44,3 +45,21 @@ func TestEncoder(t *testing.T) {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement bit rate control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement key frame control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -21,29 +21,26 @@ Encoder *enc_new(const EncoderOptions opts, int *eresult) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Remove hardcoded values
|
params.iUsageType = opts.usage_type;
|
||||||
params.iUsageType = CAMERA_VIDEO_REAL_TIME;
|
|
||||||
params.iPicWidth = opts.width;
|
params.iPicWidth = opts.width;
|
||||||
params.iPicHeight = opts.height;
|
params.iPicHeight = opts.height;
|
||||||
params.iTargetBitrate = opts.target_bitrate;
|
params.iTargetBitrate = opts.target_bitrate;
|
||||||
params.iMaxBitrate = opts.target_bitrate;
|
params.iMaxBitrate = opts.target_bitrate;
|
||||||
params.iRCMode = RC_BITRATE_MODE;
|
params.iRCMode = opts.rc_mode;
|
||||||
params.fMaxFrameRate = opts.max_fps;
|
params.fMaxFrameRate = opts.max_fps;
|
||||||
params.bEnableFrameSkip = true;
|
params.bEnableFrameSkip = opts.enable_frame_skip;
|
||||||
params.uiMaxNalSize = 0;
|
params.uiMaxNalSize = opts.max_nal_size;
|
||||||
params.uiIntraPeriod = 30;
|
params.uiIntraPeriod = opts.intra_period;
|
||||||
// set to 0, so that it'll automatically use multi threads when needed
|
params.iMultipleThreadIdc = opts.multiple_thread_idc;
|
||||||
params.iMultipleThreadIdc = 0;
|
|
||||||
// The base spatial layer 0 is the only one we use.
|
// The base spatial layer 0 is the only one we use.
|
||||||
params.sSpatialLayers[0].iVideoWidth = params.iPicWidth;
|
params.sSpatialLayers[0].iVideoWidth = params.iPicWidth;
|
||||||
params.sSpatialLayers[0].iVideoHeight = params.iPicHeight;
|
params.sSpatialLayers[0].iVideoHeight = params.iPicHeight;
|
||||||
params.sSpatialLayers[0].fFrameRate = params.fMaxFrameRate;
|
params.sSpatialLayers[0].fFrameRate = params.fMaxFrameRate;
|
||||||
params.sSpatialLayers[0].iSpatialBitrate = params.iTargetBitrate;
|
params.sSpatialLayers[0].iSpatialBitrate = params.iTargetBitrate;
|
||||||
params.sSpatialLayers[0].iMaxSpatialBitrate = params.iTargetBitrate;
|
params.sSpatialLayers[0].iMaxSpatialBitrate = params.iTargetBitrate;
|
||||||
// Single NAL unit mode
|
params.sSpatialLayers[0].sSliceArgument.uiSliceNum = opts.slice_num;
|
||||||
params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
|
params.sSpatialLayers[0].sSliceArgument.uiSliceMode = opts.slice_mode;
|
||||||
params.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE;
|
params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = opts.slice_size_constraint;
|
||||||
params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = 12800;
|
|
||||||
|
|
||||||
rv = engine->InitializeExt(¶ms);
|
rv = engine->InitializeExt(¶ms);
|
||||||
if (rv != 0) {
|
if (rv != 0) {
|
||||||
@@ -81,16 +78,15 @@ Slice enc_encode(Encoder *e, Frame f, int *eresult) {
|
|||||||
Slice payload = {0};
|
Slice payload = {0};
|
||||||
|
|
||||||
if(e->force_key_frame == 1) {
|
if(e->force_key_frame == 1) {
|
||||||
info.eFrameType = videoFrameTypeI;
|
e->engine->ForceIntraFrame(true);
|
||||||
e->force_key_frame = 0;
|
e->force_key_frame = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pic.iPicWidth = f.width;
|
pic.iPicWidth = f.width;
|
||||||
pic.iPicHeight = f.height;
|
pic.iPicHeight = f.height;
|
||||||
pic.iColorFormat = videoFormatI420;
|
pic.iColorFormat = videoFormatI420;
|
||||||
// We always received I420 format
|
pic.iStride[0] = f.ystride;
|
||||||
pic.iStride[0] = pic.iPicWidth;
|
pic.iStride[1] = pic.iStride[2] = f.cstride;
|
||||||
pic.iStride[1] = pic.iStride[2] = pic.iPicWidth / 2;
|
|
||||||
pic.pData[0] = (unsigned char *)f.y;
|
pic.pData[0] = (unsigned char *)f.y;
|
||||||
pic.pData[1] = (unsigned char *)f.u;
|
pic.pData[1] = (unsigned char *)f.u;
|
||||||
pic.pData[2] = (unsigned char *)f.v;
|
pic.pData[2] = (unsigned char *)f.v;
|
||||||
|
@@ -12,6 +12,8 @@ typedef struct Slice {
|
|||||||
|
|
||||||
typedef struct Frame {
|
typedef struct Frame {
|
||||||
void *y, *u, *v;
|
void *y, *u, *v;
|
||||||
|
int ystride;
|
||||||
|
int cstride;
|
||||||
int height;
|
int height;
|
||||||
int width;
|
int width;
|
||||||
} Frame;
|
} Frame;
|
||||||
@@ -20,6 +22,15 @@ typedef struct EncoderOptions {
|
|||||||
int width, height;
|
int width, height;
|
||||||
int target_bitrate;
|
int target_bitrate;
|
||||||
float max_fps;
|
float max_fps;
|
||||||
|
EUsageType usage_type;
|
||||||
|
RC_MODES rc_mode;
|
||||||
|
bool enable_frame_skip;
|
||||||
|
unsigned int max_nal_size;
|
||||||
|
unsigned int intra_period;
|
||||||
|
int multiple_thread_idc;
|
||||||
|
unsigned int slice_num;
|
||||||
|
SliceModeEnum slice_mode;
|
||||||
|
unsigned int slice_size_constraint;
|
||||||
} EncoderOptions;
|
} EncoderOptions;
|
||||||
|
|
||||||
typedef struct Encoder {
|
typedef struct Encoder {
|
||||||
|
BIN
pkg/codec/openh264/lib/libopenh264-darwin-arm64.a
Normal file
BIN
pkg/codec/openh264/lib/libopenh264-darwin-arm64.a
Normal file
Binary file not shown.
@@ -33,10 +33,19 @@ func newEncoder(r video.Reader, p prop.Media, params Params) (codec.ReadCloser,
|
|||||||
|
|
||||||
var rv C.int
|
var rv C.int
|
||||||
cEncoder := C.enc_new(C.EncoderOptions{
|
cEncoder := C.enc_new(C.EncoderOptions{
|
||||||
width: C.int(p.Width),
|
width: C.int(p.Width),
|
||||||
height: C.int(p.Height),
|
height: C.int(p.Height),
|
||||||
target_bitrate: C.int(params.BitRate),
|
target_bitrate: C.int(params.BitRate),
|
||||||
max_fps: C.float(p.FrameRate),
|
max_fps: C.float(p.FrameRate),
|
||||||
|
usage_type: C.EUsageType(params.UsageType),
|
||||||
|
rc_mode: C.RC_MODES(params.RCMode),
|
||||||
|
enable_frame_skip: C.bool(params.EnableFrameSkip),
|
||||||
|
max_nal_size: C.uint(params.MaxNalSize),
|
||||||
|
intra_period: C.uint(params.IntraPeriod),
|
||||||
|
multiple_thread_idc: C.int(params.MultipleThreadIdc),
|
||||||
|
slice_num: C.uint(params.SliceNum),
|
||||||
|
slice_mode: C.SliceModeEnum(params.SliceMode),
|
||||||
|
slice_size_constraint: C.uint(params.SliceSizeConstraint),
|
||||||
}, &rv)
|
}, &rv)
|
||||||
if err := errResult(rv); err != nil {
|
if err := errResult(rv); err != nil {
|
||||||
return nil, fmt.Errorf("failed in creating encoder: %v", err)
|
return nil, fmt.Errorf("failed in creating encoder: %v", err)
|
||||||
@@ -65,11 +74,13 @@ func (e *encoder) Read() ([]byte, func(), error) {
|
|||||||
bounds := yuvImg.Bounds()
|
bounds := yuvImg.Bounds()
|
||||||
var rv C.int
|
var rv C.int
|
||||||
s := C.enc_encode(e.engine, C.Frame{
|
s := C.enc_encode(e.engine, C.Frame{
|
||||||
y: unsafe.Pointer(&yuvImg.Y[0]),
|
y: unsafe.Pointer(&yuvImg.Y[0]),
|
||||||
u: unsafe.Pointer(&yuvImg.Cb[0]),
|
u: unsafe.Pointer(&yuvImg.Cb[0]),
|
||||||
v: unsafe.Pointer(&yuvImg.Cr[0]),
|
v: unsafe.Pointer(&yuvImg.Cr[0]),
|
||||||
height: C.int(bounds.Max.Y - bounds.Min.Y),
|
ystride: C.int(yuvImg.YStride),
|
||||||
width: C.int(bounds.Max.X - bounds.Min.X),
|
cstride: C.int(yuvImg.CStride),
|
||||||
|
height: C.int(bounds.Max.Y - bounds.Min.Y),
|
||||||
|
width: C.int(bounds.Max.X - bounds.Min.X),
|
||||||
}, &rv)
|
}, &rv)
|
||||||
if err := errResult(rv); err != nil {
|
if err := errResult(rv); err != nil {
|
||||||
return nil, func() {}, fmt.Errorf("failed in encoding: %v", err)
|
return nil, func() {}, fmt.Errorf("failed in encoding: %v", err)
|
||||||
@@ -79,15 +90,15 @@ func (e *encoder) Read() ([]byte, func(), error) {
|
|||||||
return encoded, func() {}, nil
|
return encoded, func() {}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) SetBitRate(b int) error {
|
|
||||||
panic("SetBitRate is not implemented")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *encoder) ForceKeyFrame() error {
|
func (e *encoder) ForceKeyFrame() error {
|
||||||
e.engine.force_key_frame = C.int(1)
|
e.engine.force_key_frame = C.int(1)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *encoder) Controller() codec.EncoderController {
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
|
||||||
func (e *encoder) Close() error {
|
func (e *encoder) Close() error {
|
||||||
e.mu.Lock()
|
e.mu.Lock()
|
||||||
defer e.mu.Unlock()
|
defer e.mu.Unlock()
|
||||||
|
@@ -8,5 +8,6 @@ package openh264
|
|||||||
//#cgo linux,arm64 LDFLAGS: ${SRCDIR}/lib/libopenh264-linux-arm64.a
|
//#cgo linux,arm64 LDFLAGS: ${SRCDIR}/lib/libopenh264-linux-arm64.a
|
||||||
//#cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-linux-x64.a
|
//#cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-linux-x64.a
|
||||||
//#cgo darwin,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-darwin-x64.a
|
//#cgo darwin,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-darwin-x64.a
|
||||||
|
//#cgo darwin,arm64 LDFLAGS: ${SRCDIR}/lib/libopenh264-darwin-arm64.a
|
||||||
//#cgo windows,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-windows-x64.a -lssp
|
//#cgo windows,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-windows-x64.a -lssp
|
||||||
import "C"
|
import "C"
|
||||||
|
@@ -4,11 +4,28 @@ import (
|
|||||||
"image"
|
"image"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
||||||
"github.com/pion/mediadevices/pkg/frame"
|
"github.com/pion/mediadevices/pkg/frame"
|
||||||
"github.com/pion/mediadevices/pkg/prop"
|
"github.com/pion/mediadevices/pkg/prop"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func TestShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement bit rate control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestEncoder(t *testing.T) {
|
func TestEncoder(t *testing.T) {
|
||||||
t.Run("SimpleRead", func(t *testing.T) {
|
t.Run("SimpleRead", func(t *testing.T) {
|
||||||
p, err := NewParams()
|
p, err := NewParams()
|
||||||
|
@@ -1,5 +1,8 @@
|
|||||||
package openh264
|
package openh264
|
||||||
|
|
||||||
|
// #include <openh264/codec_api.h>
|
||||||
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/pion/mediadevices/pkg/codec"
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
"github.com/pion/mediadevices/pkg/io/video"
|
"github.com/pion/mediadevices/pkg/io/video"
|
||||||
@@ -9,14 +12,62 @@ import (
|
|||||||
// Params stores libopenh264 specific encoding parameters.
|
// Params stores libopenh264 specific encoding parameters.
|
||||||
type Params struct {
|
type Params struct {
|
||||||
codec.BaseParams
|
codec.BaseParams
|
||||||
|
UsageType UsageTypeEnum
|
||||||
|
RCMode RCModeEnum
|
||||||
|
EnableFrameSkip bool
|
||||||
|
MaxNalSize uint
|
||||||
|
IntraPeriod uint
|
||||||
|
MultipleThreadIdc int
|
||||||
|
SliceNum uint
|
||||||
|
SliceMode SliceModeEnum
|
||||||
|
SliceSizeConstraint uint
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type UsageTypeEnum int
|
||||||
|
|
||||||
|
const (
|
||||||
|
CameraVideoRealTime UsageTypeEnum = C.CAMERA_VIDEO_REAL_TIME ///< camera video for real-time communication
|
||||||
|
ScreenContentRealTime UsageTypeEnum = C.SCREEN_CONTENT_REAL_TIME ///< screen content signal
|
||||||
|
CameraVideoNonRealTime UsageTypeEnum = C.CAMERA_VIDEO_NON_REAL_TIME
|
||||||
|
ScreenContentNonRealTime UsageTypeEnum = C.SCREEN_CONTENT_NON_REAL_TIME
|
||||||
|
InputContentTypeAll UsageTypeEnum = C.INPUT_CONTENT_TYPE_ALL
|
||||||
|
)
|
||||||
|
|
||||||
|
type RCModeEnum int
|
||||||
|
|
||||||
|
const (
|
||||||
|
RCQualityMode RCModeEnum = C.RC_QUALITY_MODE ///< quality mode
|
||||||
|
RCBitrateMode RCModeEnum = C.RC_BITRATE_MODE ///< bitrate mode
|
||||||
|
RCBufferbaseedMode RCModeEnum = C.RC_BUFFERBASED_MODE ///< no bitrate control,only using buffer status,adjust the video quality
|
||||||
|
RCTimestampMode RCModeEnum = C.RC_TIMESTAMP_MODE //rate control based timestamp
|
||||||
|
RCBitrateModePostSkip RCModeEnum = C.RC_BITRATE_MODE_POST_SKIP ///< this is in-building RC MODE, WILL BE DELETED after algorithm tuning!
|
||||||
|
RCOffMode RCModeEnum = C.RC_OFF_MODE ///< rate control off mode
|
||||||
|
)
|
||||||
|
|
||||||
|
type SliceModeEnum uint
|
||||||
|
|
||||||
|
const (
|
||||||
|
SMSingleSlice SliceModeEnum = C.SM_SINGLE_SLICE ///< | SliceNum==1
|
||||||
|
SMFixedslcnumSlice SliceModeEnum = C.SM_FIXEDSLCNUM_SLICE ///< | according to SliceNum | enabled dynamic slicing for multi-thread
|
||||||
|
SMRasterSlice SliceModeEnum = C.SM_RASTER_SLICE ///< | according to SlicesAssign | need input of MB numbers each slice. In addition, if other constraint in SSliceArgument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
|
||||||
|
SMSizelimitedSlice SliceModeEnum = C.SM_SIZELIMITED_SLICE ///< | according to SliceSize | slicing according to size, the slicing will be dynamic(have no idea about slice_nums until encoding current frame)
|
||||||
|
)
|
||||||
|
|
||||||
// NewParams returns default openh264 codec specific parameters.
|
// NewParams returns default openh264 codec specific parameters.
|
||||||
func NewParams() (Params, error) {
|
func NewParams() (Params, error) {
|
||||||
return Params{
|
return Params{
|
||||||
BaseParams: codec.BaseParams{
|
BaseParams: codec.BaseParams{
|
||||||
BitRate: 100000,
|
BitRate: 100000,
|
||||||
},
|
},
|
||||||
|
UsageType: CameraVideoRealTime,
|
||||||
|
RCMode: RCBitrateMode,
|
||||||
|
EnableFrameSkip: true,
|
||||||
|
MaxNalSize: 0,
|
||||||
|
IntraPeriod: 30,
|
||||||
|
MultipleThreadIdc: 0, // Defaults to 0, so that it'll automatically use multi threads when needed
|
||||||
|
SliceNum: 1, // Defaults to single NAL unit mode
|
||||||
|
SliceMode: SMSizelimitedSlice,
|
||||||
|
SliceSizeConstraint: 12800,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BIN
pkg/codec/opus/lib/libopus-darwin-arm64.a
Normal file
BIN
pkg/codec/opus/lib/libopus-darwin-arm64.a
Normal file
Binary file not shown.
@@ -14,7 +14,7 @@ import (
|
|||||||
/*
|
/*
|
||||||
#include <opus.h>
|
#include <opus.h>
|
||||||
|
|
||||||
int bridge_encoder_set_bitrate(OpusEncoder *e, opus_int32 bitrate)
|
int pion_set_encoder_bitrate(OpusEncoder *e, opus_int32 bitrate)
|
||||||
{
|
{
|
||||||
return opus_encoder_ctl(e, OPUS_SET_BITRATE(bitrate));
|
return opus_encoder_ctl(e, OPUS_SET_BITRATE(bitrate));
|
||||||
}
|
}
|
||||||
@@ -110,7 +110,7 @@ func (e *encoder) Read() ([]byte, func(), error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) SetBitRate(bitRate int) error {
|
func (e *encoder) SetBitRate(bitRate int) error {
|
||||||
cerror := C.bridge_encoder_set_bitrate(
|
cerror := C.pion_set_encoder_bitrate(
|
||||||
e.engine,
|
e.engine,
|
||||||
C.int(bitRate),
|
C.int(bitRate),
|
||||||
)
|
)
|
||||||
@@ -121,8 +121,8 @@ func (e *encoder) SetBitRate(bitRate int) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) ForceKeyFrame() error {
|
func (e *encoder) Controller() codec.EncoderController {
|
||||||
panic("ForceKeyFrame is not implemented")
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) Close() error {
|
func (e *encoder) Close() error {
|
||||||
|
@@ -8,5 +8,6 @@ package opus
|
|||||||
//#cgo linux,arm64 LDFLAGS: ${SRCDIR}/lib/libopus-linux-arm64.a -lm
|
//#cgo linux,arm64 LDFLAGS: ${SRCDIR}/lib/libopus-linux-arm64.a -lm
|
||||||
//#cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-linux-x64.a -lm
|
//#cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-linux-x64.a -lm
|
||||||
//#cgo darwin,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-darwin-x64.a
|
//#cgo darwin,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-darwin-x64.a
|
||||||
|
//#cgo darwin,arm64 LDFLAGS: ${SRCDIR}/lib/libopus-darwin-arm64.a
|
||||||
//#cgo windows,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-windows-x64.a
|
//#cgo windows,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-windows-x64.a
|
||||||
import "C"
|
import "C"
|
||||||
|
@@ -3,11 +3,28 @@ package opus
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
||||||
"github.com/pion/mediadevices/pkg/prop"
|
"github.com/pion/mediadevices/pkg/prop"
|
||||||
"github.com/pion/mediadevices/pkg/wave"
|
"github.com/pion/mediadevices/pkg/wave"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func TestShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement key frame control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestEncoder(t *testing.T) {
|
func TestEncoder(t *testing.T) {
|
||||||
t.Run("SimpleRead", func(t *testing.T) {
|
t.Run("SimpleRead", func(t *testing.T) {
|
||||||
p, err := NewParams()
|
p, err := NewParams()
|
||||||
|
@@ -541,12 +541,8 @@ func (e *encoderVP8) Read() ([]byte, func(), error) {
|
|||||||
return encoded, func() {}, err
|
return encoded, func() {}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoderVP8) SetBitRate(b int) error {
|
func (e *encoderVP8) Controller() codec.EncoderController {
|
||||||
panic("SetBitRate is not implemented")
|
return e
|
||||||
}
|
|
||||||
|
|
||||||
func (e *encoderVP8) ForceKeyFrame() error {
|
|
||||||
panic("ForceKeyFrame is not implemented")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoderVP8) Close() error {
|
func (e *encoderVP8) Close() error {
|
||||||
|
27
pkg/codec/vaapi/vp8_test.go
Normal file
27
pkg/codec/vaapi/vp8_test.go
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
|
||||||
|
// +build dragonfly freebsd linux netbsd openbsd solaris
|
||||||
|
|
||||||
|
package vaapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestVP8ShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement bit rate control
|
||||||
|
|
||||||
|
e := &encoderVP8{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVP8ShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement key frame control
|
||||||
|
|
||||||
|
e := &encoderVP8{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
@@ -476,12 +476,8 @@ func (e *encoderVP9) Read() ([]byte, func(), error) {
|
|||||||
return encoded, func() {}, err
|
return encoded, func() {}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoderVP9) SetBitRate(b int) error {
|
func (e *encoderVP9) Controller() codec.EncoderController {
|
||||||
panic("SetBitRate is not implemented")
|
return e
|
||||||
}
|
|
||||||
|
|
||||||
func (e *encoderVP9) ForceKeyFrame() error {
|
|
||||||
panic("ForceKeyFrame is not implemented")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoderVP9) Close() error {
|
func (e *encoderVP9) Close() error {
|
||||||
|
27
pkg/codec/vaapi/vp9_test.go
Normal file
27
pkg/codec/vaapi/vp9_test.go
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
|
||||||
|
// +build dragonfly freebsd linux netbsd openbsd solaris
|
||||||
|
|
||||||
|
package vaapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestVP9ShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement bit rate control
|
||||||
|
|
||||||
|
e := &encoderVP9{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVP9ShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement key frame control
|
||||||
|
|
||||||
|
e := &encoderVP9{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
@@ -295,10 +295,6 @@ func (e *encoder) Read() ([]byte, func(), error) {
|
|||||||
return encoded, func() {}, err
|
return encoded, func() {}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) SetBitRate(b int) error {
|
|
||||||
panic("SetBitRate is not implemented")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *encoder) ForceKeyFrame() error {
|
func (e *encoder) ForceKeyFrame() error {
|
||||||
e.mu.Lock()
|
e.mu.Lock()
|
||||||
defer e.mu.Unlock()
|
defer e.mu.Unlock()
|
||||||
@@ -306,6 +302,10 @@ func (e *encoder) ForceKeyFrame() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *encoder) Controller() codec.EncoderController {
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
|
||||||
func (e *encoder) Close() error {
|
func (e *encoder) Close() error {
|
||||||
e.mu.Lock()
|
e.mu.Lock()
|
||||||
defer e.mu.Unlock()
|
defer e.mu.Unlock()
|
||||||
|
@@ -193,7 +193,7 @@ func TestRequestKeyFrame(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
rel()
|
rel()
|
||||||
r.ForceKeyFrame()
|
r.Controller().(codec.KeyFrameController).ForceKeyFrame()
|
||||||
_, rel, err = r.Read()
|
_, rel, err = r.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@@ -210,3 +210,19 @@ func TestRequestKeyFrame(t *testing.T) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement bit rate control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -18,6 +18,7 @@ typedef struct Encoder {
|
|||||||
x264_t *h;
|
x264_t *h;
|
||||||
x264_picture_t pic_in;
|
x264_picture_t pic_in;
|
||||||
x264_param_t param;
|
x264_param_t param;
|
||||||
|
int force_key_frame;
|
||||||
} Encoder;
|
} Encoder;
|
||||||
|
|
||||||
Encoder *enc_new(x264_param_t param, char *preset, int *rc) {
|
Encoder *enc_new(x264_param_t param, char *preset, int *rc) {
|
||||||
@@ -85,8 +86,14 @@ Slice enc_encode(Encoder *e, uint8_t *y, uint8_t *cb, uint8_t *cr, int *rc) {
|
|||||||
e->pic_in.img.plane[0] = y;
|
e->pic_in.img.plane[0] = y;
|
||||||
e->pic_in.img.plane[1] = cb;
|
e->pic_in.img.plane[1] = cb;
|
||||||
e->pic_in.img.plane[2] = cr;
|
e->pic_in.img.plane[2] = cr;
|
||||||
|
if (e->force_key_frame) {
|
||||||
|
e->pic_in.i_type = X264_TYPE_IDR;
|
||||||
|
} else {
|
||||||
|
e->pic_in.i_type = X264_TYPE_AUTO;
|
||||||
|
}
|
||||||
|
|
||||||
int frame_size = x264_encoder_encode(e->h, &nal, &i_nal, &e->pic_in, &pic_out);
|
int frame_size = x264_encoder_encode(e->h, &nal, &i_nal, &e->pic_in, &pic_out);
|
||||||
|
e->force_key_frame = 0;
|
||||||
Slice s = {.data_len = frame_size};
|
Slice s = {.data_len = frame_size};
|
||||||
if (frame_size <= 0) {
|
if (frame_size <= 0) {
|
||||||
*rc = ERR_ENCODE;
|
*rc = ERR_ENCODE;
|
||||||
|
@@ -124,12 +124,16 @@ func (e *encoder) Read() ([]byte, func(), error) {
|
|||||||
return encoded, func() {}, err
|
return encoded, func() {}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) SetBitRate(b int) error {
|
// TODO: Implement bit rate control
|
||||||
panic("SetBitRate is not implemented")
|
//var _ codec.BitRateController = (*encoder)(nil)
|
||||||
}
|
|
||||||
|
|
||||||
func (e *encoder) ForceKeyFrame() error {
|
func (e *encoder) ForceKeyFrame() error {
|
||||||
panic("ForceKeyFrame is not implemented")
|
e.engine.force_key_frame = C.int(1)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *encoder) Controller() codec.EncoderController {
|
||||||
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *encoder) Close() error {
|
func (e *encoder) Close() error {
|
||||||
|
@@ -4,6 +4,7 @@ import (
|
|||||||
"image"
|
"image"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
"github.com/pion/mediadevices/pkg/codec/internal/codectest"
|
||||||
"github.com/pion/mediadevices/pkg/frame"
|
"github.com/pion/mediadevices/pkg/frame"
|
||||||
"github.com/pion/mediadevices/pkg/prop"
|
"github.com/pion/mediadevices/pkg/prop"
|
||||||
@@ -46,3 +47,21 @@ func TestEncoder(t *testing.T) {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementKeyFrameControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement key frame control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.KeyFrameController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldImplementBitRateControl(t *testing.T) {
|
||||||
|
t.SkipNow() // TODO: Implement bit rate control
|
||||||
|
|
||||||
|
e := &encoder{}
|
||||||
|
if _, ok := e.Controller().(codec.BitRateController); !ok {
|
||||||
|
t.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -13,6 +13,7 @@ import (
|
|||||||
type camera struct {
|
type camera struct {
|
||||||
device avfoundation.Device
|
device avfoundation.Device
|
||||||
session *avfoundation.Session
|
session *avfoundation.Session
|
||||||
|
rcClose func()
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@@ -43,6 +44,9 @@ func (cam *camera) Open() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (cam *camera) Close() error {
|
func (cam *camera) Close() error {
|
||||||
|
if cam.rcClose != nil {
|
||||||
|
cam.rcClose()
|
||||||
|
}
|
||||||
return cam.session.Close()
|
return cam.session.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,6 +60,7 @@ func (cam *camera) VideoRecord(property prop.Media) (video.Reader, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
cam.rcClose = rc.Close
|
||||||
r := video.ReaderFunc(func() (image.Image, func(), error) {
|
r := video.ReaderFunc(func() (image.Image, func(), error) {
|
||||||
frame, _, err := rc.Read()
|
frame, _, err := rc.Read()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@@ -10,6 +10,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/blackjack/webcam"
|
"github.com/blackjack/webcam"
|
||||||
@@ -133,6 +134,19 @@ func newCamera(path string) *camera {
|
|||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getCameraReadTimeout() uint32 {
|
||||||
|
// default to 5 seconds
|
||||||
|
var readTimeoutSec uint32 = 5
|
||||||
|
if val, ok := os.LookupEnv("PION_MEDIADEVICES_CAMERA_READ_TIMEOUT"); ok {
|
||||||
|
if valInt, err := strconv.Atoi(val); err == nil {
|
||||||
|
if valInt > 0 {
|
||||||
|
readTimeoutSec = uint32(valInt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return readTimeoutSec
|
||||||
|
}
|
||||||
|
|
||||||
func (c *camera) Open() error {
|
func (c *camera) Open() error {
|
||||||
cam, err := webcam.Open(c.path)
|
cam, err := webcam.Open(c.path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -179,12 +193,21 @@ func (c *camera) VideoRecord(p prop.Media) (video.Reader, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if p.FrameRate > 0 {
|
||||||
|
err = c.cam.SetFramerate(float32(p.FrameRate))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if err := c.cam.StartStreaming(); err != nil {
|
if err := c.cam.StartStreaming(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
cam := c.cam
|
cam := c.cam
|
||||||
|
|
||||||
|
readTimeoutSec := getCameraReadTimeout()
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
c.cancel = cancel
|
c.cancel = cancel
|
||||||
var buf []byte
|
var buf []byte
|
||||||
@@ -200,7 +223,7 @@ func (c *camera) VideoRecord(p prop.Media) (video.Reader, error) {
|
|||||||
return nil, func() {}, io.EOF
|
return nil, func() {}, io.EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
err := cam.WaitForFrame(5) // 5 seconds
|
err := cam.WaitForFrame(readTimeoutSec)
|
||||||
switch err.(type) {
|
switch err.(type) {
|
||||||
case nil:
|
case nil:
|
||||||
case *webcam.Timeout:
|
case *webcam.Timeout:
|
||||||
|
@@ -70,3 +70,31 @@ func TestDiscover(t *testing.T) {
|
|||||||
t.Errorf("Expected label: %s, got: %s", expectedNoLink, label)
|
t.Errorf("Expected label: %s, got: %s", expectedNoLink, label)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetCameraReadTimeout(t *testing.T) {
|
||||||
|
var expected uint32 = 5
|
||||||
|
value := getCameraReadTimeout()
|
||||||
|
if value != expected {
|
||||||
|
t.Errorf("Expected: %d, got: %d", expected, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
envVarName := "PION_MEDIADEVICES_CAMERA_READ_TIMEOUT"
|
||||||
|
os.Setenv(envVarName, "text")
|
||||||
|
value = getCameraReadTimeout()
|
||||||
|
if value != expected {
|
||||||
|
t.Errorf("Expected: %d, got: %d", expected, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Setenv(envVarName, "-1")
|
||||||
|
value = getCameraReadTimeout()
|
||||||
|
if value != expected {
|
||||||
|
t.Errorf("Expected: %d, got: %d", expected, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Setenv(envVarName, "1")
|
||||||
|
expected = 1
|
||||||
|
value = getCameraReadTimeout()
|
||||||
|
if value != expected {
|
||||||
|
t.Errorf("Expected: %d, got: %d", expected, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1,10 +1,12 @@
|
|||||||
package microphone
|
package microphone
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
@@ -32,7 +34,8 @@ var (
|
|||||||
|
|
||||||
type microphone struct {
|
type microphone struct {
|
||||||
malgo.DeviceInfo
|
malgo.DeviceInfo
|
||||||
chunkChan chan []byte
|
chunkChan chan []byte
|
||||||
|
deviceCloseFunc func()
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@@ -87,9 +90,8 @@ func (m *microphone) Open() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *microphone) Close() error {
|
func (m *microphone) Close() error {
|
||||||
if m.chunkChan != nil {
|
if m.deviceCloseFunc != nil {
|
||||||
close(m.chunkChan)
|
m.deviceCloseFunc()
|
||||||
m.chunkChan = nil
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -111,6 +113,8 @@ func (m *microphone) AudioRecord(inputProp prop.Media) (audio.Reader, error) {
|
|||||||
config.PerformanceProfile = malgo.LowLatency
|
config.PerformanceProfile = malgo.LowLatency
|
||||||
config.Capture.Channels = uint32(inputProp.ChannelCount)
|
config.Capture.Channels = uint32(inputProp.ChannelCount)
|
||||||
config.SampleRate = uint32(inputProp.SampleRate)
|
config.SampleRate = uint32(inputProp.SampleRate)
|
||||||
|
//FIX: Turn on the microphone with the current device id
|
||||||
|
config.Capture.DeviceID = m.ID.Pointer()
|
||||||
if inputProp.SampleSize == 4 && inputProp.IsFloat {
|
if inputProp.SampleSize == 4 && inputProp.IsFloat {
|
||||||
config.Capture.Format = malgo.FormatF32
|
config.Capture.Format = malgo.FormatF32
|
||||||
} else if inputProp.SampleSize == 2 && !inputProp.IsFloat {
|
} else if inputProp.SampleSize == 2 && !inputProp.IsFloat {
|
||||||
@@ -119,26 +123,44 @@ func (m *microphone) AudioRecord(inputProp prop.Media) (audio.Reader, error) {
|
|||||||
return nil, errUnsupportedFormat
|
return nil, errUnsupportedFormat
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cancelCtx, cancel := context.WithCancel(context.Background())
|
||||||
onRecvChunk := func(_, chunk []byte, framecount uint32) {
|
onRecvChunk := func(_, chunk []byte, framecount uint32) {
|
||||||
m.chunkChan <- chunk
|
select {
|
||||||
|
case <-cancelCtx.Done():
|
||||||
|
case m.chunkChan <- chunk:
|
||||||
|
}
|
||||||
}
|
}
|
||||||
callbacks.Data = onRecvChunk
|
callbacks.Data = onRecvChunk
|
||||||
|
|
||||||
device, err := malgo.InitDevice(ctx.Context, config, callbacks)
|
device, err := malgo.InitDevice(ctx.Context, config, callbacks)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
cancel()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = device.Start()
|
err = device.Start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
cancel()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var closeDeviceOnce sync.Once
|
||||||
|
m.deviceCloseFunc = func() {
|
||||||
|
closeDeviceOnce.Do(func() {
|
||||||
|
cancel() // Unblock onRecvChunk
|
||||||
|
device.Uninit()
|
||||||
|
|
||||||
|
if m.chunkChan != nil {
|
||||||
|
close(m.chunkChan)
|
||||||
|
m.chunkChan = nil
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
var reader audio.Reader = audio.ReaderFunc(func() (wave.Audio, func(), error) {
|
var reader audio.Reader = audio.ReaderFunc(func() (wave.Audio, func(), error) {
|
||||||
chunk, ok := <-m.chunkChan
|
chunk, ok := <-m.chunkChan
|
||||||
if !ok {
|
if !ok {
|
||||||
device.Stop()
|
m.deviceCloseFunc()
|
||||||
device.Uninit()
|
|
||||||
return nil, func() {}, io.EOF
|
return nil, func() {}, io.EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -47,10 +47,6 @@ func (d *dummy) Close() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *dummy) VideoRecord(p prop.Media) (video.Reader, error) {
|
func (d *dummy) VideoRecord(p prop.Media) (video.Reader, error) {
|
||||||
if p.FrameRate == 0 {
|
|
||||||
p.FrameRate = 30
|
|
||||||
}
|
|
||||||
|
|
||||||
colors := [][3]byte{
|
colors := [][3]byte{
|
||||||
{235, 128, 128},
|
{235, 128, 128},
|
||||||
{210, 16, 146},
|
{210, 16, 146},
|
||||||
@@ -143,6 +139,7 @@ func (d dummy) Properties() []prop.Media {
|
|||||||
Width: 640,
|
Width: 640,
|
||||||
Height: 480,
|
Height: 480,
|
||||||
FrameFormat: frame.FormatYUYV,
|
FrameFormat: frame.FormatYUYV,
|
||||||
|
FrameRate: 30,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
21
pkg/driver/vncdriver/vnc/LICENSE
Normal file
21
pkg/driver/vncdriver/vnc/LICENSE
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2013 Mitchell Hashimoto
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
16
pkg/driver/vncdriver/vnc/README.md
Normal file
16
pkg/driver/vncdriver/vnc/README.md
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# VNC Library for Go
|
||||||
|
|
||||||
|
go-vnc is a VNC library for Go, initially supporting VNC clients but
|
||||||
|
with the goal of eventually implementing a VNC server.
|
||||||
|
|
||||||
|
This library implements [RFC 6143](http://tools.ietf.org/html/rfc6143).
|
||||||
|
|
||||||
|
## Usage & Installation
|
||||||
|
|
||||||
|
The library is installable via standard `go get`. The package name is `vnc`.
|
||||||
|
|
||||||
|
```
|
||||||
|
$ go get github.com/mitchellh/go-vnc
|
||||||
|
```
|
||||||
|
|
||||||
|
Documentation is available on GoDoc: http://godoc.org/github.com/mitchellh/go-vnc
|
494
pkg/driver/vncdriver/vnc/client.go
Normal file
494
pkg/driver/vncdriver/vnc/client.go
Normal file
@@ -0,0 +1,494 @@
|
|||||||
|
// Package vnc implements a VNC client.
|
||||||
|
//
|
||||||
|
// References:
|
||||||
|
// [PROTOCOL]: http://tools.ietf.org/html/rfc6143
|
||||||
|
package vnc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"unicode"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ClientConn struct {
|
||||||
|
c net.Conn
|
||||||
|
config *ClientConfig
|
||||||
|
|
||||||
|
// If the pixel format uses a color map, then this is the color
|
||||||
|
// map that is used. This should not be modified directly, since
|
||||||
|
// the data comes from the server.
|
||||||
|
ColorMap [256]Color
|
||||||
|
|
||||||
|
// Encodings supported by the client. This should not be modified
|
||||||
|
// directly. Instead, SetEncodings should be used.
|
||||||
|
Encs []Encoding
|
||||||
|
|
||||||
|
// Width of the frame buffer in pixels, sent from the server.
|
||||||
|
FrameBufferWidth uint16
|
||||||
|
|
||||||
|
// Height of the frame buffer in pixels, sent from the server.
|
||||||
|
FrameBufferHeight uint16
|
||||||
|
|
||||||
|
// Name associated with the desktop, sent from the server.
|
||||||
|
DesktopName string
|
||||||
|
|
||||||
|
// The pixel format associated with the connection. This shouldn't
|
||||||
|
// be modified. If you wish to set a new pixel format, use the
|
||||||
|
// SetPixelFormat method.
|
||||||
|
PixelFormat PixelFormat
|
||||||
|
}
|
||||||
|
|
||||||
|
// A ClientConfig structure is used to configure a ClientConn. After
|
||||||
|
// one has been passed to initialize a connection, it must not be modified.
|
||||||
|
type ClientConfig struct {
|
||||||
|
// A slice of ClientAuth methods. Only the first instance that is
|
||||||
|
// suitable by the server will be used to authenticate.
|
||||||
|
Auth []ClientAuth
|
||||||
|
|
||||||
|
// Exclusive determines whether the connection is shared with other
|
||||||
|
// clients. If true, then all other clients connected will be
|
||||||
|
// disconnected when a connection is established to the VNC server.
|
||||||
|
Exclusive bool
|
||||||
|
|
||||||
|
// The channel that all messages received from the server will be
|
||||||
|
// sent on. If the channel blocks, then the goroutine reading data
|
||||||
|
// from the VNC server may block indefinitely. It is up to the user
|
||||||
|
// of the library to ensure that this channel is properly read.
|
||||||
|
// If this is not set, then all messages will be discarded.
|
||||||
|
ServerMessageCh chan<- ServerMessage
|
||||||
|
|
||||||
|
// A slice of supported messages that can be read from the server.
|
||||||
|
// This only needs to contain NEW server messages, and doesn't
|
||||||
|
// need to explicitly contain the RFC-required messages.
|
||||||
|
ServerMessages []ServerMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
func Client(c net.Conn, cfg *ClientConfig) (*ClientConn, error) {
|
||||||
|
conn := &ClientConn{
|
||||||
|
c: c,
|
||||||
|
config: cfg,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := conn.handshake(); err != nil {
|
||||||
|
conn.Close()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
go conn.mainLoop()
|
||||||
|
|
||||||
|
return conn, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ClientConn) Close() error {
|
||||||
|
return c.c.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
// CutText tells the server that the client has new text in its cut buffer.
|
||||||
|
// The text string MUST only contain Latin-1 characters. This encoding
|
||||||
|
// is compatible with Go's native string format, but can only use up to
|
||||||
|
// unicode.MaxLatin values.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.5.6
|
||||||
|
func (c *ClientConn) CutText(text string) error {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
// This is the fixed size data we'll send
|
||||||
|
fixedData := []interface{}{
|
||||||
|
uint8(6),
|
||||||
|
uint8(0),
|
||||||
|
uint8(0),
|
||||||
|
uint8(0),
|
||||||
|
uint32(len(text)),
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range fixedData {
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, val); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, char := range text {
|
||||||
|
if char > unicode.MaxLatin1 {
|
||||||
|
return fmt.Errorf("Character '%d' is not valid Latin-1", char)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, uint8(char)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dataLength := 8 + len(text)
|
||||||
|
if _, err := c.c.Write(buf.Bytes()[0:dataLength]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Requests a framebuffer update from the server. There may be an indefinite
|
||||||
|
// time between the request and the actual framebuffer update being
|
||||||
|
// received.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.5.3
|
||||||
|
func (c *ClientConn) FramebufferUpdateRequest(incremental bool, x, y, width, height uint16) error {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
var incrementalByte uint8 = 0
|
||||||
|
|
||||||
|
if incremental {
|
||||||
|
incrementalByte = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
data := []interface{}{
|
||||||
|
uint8(3),
|
||||||
|
incrementalByte,
|
||||||
|
x, y, width, height,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range data {
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, val); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := c.c.Write(buf.Bytes()[0:10]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyEvent indiciates a key press or release and sends it to the server.
|
||||||
|
// The key is indicated using the X Window System "keysym" value. Use
|
||||||
|
// Google to find a reference of these values. To simulate a key press,
|
||||||
|
// you must send a key with both a down event, and a non-down event.
|
||||||
|
//
|
||||||
|
// See 7.5.4.
|
||||||
|
func (c *ClientConn) KeyEvent(keysym uint32, down bool) error {
|
||||||
|
var downFlag uint8 = 0
|
||||||
|
if down {
|
||||||
|
downFlag = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
data := []interface{}{
|
||||||
|
uint8(4),
|
||||||
|
downFlag,
|
||||||
|
uint8(0),
|
||||||
|
uint8(0),
|
||||||
|
keysym,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range data {
|
||||||
|
if err := binary.Write(c.c, binary.BigEndian, val); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PointerEvent indicates that pointer movement or a pointer button
|
||||||
|
// press or release.
|
||||||
|
//
|
||||||
|
// The mask is a bitwise mask of various ButtonMask values. When a button
|
||||||
|
// is set, it is pressed, when it is unset, it is released.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.5.5
|
||||||
|
func (c *ClientConn) PointerEvent(mask ButtonMask, x, y uint16) error {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
data := []interface{}{
|
||||||
|
uint8(5),
|
||||||
|
uint8(mask),
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range data {
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, val); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := c.c.Write(buf.Bytes()[0:6]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetEncodings sets the encoding types in which the pixel data can
|
||||||
|
// be sent from the server. After calling this method, the encs slice
|
||||||
|
// given should not be modified.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.5.2
|
||||||
|
func (c *ClientConn) SetEncodings(encs []Encoding) error {
|
||||||
|
data := make([]interface{}, 3+len(encs))
|
||||||
|
data[0] = uint8(2)
|
||||||
|
data[1] = uint8(0)
|
||||||
|
data[2] = uint16(len(encs))
|
||||||
|
|
||||||
|
for i, enc := range encs {
|
||||||
|
data[3+i] = int32(enc.Type())
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
for _, val := range data {
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, val); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dataLength := 4 + (4 * len(encs))
|
||||||
|
if _, err := c.c.Write(buf.Bytes()[0:dataLength]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Encs = encs
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPixelFormat sets the format in which pixel values should be sent
|
||||||
|
// in FramebufferUpdate messages from the server.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.5.1
|
||||||
|
func (c *ClientConn) SetPixelFormat(format *PixelFormat) error {
|
||||||
|
var keyEvent [20]byte
|
||||||
|
keyEvent[0] = 0
|
||||||
|
|
||||||
|
pfBytes, err := writePixelFormat(format)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copy the pixel format bytes into the proper slice location
|
||||||
|
copy(keyEvent[4:], pfBytes)
|
||||||
|
|
||||||
|
// Send the data down the connection
|
||||||
|
if _, err := c.c.Write(keyEvent[:]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset the color map as according to RFC.
|
||||||
|
var newColorMap [256]Color
|
||||||
|
c.ColorMap = newColorMap
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
const pvLen = 12 // ProtocolVersion message length.
|
||||||
|
|
||||||
|
func parseProtocolVersion(pv []byte) (uint, uint, error) {
|
||||||
|
var major, minor uint
|
||||||
|
|
||||||
|
if len(pv) < pvLen {
|
||||||
|
return 0, 0, fmt.Errorf("ProtocolVersion message too short (%v < %v)", len(pv), pvLen)
|
||||||
|
}
|
||||||
|
|
||||||
|
l, err := fmt.Sscanf(string(pv), "RFB %d.%d\n", &major, &minor)
|
||||||
|
if l != 2 {
|
||||||
|
return 0, 0, fmt.Errorf("error parsing ProtocolVersion.")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return major, minor, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ClientConn) handshake() error {
|
||||||
|
var protocolVersion [pvLen]byte
|
||||||
|
|
||||||
|
// 7.1.1, read the ProtocolVersion message sent by the server.
|
||||||
|
if _, err := io.ReadFull(c.c, protocolVersion[:]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
maxMajor, maxMinor, err := parseProtocolVersion(protocolVersion[:])
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if maxMajor < 3 {
|
||||||
|
return fmt.Errorf("unsupported major version, less than 3: %d", maxMajor)
|
||||||
|
}
|
||||||
|
if maxMinor < 3 {
|
||||||
|
return fmt.Errorf("unsupported minor version, less than 3: %d", maxMinor)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Respond with the version we will support
|
||||||
|
if maxMinor<8 {
|
||||||
|
if _, err = c.c.Write([]byte("RFB 003.003\n")); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var numSecurityTypes uint32
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &numSecurityTypes); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if numSecurityTypes == 0 {
|
||||||
|
return fmt.Errorf("no security types: %s", c.readErrorReason())
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if _, err = c.c.Write([]byte("RFB 003.008\n")); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// 7.1.2 Security Handshake from server
|
||||||
|
var numSecurityTypes uint8
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &numSecurityTypes); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if numSecurityTypes == 0 {
|
||||||
|
return fmt.Errorf("no security types: %s", c.readErrorReason())
|
||||||
|
}
|
||||||
|
|
||||||
|
securityTypes := make([]uint8, numSecurityTypes)
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &securityTypes); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
clientSecurityTypes := c.config.Auth
|
||||||
|
if clientSecurityTypes == nil {
|
||||||
|
clientSecurityTypes = []ClientAuth{new(ClientAuthNone)}
|
||||||
|
}
|
||||||
|
|
||||||
|
var auth ClientAuth
|
||||||
|
FindAuth:
|
||||||
|
for _, curAuth := range clientSecurityTypes {
|
||||||
|
for _, securityType := range securityTypes {
|
||||||
|
if curAuth.SecurityType() == securityType {
|
||||||
|
// We use the first matching supported authentication
|
||||||
|
auth = curAuth
|
||||||
|
break FindAuth
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if auth == nil {
|
||||||
|
return fmt.Errorf("no suitable auth schemes found. server supported: %#v", securityTypes)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Respond back with the security type we'll use
|
||||||
|
if err = binary.Write(c.c, binary.BigEndian, auth.SecurityType()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = auth.Handshake(c.c); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 7.1.3 SecurityResult Handshake
|
||||||
|
var securityResult uint32
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &securityResult); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if securityResult == 1 {
|
||||||
|
return fmt.Errorf("security handshake failed: %s", c.readErrorReason())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 7.3.1 ClientInit
|
||||||
|
var sharedFlag uint8 = 1
|
||||||
|
if c.config.Exclusive {
|
||||||
|
sharedFlag = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = binary.Write(c.c, binary.BigEndian, sharedFlag); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 7.3.2 ServerInit
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &c.FrameBufferWidth); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &c.FrameBufferHeight); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read the pixel format
|
||||||
|
if err = readPixelFormat(c.c, &c.PixelFormat); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var nameLength uint32
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &nameLength); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
nameBytes := make([]uint8, nameLength)
|
||||||
|
if err = binary.Read(c.c, binary.BigEndian, &nameBytes); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
c.DesktopName = string(nameBytes)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// mainLoop reads messages sent from the server and routes them to the
|
||||||
|
// proper channels for users of the client to read.
|
||||||
|
func (c *ClientConn) mainLoop() {
|
||||||
|
defer c.Close()
|
||||||
|
|
||||||
|
// Build the map of available server messages
|
||||||
|
typeMap := make(map[uint8]ServerMessage)
|
||||||
|
|
||||||
|
defaultMessages := []ServerMessage{
|
||||||
|
new(FramebufferUpdateMessage),
|
||||||
|
new(SetColorMapEntriesMessage),
|
||||||
|
new(BellMessage),
|
||||||
|
new(ServerCutTextMessage),
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, msg := range defaultMessages {
|
||||||
|
typeMap[msg.Type()] = msg
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.config.ServerMessages != nil {
|
||||||
|
for _, msg := range c.config.ServerMessages {
|
||||||
|
typeMap[msg.Type()] = msg
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for {
|
||||||
|
var messageType uint8
|
||||||
|
if err := binary.Read(c.c, binary.BigEndian, &messageType); err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
msg, ok := typeMap[messageType]
|
||||||
|
if !ok {
|
||||||
|
// Unsupported message type! Bad!
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedMsg, err := msg.Read(c, c.c)
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.config.ServerMessageCh == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
c.config.ServerMessageCh <- parsedMsg
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ClientConn) readErrorReason() string {
|
||||||
|
var reasonLen uint32
|
||||||
|
if err := binary.Read(c.c, binary.BigEndian, &reasonLen); err != nil {
|
||||||
|
return "<error>"
|
||||||
|
}
|
||||||
|
|
||||||
|
reason := make([]uint8, reasonLen)
|
||||||
|
if err := binary.Read(c.c, binary.BigEndian, &reason); err != nil {
|
||||||
|
return "<error>"
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(reason)
|
||||||
|
}
|
124
pkg/driver/vncdriver/vnc/client_auth.go
Normal file
124
pkg/driver/vncdriver/vnc/client_auth.go
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
package vnc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"crypto/des"
|
||||||
|
"encoding/binary"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A ClientAuth implements a method of authenticating with a remote server.
|
||||||
|
type ClientAuth interface {
|
||||||
|
// SecurityType returns the byte identifier sent by the server to
|
||||||
|
// identify this authentication scheme.
|
||||||
|
SecurityType() uint8
|
||||||
|
|
||||||
|
// Handshake is called when the authentication handshake should be
|
||||||
|
// performed, as part of the general RFB handshake. (see 7.2.1)
|
||||||
|
Handshake(net.Conn) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClientAuthNone is the "none" authentication. See 7.2.1
|
||||||
|
type ClientAuthNone byte
|
||||||
|
|
||||||
|
func (*ClientAuthNone) SecurityType() uint8 {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*ClientAuthNone) Handshake(net.Conn) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PasswordAuth is VNC authentication, 7.2.2
|
||||||
|
type PasswordAuth struct {
|
||||||
|
Password string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PasswordAuth) SecurityType() uint8 {
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PasswordAuth) Handshake(c net.Conn) error {
|
||||||
|
randomValue := make([]uint8, 16)
|
||||||
|
if err := binary.Read(c, binary.BigEndian, &randomValue); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
crypted, err := p.encrypt(p.Password, randomValue)
|
||||||
|
|
||||||
|
if (err != nil) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(c, binary.BigEndian, &crypted); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PasswordAuth) reverseBits(b byte) byte {
|
||||||
|
var reverse = [256]int{
|
||||||
|
0, 128, 64, 192, 32, 160, 96, 224,
|
||||||
|
16, 144, 80, 208, 48, 176, 112, 240,
|
||||||
|
8, 136, 72, 200, 40, 168, 104, 232,
|
||||||
|
24, 152, 88, 216, 56, 184, 120, 248,
|
||||||
|
4, 132, 68, 196, 36, 164, 100, 228,
|
||||||
|
20, 148, 84, 212, 52, 180, 116, 244,
|
||||||
|
12, 140, 76, 204, 44, 172, 108, 236,
|
||||||
|
28, 156, 92, 220, 60, 188, 124, 252,
|
||||||
|
2, 130, 66, 194, 34, 162, 98, 226,
|
||||||
|
18, 146, 82, 210, 50, 178, 114, 242,
|
||||||
|
10, 138, 74, 202, 42, 170, 106, 234,
|
||||||
|
26, 154, 90, 218, 58, 186, 122, 250,
|
||||||
|
6, 134, 70, 198, 38, 166, 102, 230,
|
||||||
|
22, 150, 86, 214, 54, 182, 118, 246,
|
||||||
|
14, 142, 78, 206, 46, 174, 110, 238,
|
||||||
|
30, 158, 94, 222, 62, 190, 126, 254,
|
||||||
|
1, 129, 65, 193, 33, 161, 97, 225,
|
||||||
|
17, 145, 81, 209, 49, 177, 113, 241,
|
||||||
|
9, 137, 73, 201, 41, 169, 105, 233,
|
||||||
|
25, 153, 89, 217, 57, 185, 121, 249,
|
||||||
|
5, 133, 69, 197, 37, 165, 101, 229,
|
||||||
|
21, 149, 85, 213, 53, 181, 117, 245,
|
||||||
|
13, 141, 77, 205, 45, 173, 109, 237,
|
||||||
|
29, 157, 93, 221, 61, 189, 125, 253,
|
||||||
|
3, 131, 67, 195, 35, 163, 99, 227,
|
||||||
|
19, 147, 83, 211, 51, 179, 115, 243,
|
||||||
|
11, 139, 75, 203, 43, 171, 107, 235,
|
||||||
|
27, 155, 91, 219, 59, 187, 123, 251,
|
||||||
|
7, 135, 71, 199, 39, 167, 103, 231,
|
||||||
|
23, 151, 87, 215, 55, 183, 119, 247,
|
||||||
|
15, 143, 79, 207, 47, 175, 111, 239,
|
||||||
|
31, 159, 95, 223, 63, 191, 127, 255,
|
||||||
|
}
|
||||||
|
|
||||||
|
return byte(reverse[int(b)])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PasswordAuth) encrypt(key string, bytes []byte) ([]byte, error) {
|
||||||
|
keyBytes := []byte{0,0,0,0,0,0,0,0}
|
||||||
|
|
||||||
|
if len(key) > 8 {
|
||||||
|
key = key[:8]
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < len(key); i++ {
|
||||||
|
keyBytes[i] = p.reverseBits(key[i])
|
||||||
|
}
|
||||||
|
|
||||||
|
block, err := des.NewCipher(keyBytes)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
result1 := make([]byte, 8)
|
||||||
|
block.Encrypt(result1, bytes)
|
||||||
|
result2 := make([]byte, 8)
|
||||||
|
block.Encrypt(result2, bytes[8:])
|
||||||
|
|
||||||
|
crypted := append(result1, result2...)
|
||||||
|
|
||||||
|
return crypted, nil
|
||||||
|
}
|
6
pkg/driver/vncdriver/vnc/color.go
Normal file
6
pkg/driver/vncdriver/vnc/color.go
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
package vnc
|
||||||
|
|
||||||
|
// Color represents a single color in a color map.
|
||||||
|
type Color struct {
|
||||||
|
R, G, B uint16
|
||||||
|
}
|
217
pkg/driver/vncdriver/vnc/encoding.go
Normal file
217
pkg/driver/vncdriver/vnc/encoding.go
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
package vnc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"compress/zlib"
|
||||||
|
"encoding/binary"
|
||||||
|
"io"
|
||||||
|
)
|
||||||
|
|
||||||
|
// An Encoding implements a method for encoding pixel data that is
|
||||||
|
// sent by the server to the client.
|
||||||
|
type Encoding interface {
|
||||||
|
// The number that uniquely identifies this encoding type.
|
||||||
|
Type() int32
|
||||||
|
|
||||||
|
// Read reads the contents of the encoded pixel data from the reader.
|
||||||
|
// This should return a new Encoding implementation that contains
|
||||||
|
// the proper data.
|
||||||
|
Read(*ClientConn, *Rectangle, io.Reader) (Encoding, error)
|
||||||
|
}
|
||||||
|
type CursorEncoding struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*CursorEncoding) Type() int32 {
|
||||||
|
return -239
|
||||||
|
}
|
||||||
|
func (*CursorEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encoding, error) {
|
||||||
|
size := int(rect.Height) * int(rect.Width) * int(c.PixelFormat.BPP) / 8
|
||||||
|
pixelBytes := make([]uint8, size)
|
||||||
|
if _, err := io.ReadFull(r, pixelBytes); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
mask := ((int(rect.Width) + 7) / 8) * int(rect.Height)
|
||||||
|
maskBytes := make([]uint8, mask)
|
||||||
|
if _, err := io.ReadFull(r, maskBytes); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &CursorEncoding{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RawEncoding is raw pixel data sent by the server.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.7.1
|
||||||
|
type RawEncoding struct {
|
||||||
|
Colors []Color
|
||||||
|
RawPixel []uint32 //RGBA
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*RawEncoding) Type() int32 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*RawEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encoding, error) {
|
||||||
|
//fmt.Println("RawEncoding")
|
||||||
|
bytesPerPixel := c.PixelFormat.BPP / 8
|
||||||
|
pixelBytes := make([]uint8, bytesPerPixel)
|
||||||
|
|
||||||
|
var byteOrder binary.ByteOrder = binary.LittleEndian
|
||||||
|
if c.PixelFormat.BigEndian {
|
||||||
|
byteOrder = binary.BigEndian
|
||||||
|
}
|
||||||
|
|
||||||
|
colors := make([]Color, int(rect.Height)*int(rect.Width))
|
||||||
|
rawPixels := make([]uint32, int(rect.Height)*int(rect.Width))
|
||||||
|
for y := uint16(0); y < rect.Height; y++ {
|
||||||
|
for x := uint16(0); x < rect.Width; x++ {
|
||||||
|
if _, err := io.ReadFull(r, pixelBytes); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var rawPixel uint32
|
||||||
|
if c.PixelFormat.BPP == 8 {
|
||||||
|
rawPixel = uint32(pixelBytes[0])
|
||||||
|
} else if c.PixelFormat.BPP == 16 {
|
||||||
|
rawPixel = uint32(byteOrder.Uint16(pixelBytes))
|
||||||
|
} else if c.PixelFormat.BPP == 32 {
|
||||||
|
rawPixel = byteOrder.Uint32(pixelBytes)
|
||||||
|
}
|
||||||
|
//rawPixels[int(y)*int(rect.Width)+int(x)]=rawPixel
|
||||||
|
color := &colors[int(y)*int(rect.Width)+int(x)]
|
||||||
|
if c.PixelFormat.TrueColor {
|
||||||
|
color.R = uint16((rawPixel >> c.PixelFormat.RedShift) & uint32(c.PixelFormat.RedMax))
|
||||||
|
color.G = uint16((rawPixel >> c.PixelFormat.GreenShift) & uint32(c.PixelFormat.GreenMax))
|
||||||
|
color.B = uint16((rawPixel >> c.PixelFormat.BlueShift) & uint32(c.PixelFormat.BlueMax))
|
||||||
|
if c.PixelFormat.BPP == 16 {
|
||||||
|
color.B = color.B<<3 | color.B>>2
|
||||||
|
color.G = color.G<<2 | color.G>>2
|
||||||
|
color.R = color.R<<3 | color.R>>2
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
*color = c.ColorMap[rawPixel]
|
||||||
|
}
|
||||||
|
rawPixels[int(y)*int(rect.Width)+int(x)] = uint32(0xff)<<24 | uint32(color.B)<<16 | uint32(color.G)<<8 | uint32(color.R)
|
||||||
|
//fmt.Printf("%x %x",rawPixel,rawPixels[int(y)*int(rect.Width)+int(x)])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &RawEncoding{colors, rawPixels}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ZlibEncoding is raw pixel data sent by the server compressed by Zlib.
|
||||||
|
//
|
||||||
|
// A single Zlib stream is created. There is only a single header for a framebuffer request response.
|
||||||
|
type ZlibEncoding struct {
|
||||||
|
Colors []Color
|
||||||
|
RawPixel []uint32
|
||||||
|
ZStream *bytes.Buffer
|
||||||
|
ZReader io.ReadCloser
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*ZlibEncoding) Type() int32 {
|
||||||
|
return 6
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ze *ZlibEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encoding, error) {
|
||||||
|
//fmt.Println("ZlibEncoding")
|
||||||
|
bytesPerPixel := c.PixelFormat.BPP / 8
|
||||||
|
pixelBytes := make([]uint8, bytesPerPixel)
|
||||||
|
|
||||||
|
var byteOrder binary.ByteOrder = binary.LittleEndian
|
||||||
|
if c.PixelFormat.BigEndian {
|
||||||
|
byteOrder = binary.BigEndian
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format
|
||||||
|
// 4 bytes | uint32 | length
|
||||||
|
// 'length' bytes | []byte | zlibData
|
||||||
|
// Read zlib length
|
||||||
|
var zipLength uint32
|
||||||
|
err := binary.Read(r, binary.BigEndian, &zipLength)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read all compressed data
|
||||||
|
zBytes := make([]byte, zipLength)
|
||||||
|
if _, err := io.ReadFull(r, zBytes); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create new zlib stream if needed
|
||||||
|
if ze.ZStream == nil {
|
||||||
|
// Create and save the buffer
|
||||||
|
ze.ZStream = new(bytes.Buffer)
|
||||||
|
ze.ZStream.Write(zBytes)
|
||||||
|
|
||||||
|
// Create a reader for the buffer
|
||||||
|
ze.ZReader, err = zlib.NewReader(ze.ZStream)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is needed to avoid 'zlib missing header'
|
||||||
|
} else {
|
||||||
|
// Just append if already created
|
||||||
|
ze.ZStream.Write(zBytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate zlib decompressed size
|
||||||
|
sizeToRead := int(rect.Height) * int(rect.Width) * int(bytesPerPixel)
|
||||||
|
|
||||||
|
// Create buffer for bytes
|
||||||
|
colorBytes := make([]byte, sizeToRead)
|
||||||
|
|
||||||
|
// Read all data from zlib stream
|
||||||
|
read, err := io.ReadFull(ze.ZReader, colorBytes)
|
||||||
|
if read != sizeToRead || err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create buffer for raw encoding
|
||||||
|
colorReader := bytes.NewReader(colorBytes)
|
||||||
|
|
||||||
|
colors := make([]Color, int(rect.Height)*int(rect.Width))
|
||||||
|
rawPixels := make([]uint32, int(rect.Height)*int(rect.Width))
|
||||||
|
for y := uint16(0); y < rect.Height; y++ {
|
||||||
|
for x := uint16(0); x < rect.Width; x++ {
|
||||||
|
if _, err := io.ReadFull(colorReader, pixelBytes); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var rawPixel uint32
|
||||||
|
if c.PixelFormat.BPP == 8 {
|
||||||
|
rawPixel = uint32(pixelBytes[0])
|
||||||
|
} else if c.PixelFormat.BPP == 16 {
|
||||||
|
rawPixel = uint32(byteOrder.Uint16(pixelBytes))
|
||||||
|
} else if c.PixelFormat.BPP == 32 {
|
||||||
|
rawPixel = byteOrder.Uint32(pixelBytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
color := &colors[int(y)*int(rect.Width)+int(x)]
|
||||||
|
if c.PixelFormat.TrueColor {
|
||||||
|
color.R = uint16((rawPixel >> c.PixelFormat.RedShift) & uint32(c.PixelFormat.RedMax))
|
||||||
|
color.G = uint16((rawPixel >> c.PixelFormat.GreenShift) & uint32(c.PixelFormat.GreenMax))
|
||||||
|
color.B = uint16((rawPixel >> c.PixelFormat.BlueShift) & uint32(c.PixelFormat.BlueMax))
|
||||||
|
if c.PixelFormat.BPP == 16 {
|
||||||
|
color.B = color.B<<3 | color.B>>2
|
||||||
|
color.G = color.G<<2 | color.G>>2
|
||||||
|
color.R = color.R<<3 | color.R>>2
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
*color = c.ColorMap[rawPixel]
|
||||||
|
}
|
||||||
|
rawPixels[int(y)*int(rect.Width)+int(x)] = uint32(0xff)<<24 | uint32(color.B)<<16 | uint32(color.G)<<8 | uint32(color.R)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &ZlibEncoding{Colors: colors, RawPixel: rawPixels}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ze *ZlibEncoding) Close() {
|
||||||
|
if ze.ZStream != nil {
|
||||||
|
ze.ZStream = nil
|
||||||
|
ze.ZReader.Close()
|
||||||
|
ze.ZReader = nil
|
||||||
|
}
|
||||||
|
}
|
151
pkg/driver/vncdriver/vnc/pixel_format.go
Normal file
151
pkg/driver/vncdriver/vnc/pixel_format.go
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
package vnc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"io"
|
||||||
|
)
|
||||||
|
|
||||||
|
// PixelFormat describes the way a pixel is formatted for a VNC connection.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.4 for information on each of the fields.
|
||||||
|
type PixelFormat struct {
|
||||||
|
BPP uint8
|
||||||
|
Depth uint8
|
||||||
|
BigEndian bool
|
||||||
|
TrueColor bool
|
||||||
|
RedMax uint16
|
||||||
|
GreenMax uint16
|
||||||
|
BlueMax uint16
|
||||||
|
RedShift uint8
|
||||||
|
GreenShift uint8
|
||||||
|
BlueShift uint8
|
||||||
|
}
|
||||||
|
|
||||||
|
func readPixelFormat(r io.Reader, result *PixelFormat) error {
|
||||||
|
var rawPixelFormat [16]byte
|
||||||
|
if _, err := io.ReadFull(r, rawPixelFormat[:]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var pfBoolByte uint8
|
||||||
|
brPF := bytes.NewReader(rawPixelFormat[:])
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.BPP); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.Depth); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &pfBoolByte); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if pfBoolByte != 0 {
|
||||||
|
// Big endian is true
|
||||||
|
result.BigEndian = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &pfBoolByte); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if pfBoolByte != 0 {
|
||||||
|
// True Color is true. So we also have to read all the color max & shifts.
|
||||||
|
result.TrueColor = true
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.RedMax); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.GreenMax); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.BlueMax); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.RedShift); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.GreenShift); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Read(brPF, binary.BigEndian, &result.BlueShift); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writePixelFormat(format *PixelFormat) ([]byte, error) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
// Byte 1
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.BPP); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Byte 2
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.Depth); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var boolByte byte
|
||||||
|
if format.BigEndian {
|
||||||
|
boolByte = 1
|
||||||
|
} else {
|
||||||
|
boolByte = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// Byte 3 (BigEndian)
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, boolByte); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if format.TrueColor {
|
||||||
|
boolByte = 1
|
||||||
|
} else {
|
||||||
|
boolByte = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// Byte 4 (TrueColor)
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, boolByte); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we have true color enabled then we have to fill in the rest of the
|
||||||
|
// structure with the color values.
|
||||||
|
if format.TrueColor {
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.RedMax); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.GreenMax); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.BlueMax); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.RedShift); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.GreenShift); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := binary.Write(&buf, binary.BigEndian, format.BlueShift); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf.Bytes()[0:16], nil
|
||||||
|
}
|
16
pkg/driver/vncdriver/vnc/pointer.go
Normal file
16
pkg/driver/vncdriver/vnc/pointer.go
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package vnc
|
||||||
|
|
||||||
|
// ButtonMask represents a mask of pointer presses/releases.
|
||||||
|
type ButtonMask uint8
|
||||||
|
|
||||||
|
// All available button mask components.
|
||||||
|
const (
|
||||||
|
ButtonLeft ButtonMask = 1 << iota
|
||||||
|
ButtonMiddle
|
||||||
|
ButtonRight
|
||||||
|
Button4
|
||||||
|
Button5
|
||||||
|
Button6
|
||||||
|
Button7
|
||||||
|
Button8
|
||||||
|
)
|
192
pkg/driver/vncdriver/vnc/server_messages.go
Normal file
192
pkg/driver/vncdriver/vnc/server_messages.go
Normal file
@@ -0,0 +1,192 @@
|
|||||||
|
package vnc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A ServerMessage implements a message sent from the server to the client.
|
||||||
|
type ServerMessage interface {
|
||||||
|
// The type of the message that is sent down on the wire.
|
||||||
|
Type() uint8
|
||||||
|
|
||||||
|
// Read reads the contents of the message from the reader. At the point
|
||||||
|
// this is called, the message type has already been read from the reader.
|
||||||
|
// This should return a new ServerMessage that is the appropriate type.
|
||||||
|
Read(*ClientConn, io.Reader) (ServerMessage, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FramebufferUpdateMessage consists of a sequence of rectangles of
|
||||||
|
// pixel data that the client should put into its framebuffer.
|
||||||
|
type FramebufferUpdateMessage struct {
|
||||||
|
Rectangles []Rectangle
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rectangle represents a rectangle of pixel data.
|
||||||
|
type Rectangle struct {
|
||||||
|
X uint16
|
||||||
|
Y uint16
|
||||||
|
Width uint16
|
||||||
|
Height uint16
|
||||||
|
Enc Encoding
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*FramebufferUpdateMessage) Type() uint8 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*FramebufferUpdateMessage) Read(c *ClientConn, r io.Reader) (ServerMessage, error) {
|
||||||
|
// Read off the padding
|
||||||
|
var padding [1]byte
|
||||||
|
if _, err := io.ReadFull(r, padding[:]); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var numRects uint16
|
||||||
|
if err := binary.Read(r, binary.BigEndian, &numRects); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build the map of encodings supported
|
||||||
|
encMap := make(map[int32]Encoding)
|
||||||
|
for _, enc := range c.Encs {
|
||||||
|
encMap[enc.Type()] = enc
|
||||||
|
}
|
||||||
|
|
||||||
|
// We must always support the raw encoding
|
||||||
|
rawEnc := new(RawEncoding)
|
||||||
|
encMap[rawEnc.Type()] = rawEnc
|
||||||
|
|
||||||
|
rects := make([]Rectangle, numRects)
|
||||||
|
for i := uint16(0); i < numRects; i++ {
|
||||||
|
var encodingType int32
|
||||||
|
|
||||||
|
rect := &rects[i]
|
||||||
|
data := []interface{}{
|
||||||
|
&rect.X,
|
||||||
|
&rect.Y,
|
||||||
|
&rect.Width,
|
||||||
|
&rect.Height,
|
||||||
|
&encodingType,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range data {
|
||||||
|
if err := binary.Read(r, binary.BigEndian, val); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enc, ok := encMap[encodingType]
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("unsupported encoding type: %d", encodingType)
|
||||||
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
|
rect.Enc, err = enc.Read(c, rect, r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &FramebufferUpdateMessage{rects}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetColorMapEntriesMessage is sent by the server to set values into
|
||||||
|
// the color map. This message will automatically update the color map
|
||||||
|
// for the associated connection, but contains the color change data
|
||||||
|
// if the consumer wants to read it.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.6.2
|
||||||
|
type SetColorMapEntriesMessage struct {
|
||||||
|
FirstColor uint16
|
||||||
|
Colors []Color
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*SetColorMapEntriesMessage) Type() uint8 {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*SetColorMapEntriesMessage) Read(c *ClientConn, r io.Reader) (ServerMessage, error) {
|
||||||
|
// Read off the padding
|
||||||
|
var padding [1]byte
|
||||||
|
if _, err := io.ReadFull(r, padding[:]); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var result SetColorMapEntriesMessage
|
||||||
|
if err := binary.Read(r, binary.BigEndian, &result.FirstColor); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var numColors uint16
|
||||||
|
if err := binary.Read(r, binary.BigEndian, &numColors); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
result.Colors = make([]Color, numColors)
|
||||||
|
for i := uint16(0); i < numColors; i++ {
|
||||||
|
|
||||||
|
color := &result.Colors[i]
|
||||||
|
data := []interface{}{
|
||||||
|
&color.R,
|
||||||
|
&color.G,
|
||||||
|
&color.B,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range data {
|
||||||
|
if err := binary.Read(r, binary.BigEndian, val); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the connection's color map
|
||||||
|
c.ColorMap[result.FirstColor+i] = *color
|
||||||
|
}
|
||||||
|
|
||||||
|
return &result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bell signals that an audible bell should be made on the client.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.6.3
|
||||||
|
type BellMessage byte
|
||||||
|
|
||||||
|
func (*BellMessage) Type() uint8 {
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*BellMessage) Read(*ClientConn, io.Reader) (ServerMessage, error) {
|
||||||
|
return new(BellMessage), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServerCutTextMessage indicates the server has new text in the cut buffer.
|
||||||
|
//
|
||||||
|
// See RFC 6143 Section 7.6.4
|
||||||
|
type ServerCutTextMessage struct {
|
||||||
|
Text string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*ServerCutTextMessage) Type() uint8 {
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*ServerCutTextMessage) Read(c *ClientConn, r io.Reader) (ServerMessage, error) {
|
||||||
|
// Read off the padding
|
||||||
|
var padding [3]byte
|
||||||
|
if _, err := io.ReadFull(r, padding[:]); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var textLength uint32
|
||||||
|
if err := binary.Read(r, binary.BigEndian, &textLength); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
textBytes := make([]uint8, textLength)
|
||||||
|
if err := binary.Read(r, binary.BigEndian, &textBytes); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &ServerCutTextMessage{string(textBytes)}, nil
|
||||||
|
}
|
180
pkg/driver/vncdriver/vncdriver.go
Normal file
180
pkg/driver/vncdriver/vncdriver.go
Normal file
@@ -0,0 +1,180 @@
|
|||||||
|
// Package videotest provides vncDevice video driver for testing.
|
||||||
|
package vncdriver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"image"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices/pkg/driver/vncdriver/vnc"
|
||||||
|
|
||||||
|
"github.com/pion/mediadevices/pkg/frame"
|
||||||
|
"github.com/pion/mediadevices/pkg/io/video"
|
||||||
|
"github.com/pion/mediadevices/pkg/prop"
|
||||||
|
)
|
||||||
|
|
||||||
|
type vncDevice struct {
|
||||||
|
closed <-chan struct{}
|
||||||
|
cancel func()
|
||||||
|
tick *time.Ticker
|
||||||
|
h, w int
|
||||||
|
rawPixel []byte
|
||||||
|
mutex sync.Mutex
|
||||||
|
vClient *vnc.ClientConn
|
||||||
|
vncAddr string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewVnc(vncAddr string) *vncDevice {
|
||||||
|
return &vncDevice{vncAddr: vncAddr}
|
||||||
|
}
|
||||||
|
func (d *vncDevice) PointerEvent(mask uint8, x, y uint16) {
|
||||||
|
if d.vClient != nil {
|
||||||
|
d.vClient.PointerEvent(vnc.ButtonMask(mask), x, y)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func (d *vncDevice) KeyEvent(keysym uint32, down bool) {
|
||||||
|
if d.vClient != nil {
|
||||||
|
d.vClient.KeyEvent(keysym, down)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func (d *vncDevice) Open() error {
|
||||||
|
if d.vClient != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
d.closed = ctx.Done()
|
||||||
|
d.cancel = cancel
|
||||||
|
msg := make(chan vnc.ServerMessage, 1)
|
||||||
|
//auth:=new(vnc.PasswordAuth)
|
||||||
|
//auth.Password="####"
|
||||||
|
conf := vnc.ClientConfig{
|
||||||
|
//Auth: []vnc.ClientAuth{auth},
|
||||||
|
ServerMessageCh: msg,
|
||||||
|
Exclusive: false,
|
||||||
|
}
|
||||||
|
d.mutex.Lock()
|
||||||
|
defer d.mutex.Unlock()
|
||||||
|
conn, err := net.Dial("tcp", d.vncAddr)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.vClient, err = vnc.Client(conn, &conf)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.vClient.SetEncodings([]vnc.Encoding{
|
||||||
|
&vnc.ZlibEncoding{},
|
||||||
|
&vnc.RawEncoding{},
|
||||||
|
&vnc.CursorEncoding{},
|
||||||
|
})
|
||||||
|
d.w = int(d.vClient.FrameBufferWidth)
|
||||||
|
d.h = int(d.vClient.FrameBufferHeight)
|
||||||
|
|
||||||
|
d.rawPixel = make([]byte, d.h*d.w*4)
|
||||||
|
|
||||||
|
go func(ctx context.Context) {
|
||||||
|
c, cancel := context.WithCancel(ctx)
|
||||||
|
defer cancel()
|
||||||
|
if d.vClient == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
d.vClient.FramebufferUpdateRequest(true, 0, 0, uint16(d.w), uint16(d.h))
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-c.Done():
|
||||||
|
return
|
||||||
|
case msg := <-msg:
|
||||||
|
switch t := msg.(type) {
|
||||||
|
case *vnc.FramebufferUpdateMessage:
|
||||||
|
for _, rect := range t.Rectangles {
|
||||||
|
var pix []uint32
|
||||||
|
switch t := rect.Enc.(type) {
|
||||||
|
case *vnc.CursorEncoding:
|
||||||
|
//ignore remote cursor messages
|
||||||
|
continue
|
||||||
|
case *vnc.RawEncoding:
|
||||||
|
pix = t.RawPixel
|
||||||
|
case *vnc.ZlibEncoding:
|
||||||
|
pix = t.RawPixel
|
||||||
|
}
|
||||||
|
for y := int(rect.Y); y < int(rect.Height+rect.Y); y++ {
|
||||||
|
for x := int(rect.X); x < int(rect.Width+rect.X); x++ {
|
||||||
|
binary.LittleEndian.PutUint32(d.rawPixel[(y*d.w+x)*4:], pix[(y-int(rect.Y))*int(rect.Width)+(x-int(rect.X))])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
d.vClient.FramebufferUpdateRequest(true, 0, 0, uint16(d.w), uint16(d.h))
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
|
||||||
|
}
|
||||||
|
case <-time.After(10 * time.Second):
|
||||||
|
if d.vClient.FramebufferUpdateRequest(true, 0, 0, uint16(d.w), uint16(d.h)) != nil {
|
||||||
|
d.cancel()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(ctx)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *vncDevice) Close() error {
|
||||||
|
d.cancel()
|
||||||
|
if d.tick != nil {
|
||||||
|
d.tick.Stop()
|
||||||
|
}
|
||||||
|
d.mutex.Lock()
|
||||||
|
defer d.mutex.Unlock()
|
||||||
|
if d.vClient != nil {
|
||||||
|
d.vClient.Close()
|
||||||
|
d.vClient = nil
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *vncDevice) VideoRecord(p prop.Media) (video.Reader, error) {
|
||||||
|
if p.FrameRate == 0 {
|
||||||
|
p.FrameRate = 30
|
||||||
|
}
|
||||||
|
|
||||||
|
tick := time.NewTicker(time.Duration(float32(time.Second) / p.FrameRate))
|
||||||
|
d.tick = tick
|
||||||
|
closed := d.closed
|
||||||
|
r := video.ReaderFunc(func() (image.Image, func(), error) {
|
||||||
|
select {
|
||||||
|
case <-closed:
|
||||||
|
fmt.Println("Stop Record Video By VideoRecord")
|
||||||
|
return nil, func() {}, io.EOF
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
|
<-tick.C
|
||||||
|
return &image.RGBA{
|
||||||
|
Pix: d.rawPixel,
|
||||||
|
Stride: 4,
|
||||||
|
Rect: image.Rect(0, 0, d.w, d.h),
|
||||||
|
}, func() {}, nil
|
||||||
|
})
|
||||||
|
|
||||||
|
return r, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *vncDevice) Properties() []prop.Media {
|
||||||
|
return []prop.Media{
|
||||||
|
{
|
||||||
|
Video: prop.Video{
|
||||||
|
Width: d.w,
|
||||||
|
Height: d.h,
|
||||||
|
FrameFormat: frame.FormatRGBA,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
@@ -141,7 +141,9 @@ func (broadcaster *Broadcaster) NewReader(copyFn func(interface{}) interface{})
|
|||||||
data, err, currentCount = ringData.data, ringData.err, ringData.count
|
data, err, currentCount = ringData.data, ringData.err, ringData.count
|
||||||
}
|
}
|
||||||
|
|
||||||
data = copyFn(data)
|
if data != nil { // data is nil if an error occurred during reading
|
||||||
|
data = copyFn(data)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
package video
|
package video
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"image"
|
"image"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -47,3 +48,21 @@ func TestBroadcast(t *testing.T) {
|
|||||||
t.Fatal("Expected actual frame without copy to be the same with the original")
|
t.Fatal("Expected actual frame without copy to be the same with the original")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBroadcastWithCopyOnReadError(t *testing.T) {
|
||||||
|
expectedError := errors.New("expected error")
|
||||||
|
source := ReaderFunc(func() (image.Image, func(), error) {
|
||||||
|
return nil, func() {}, expectedError
|
||||||
|
})
|
||||||
|
|
||||||
|
broadcaster := NewBroadcaster(source, nil)
|
||||||
|
readerWithCopy := broadcaster.NewReader(true)
|
||||||
|
actualWithCopy, _, err := readerWithCopy.Read()
|
||||||
|
|
||||||
|
if actualWithCopy != nil {
|
||||||
|
t.Fatal("Expected actual frame with copy to be nil")
|
||||||
|
}
|
||||||
|
if err != expectedError {
|
||||||
|
t.Fatal("Expected error to be the same")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -73,16 +73,15 @@ func ToI420(r Reader) Reader {
|
|||||||
|
|
||||||
// Covert pixel format to I420
|
// Covert pixel format to I420
|
||||||
switch yuvImg.SubsampleRatio {
|
switch yuvImg.SubsampleRatio {
|
||||||
case image.YCbCrSubsampleRatio444:
|
|
||||||
i444ToI420(&yuvImg)
|
|
||||||
case image.YCbCrSubsampleRatio422:
|
|
||||||
i422ToI420(&yuvImg)
|
|
||||||
case image.YCbCrSubsampleRatio420:
|
case image.YCbCrSubsampleRatio420:
|
||||||
|
case image.YCbCrSubsampleRatio444:
|
||||||
|
yuvImg = i444ToI420(yuvImg)
|
||||||
|
case image.YCbCrSubsampleRatio422:
|
||||||
|
yuvImg = i422ToI420(yuvImg)
|
||||||
default:
|
default:
|
||||||
return nil, func() {}, fmt.Errorf("unsupported pixel format: %s", yuvImg.SubsampleRatio)
|
return nil, func() {}, fmt.Errorf("unsupported pixel format: %s", yuvImg.SubsampleRatio)
|
||||||
}
|
}
|
||||||
|
|
||||||
yuvImg.SubsampleRatio = image.YCbCrSubsampleRatio420
|
|
||||||
return &yuvImg, func() {}, nil
|
return &yuvImg, func() {}, nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@@ -3,6 +3,8 @@
|
|||||||
#include "_cgo_export.h"
|
#include "_cgo_export.h"
|
||||||
|
|
||||||
void i444ToI420CGO(
|
void i444ToI420CGO(
|
||||||
|
unsigned char *cb_dst,
|
||||||
|
unsigned char *cr_dst,
|
||||||
unsigned char* cb,
|
unsigned char* cb,
|
||||||
unsigned char* cr,
|
unsigned char* cr,
|
||||||
const int stride, const int h)
|
const int stride, const int h)
|
||||||
@@ -22,8 +24,8 @@ void i444ToI420CGO(
|
|||||||
((uint16_t)cr[isrc0] + (uint16_t)cr[isrc1] +
|
((uint16_t)cr[isrc0] + (uint16_t)cr[isrc1] +
|
||||||
(uint16_t)cr[isrc0 + 1] + (uint16_t)cr[isrc1 + 1]) /
|
(uint16_t)cr[isrc0 + 1] + (uint16_t)cr[isrc1 + 1]) /
|
||||||
4;
|
4;
|
||||||
cb[idst] = cb2;
|
cb_dst[idst] = cb2;
|
||||||
cr[idst] = cr2;
|
cr_dst[idst] = cr2;
|
||||||
isrc0 += 2;
|
isrc0 += 2;
|
||||||
isrc1 += 2;
|
isrc1 += 2;
|
||||||
idst++;
|
idst++;
|
||||||
@@ -34,6 +36,8 @@ void i444ToI420CGO(
|
|||||||
}
|
}
|
||||||
|
|
||||||
void i422ToI420CGO(
|
void i422ToI420CGO(
|
||||||
|
unsigned char *cb_dst,
|
||||||
|
unsigned char *cr_dst,
|
||||||
unsigned char* cb,
|
unsigned char* cb,
|
||||||
unsigned char* cr,
|
unsigned char* cr,
|
||||||
const int stride, const int h)
|
const int stride, const int h)
|
||||||
@@ -46,8 +50,8 @@ void i422ToI420CGO(
|
|||||||
{
|
{
|
||||||
const uint8_t cb2 = ((uint16_t)cb[isrc] + (uint16_t)cb[isrc + stride]) / 2;
|
const uint8_t cb2 = ((uint16_t)cb[isrc] + (uint16_t)cb[isrc + stride]) / 2;
|
||||||
const uint8_t cr2 = ((uint16_t)cr[isrc] + (uint16_t)cr[isrc + stride]) / 2;
|
const uint8_t cr2 = ((uint16_t)cr[isrc] + (uint16_t)cr[isrc + stride]) / 2;
|
||||||
cb[idst] = cb2;
|
cb_dst[idst] = cb2;
|
||||||
cr[idst] = cr2;
|
cr_dst[idst] = cr2;
|
||||||
isrc++;
|
isrc++;
|
||||||
idst++;
|
idst++;
|
||||||
}
|
}
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build cgo
|
||||||
// +build cgo
|
// +build cgo
|
||||||
|
|
||||||
package video
|
package video
|
||||||
@@ -14,27 +15,35 @@ import "C"
|
|||||||
// All functions switched at runtime must be declared also in convert_nocgo.go.
|
// All functions switched at runtime must be declared also in convert_nocgo.go.
|
||||||
const hasCGOConvert = true
|
const hasCGOConvert = true
|
||||||
|
|
||||||
func i444ToI420(img *image.YCbCr) {
|
func i444ToI420(img image.YCbCr) image.YCbCr {
|
||||||
h := img.Rect.Dy()
|
h := img.Rect.Dy()
|
||||||
|
cLen := img.CStride * h / 4
|
||||||
|
cbDst, crDst := make([]uint8, cLen), make([]uint8, cLen)
|
||||||
C.i444ToI420CGO(
|
C.i444ToI420CGO(
|
||||||
|
(*C.uchar)(&cbDst[0]), (*C.uchar)(&crDst[0]),
|
||||||
(*C.uchar)(&img.Cb[0]), (*C.uchar)(&img.Cr[0]),
|
(*C.uchar)(&img.Cb[0]), (*C.uchar)(&img.Cr[0]),
|
||||||
C.int(img.CStride), C.int(h),
|
C.int(img.CStride), C.int(h),
|
||||||
)
|
)
|
||||||
img.CStride = img.CStride / 2
|
img.CStride = img.CStride / 2
|
||||||
cLen := img.CStride * (h / 2)
|
img.Cb = cbDst
|
||||||
img.Cb = img.Cb[:cLen]
|
img.Cr = crDst
|
||||||
img.Cr = img.Cr[:cLen]
|
img.SubsampleRatio = image.YCbCrSubsampleRatio420
|
||||||
|
return img
|
||||||
}
|
}
|
||||||
|
|
||||||
func i422ToI420(img *image.YCbCr) {
|
func i422ToI420(img image.YCbCr) image.YCbCr {
|
||||||
h := img.Rect.Dy()
|
h := img.Rect.Dy()
|
||||||
|
cLen := img.CStride * (h / 2)
|
||||||
|
cbDst, crDst := make([]uint8, cLen), make([]uint8, cLen)
|
||||||
C.i422ToI420CGO(
|
C.i422ToI420CGO(
|
||||||
|
(*C.uchar)(&cbDst[0]), (*C.uchar)(&crDst[0]),
|
||||||
(*C.uchar)(&img.Cb[0]), (*C.uchar)(&img.Cr[0]),
|
(*C.uchar)(&img.Cb[0]), (*C.uchar)(&img.Cr[0]),
|
||||||
C.int(img.CStride), C.int(h),
|
C.int(img.CStride), C.int(h),
|
||||||
)
|
)
|
||||||
cLen := img.CStride * (h / 2)
|
img.Cb = cbDst
|
||||||
img.Cb = img.Cb[:cLen]
|
img.Cr = crDst
|
||||||
img.Cr = img.Cr[:cLen]
|
img.SubsampleRatio = image.YCbCrSubsampleRatio420
|
||||||
|
return img
|
||||||
}
|
}
|
||||||
|
|
||||||
func rgbToYCbCrCGO(y, cb, cr *uint8, r, g, b uint8) { // For testing
|
func rgbToYCbCrCGO(y, cb, cr *uint8, r, g, b uint8) { // For testing
|
||||||
|
@@ -1,9 +1,13 @@
|
|||||||
void i444ToI420CGO(
|
void i444ToI420CGO(
|
||||||
|
unsigned char *cb_dst,
|
||||||
|
unsigned char *cr_dst,
|
||||||
unsigned char* cb,
|
unsigned char* cb,
|
||||||
unsigned char* cr,
|
unsigned char* cr,
|
||||||
const int stride, const int h);
|
const int stride, const int h);
|
||||||
|
|
||||||
void i422ToI420CGO(
|
void i422ToI420CGO(
|
||||||
|
unsigned char *cb_dst,
|
||||||
|
unsigned char *cr_dst,
|
||||||
unsigned char* cb,
|
unsigned char* cb,
|
||||||
unsigned char* cr,
|
unsigned char* cr,
|
||||||
const int stride, const int h);
|
const int stride, const int h);
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
//go:build !cgo
|
||||||
// +build !cgo
|
// +build !cgo
|
||||||
|
|
||||||
package video
|
package video
|
||||||
@@ -9,19 +10,22 @@ import (
|
|||||||
|
|
||||||
const hasCGOConvert = false
|
const hasCGOConvert = false
|
||||||
|
|
||||||
func i444ToI420(img *image.YCbCr) {
|
func i444ToI420(img image.YCbCr) image.YCbCr {
|
||||||
h := img.Rect.Dy()
|
h := img.Rect.Dy()
|
||||||
addrSrc0 := 0
|
addrSrc0 := 0
|
||||||
addrSrc1 := img.CStride
|
addrSrc1 := img.CStride
|
||||||
|
cLen := img.CStride * (h / 2)
|
||||||
addrDst := 0
|
addrDst := 0
|
||||||
|
cbDst, crDst := make([]uint8, cLen), make([]uint8, cLen)
|
||||||
|
|
||||||
for i := 0; i < h/2; i++ {
|
for i := 0; i < h/2; i++ {
|
||||||
for j := 0; j < img.CStride/2; j++ {
|
for j := 0; j < img.CStride/2; j++ {
|
||||||
cb := uint16(img.Cb[addrSrc0]) + uint16(img.Cb[addrSrc1]) +
|
cb := uint16(img.Cb[addrSrc0]) + uint16(img.Cb[addrSrc1]) +
|
||||||
uint16(img.Cb[addrSrc0+1]) + uint16(img.Cb[addrSrc1+1])
|
uint16(img.Cb[addrSrc0+1]) + uint16(img.Cb[addrSrc1+1])
|
||||||
cr := uint16(img.Cr[addrSrc0]) + uint16(img.Cr[addrSrc1]) +
|
cr := uint16(img.Cr[addrSrc0]) + uint16(img.Cr[addrSrc1]) +
|
||||||
uint16(img.Cr[addrSrc0+1]) + uint16(img.Cr[addrSrc1+1])
|
uint16(img.Cr[addrSrc0+1]) + uint16(img.Cr[addrSrc1+1])
|
||||||
img.Cb[addrDst] = uint8(cb / 4)
|
cbDst[addrDst] = uint8(cb / 4)
|
||||||
img.Cr[addrDst] = uint8(cr / 4)
|
crDst[addrDst] = uint8(cr / 4)
|
||||||
addrSrc0 += 2
|
addrSrc0 += 2
|
||||||
addrSrc1 += 2
|
addrSrc1 += 2
|
||||||
addrDst++
|
addrDst++
|
||||||
@@ -30,29 +34,34 @@ func i444ToI420(img *image.YCbCr) {
|
|||||||
addrSrc1 += img.CStride
|
addrSrc1 += img.CStride
|
||||||
}
|
}
|
||||||
img.CStride = img.CStride / 2
|
img.CStride = img.CStride / 2
|
||||||
cLen := img.CStride * (h / 2)
|
img.Cb = cbDst
|
||||||
img.Cb = img.Cb[:cLen]
|
img.Cr = crDst
|
||||||
img.Cr = img.Cr[:cLen]
|
img.SubsampleRatio = image.YCbCrSubsampleRatio420
|
||||||
|
return img
|
||||||
}
|
}
|
||||||
|
|
||||||
func i422ToI420(img *image.YCbCr) {
|
func i422ToI420(img image.YCbCr) image.YCbCr {
|
||||||
h := img.Rect.Dy()
|
h := img.Rect.Dy()
|
||||||
addrSrc := 0
|
addrSrc := 0
|
||||||
|
cLen := img.CStride * (h / 2)
|
||||||
|
cbDst, crDst := make([]uint8, cLen), make([]uint8, cLen)
|
||||||
addrDst := 0
|
addrDst := 0
|
||||||
|
|
||||||
for i := 0; i < h/2; i++ {
|
for i := 0; i < h/2; i++ {
|
||||||
for j := 0; j < img.CStride; j++ {
|
for j := 0; j < img.CStride; j++ {
|
||||||
cb := uint16(img.Cb[addrSrc]) + uint16(img.Cb[addrSrc+img.CStride])
|
cb := uint16(img.Cb[addrSrc]) + uint16(img.Cb[addrSrc+img.CStride])
|
||||||
cr := uint16(img.Cr[addrSrc]) + uint16(img.Cr[addrSrc+img.CStride])
|
cr := uint16(img.Cr[addrSrc]) + uint16(img.Cr[addrSrc+img.CStride])
|
||||||
img.Cb[addrDst] = uint8(cb / 2)
|
cbDst[addrDst] = uint8(cb / 4)
|
||||||
img.Cr[addrDst] = uint8(cr / 2)
|
crDst[addrDst] = uint8(cr / 4)
|
||||||
addrDst++
|
|
||||||
addrSrc++
|
addrSrc++
|
||||||
|
addrDst++
|
||||||
}
|
}
|
||||||
addrSrc += img.CStride
|
addrSrc += img.CStride
|
||||||
}
|
}
|
||||||
cLen := img.CStride * (h / 2)
|
img.Cb = cbDst
|
||||||
img.Cb = img.Cb[:cLen]
|
img.Cr = crDst
|
||||||
img.Cr = img.Cr[:cLen]
|
img.SubsampleRatio = image.YCbCrSubsampleRatio420
|
||||||
|
return img
|
||||||
}
|
}
|
||||||
|
|
||||||
func i444ToRGBA(dst *image.RGBA, src *image.YCbCr) {
|
func i444ToRGBA(dst *image.RGBA, src *image.YCbCr) {
|
||||||
|
@@ -222,8 +222,8 @@ func BenchmarkToI420(b *testing.B) {
|
|||||||
"RGBA": image.NewRGBA(image.Rect(0, 0, sz[0], sz[1])),
|
"RGBA": image.NewRGBA(image.Rect(0, 0, sz[0], sz[1])),
|
||||||
}
|
}
|
||||||
b.Run(name, func(b *testing.B) {
|
b.Run(name, func(b *testing.B) {
|
||||||
for name, img := range cases {
|
for _, name := range [...]string{"I444", "I422", "I420", "RGBA"} {
|
||||||
img := img
|
img := cases[name]
|
||||||
b.Run(name, func(b *testing.B) {
|
b.Run(name, func(b *testing.B) {
|
||||||
r := ToI420(ReaderFunc(func() (image.Image, func(), error) {
|
r := ToI420(ReaderFunc(func() (image.Image, func(), error) {
|
||||||
return img, func() {}, nil
|
return img, func() {}, nil
|
||||||
|
@@ -109,7 +109,7 @@ func Scale(width, height int, scaler Scaler) TransformFunc {
|
|||||||
yDy := rect.Dy()
|
yDy := rect.Dy()
|
||||||
cRect := fixedRect(rect, i1.SubsampleRatio)
|
cRect := fixedRect(rect, i1.SubsampleRatio)
|
||||||
cDx := cRect.Dx()
|
cDx := cRect.Dx()
|
||||||
cDy := cRect.Dx()
|
cDy := cRect.Dy()
|
||||||
yLen := yDx * yDy
|
yLen := yDx * yDy
|
||||||
cLen := cDx * cDy
|
cLen := cDx * cDy
|
||||||
if len(imgDst.Y) < yLen {
|
if len(imgDst.Y) < yLen {
|
||||||
|
@@ -36,6 +36,32 @@ func TestScale(t *testing.T) {
|
|||||||
Rect: image.Rect(0, 0, 2, 2),
|
Rect: image.Rect(0, 0, 2, 2),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"RGBASameSize": {
|
||||||
|
src: &image.RGBA{
|
||||||
|
Pix: []uint8{
|
||||||
|
// R G B A | R G B A | R G B A | R G B A
|
||||||
|
0x80, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF,
|
||||||
|
0x80, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF,
|
||||||
|
0x00, 0x40, 0x00, 0xFF, 0x00, 0x40, 0x00, 0xFF, 0x00, 0x00, 0x60, 0xFF, 0x00, 0x00, 0x60, 0xFF,
|
||||||
|
0x00, 0x40, 0x00, 0xFF, 0x00, 0x40, 0x00, 0xFF, 0x00, 0x00, 0x60, 0xFF, 0x00, 0x00, 0x60, 0xFF,
|
||||||
|
},
|
||||||
|
Stride: 16,
|
||||||
|
Rect: image.Rect(0, 0, 4, 4),
|
||||||
|
},
|
||||||
|
width: 4,
|
||||||
|
height: 4,
|
||||||
|
expected: &image.RGBA{
|
||||||
|
Pix: []uint8{
|
||||||
|
// R G B A | R G B A | R G B A | R G B A
|
||||||
|
0x80, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF,
|
||||||
|
0x80, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF,
|
||||||
|
0x00, 0x40, 0x00, 0xFF, 0x00, 0x40, 0x00, 0xFF, 0x00, 0x00, 0x60, 0xFF, 0x00, 0x00, 0x60, 0xFF,
|
||||||
|
0x00, 0x40, 0x00, 0xFF, 0x00, 0x40, 0x00, 0xFF, 0x00, 0x00, 0x60, 0xFF, 0x00, 0x00, 0x60, 0xFF,
|
||||||
|
},
|
||||||
|
Stride: 16,
|
||||||
|
Rect: image.Rect(0, 0, 4, 4),
|
||||||
|
},
|
||||||
|
},
|
||||||
"I444": {
|
"I444": {
|
||||||
src: &image.YCbCr{
|
src: &image.YCbCr{
|
||||||
SubsampleRatio: image.YCbCrSubsampleRatio444,
|
SubsampleRatio: image.YCbCrSubsampleRatio444,
|
||||||
@@ -91,6 +117,70 @@ func TestScale(t *testing.T) {
|
|||||||
Rect: image.Rect(0, 0, 3, 3),
|
Rect: image.Rect(0, 0, 3, 3),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"I444SameSize": {
|
||||||
|
src: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio444,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x40, 0x40, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x40, 0x40, 0x80, 0x80,
|
||||||
|
},
|
||||||
|
YStride: 6,
|
||||||
|
CStride: 6,
|
||||||
|
Rect: image.Rect(0, 0, 6, 6),
|
||||||
|
},
|
||||||
|
width: 6,
|
||||||
|
height: 6,
|
||||||
|
expected: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio444,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x40, 0x40, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x40, 0x40, 0x80, 0x80,
|
||||||
|
},
|
||||||
|
YStride: 6,
|
||||||
|
CStride: 6,
|
||||||
|
Rect: image.Rect(0, 0, 6, 6),
|
||||||
|
},
|
||||||
|
},
|
||||||
"I422": {
|
"I422": {
|
||||||
src: &image.YCbCr{
|
src: &image.YCbCr{
|
||||||
SubsampleRatio: image.YCbCrSubsampleRatio422,
|
SubsampleRatio: image.YCbCrSubsampleRatio422,
|
||||||
@@ -155,6 +245,82 @@ func TestScale(t *testing.T) {
|
|||||||
Rect: image.Rect(0, 0, 4, 4),
|
Rect: image.Rect(0, 0, 4, 4),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"I422SameSize": {
|
||||||
|
src: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio422,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
},
|
||||||
|
YStride: 8,
|
||||||
|
CStride: 4,
|
||||||
|
Rect: image.Rect(0, 0, 8, 8),
|
||||||
|
},
|
||||||
|
width: 8,
|
||||||
|
height: 8,
|
||||||
|
expected: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio422,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x80,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
},
|
||||||
|
YStride: 8,
|
||||||
|
CStride: 4,
|
||||||
|
Rect: image.Rect(0, 0, 8, 8),
|
||||||
|
},
|
||||||
|
},
|
||||||
"I420": {
|
"I420": {
|
||||||
src: &image.YCbCr{
|
src: &image.YCbCr{
|
||||||
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
@@ -207,6 +373,118 @@ func TestScale(t *testing.T) {
|
|||||||
Rect: image.Rect(0, 0, 4, 4),
|
Rect: image.Rect(0, 0, 4, 4),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"I420SameSize": {
|
||||||
|
src: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
},
|
||||||
|
YStride: 8,
|
||||||
|
CStride: 4,
|
||||||
|
Rect: image.Rect(0, 0, 8, 8),
|
||||||
|
},
|
||||||
|
width: 8,
|
||||||
|
height: 8,
|
||||||
|
expected: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x20, 0x20, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40,
|
||||||
|
},
|
||||||
|
YStride: 8,
|
||||||
|
CStride: 4,
|
||||||
|
Rect: image.Rect(0, 0, 8, 8),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"I420NonSquareImage": {
|
||||||
|
src: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x10,
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x10,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x50, 0x50,
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x50, 0x50,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0, 0x30, 0x30,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0, 0x30, 0x30,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0xB0, 0xB0,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0xB0, 0xB0,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40, 0xC0, 0xC0,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40, 0xC0, 0xC0,
|
||||||
|
},
|
||||||
|
YStride: 12,
|
||||||
|
CStride: 6,
|
||||||
|
Rect: image.Rect(0, 0, 12, 8),
|
||||||
|
},
|
||||||
|
width: 6,
|
||||||
|
height: 4,
|
||||||
|
expected: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0x10, 0x00, 0x00, 0xF0, 0x10,
|
||||||
|
0x00, 0x00, 0x40, 0x00, 0x40, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x80, 0x30, 0x00, 0x30, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x80, 0x50,
|
||||||
|
0x80, 0xE0, 0x30,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0x80, 0xB0,
|
||||||
|
0xF0, 0x40, 0xC0,
|
||||||
|
},
|
||||||
|
YStride: 6,
|
||||||
|
CStride: 3,
|
||||||
|
Rect: image.Rect(0, 0, 6, 4),
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for name, algo := range scalerTestAlgos {
|
for name, algo := range scalerTestAlgos {
|
||||||
algo := algo
|
algo := algo
|
||||||
@@ -247,6 +525,100 @@ func TestScale(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestScaleFastBoxSampling(t *testing.T) {
|
||||||
|
cases := map[string]struct {
|
||||||
|
src image.Image
|
||||||
|
width, height int
|
||||||
|
expected image.Image
|
||||||
|
}{
|
||||||
|
"I420NonSquareImage": {
|
||||||
|
src: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x10,
|
||||||
|
0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x10,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0x80, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x50, 0x50,
|
||||||
|
0x20, 0x20, 0x80, 0x80, 0x50, 0x50,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0, 0x30, 0x30,
|
||||||
|
0x80, 0x80, 0xE0, 0xE0, 0x30, 0x30,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0xB0, 0xB0,
|
||||||
|
0xE0, 0xE0, 0x80, 0x80, 0xB0, 0xB0,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40, 0xC0, 0xC0,
|
||||||
|
0xF0, 0xF0, 0x40, 0x40, 0xC0, 0xC0,
|
||||||
|
},
|
||||||
|
YStride: 12,
|
||||||
|
CStride: 6,
|
||||||
|
Rect: image.Rect(0, 0, 12, 8),
|
||||||
|
},
|
||||||
|
width: 6,
|
||||||
|
height: 4,
|
||||||
|
expected: &image.YCbCr{
|
||||||
|
SubsampleRatio: image.YCbCrSubsampleRatio420,
|
||||||
|
Y: []uint8{
|
||||||
|
0xF0, 0x80, 0x08, 0x00, 0x78, 0x80,
|
||||||
|
0x08, 0x00, 0x20, 0x20, 0x20, 0x20,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x40, 0x58, 0x18, 0x18, 0x18,
|
||||||
|
},
|
||||||
|
Cb: []uint8{
|
||||||
|
0x20, 0x50, 0x68,
|
||||||
|
0x68, 0xB0, 0x88,
|
||||||
|
},
|
||||||
|
Cr: []uint8{
|
||||||
|
0xE0, 0xB0, 0x98,
|
||||||
|
0xD0, 0x98, 0x80,
|
||||||
|
},
|
||||||
|
YStride: 6,
|
||||||
|
CStride: 3,
|
||||||
|
Rect: image.Rect(0, 0, 6, 4),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for name, c := range cases {
|
||||||
|
c := c
|
||||||
|
t.Run(name, func(t *testing.T) {
|
||||||
|
trans := Scale(c.width, c.height, ScalerFastBoxSampling)
|
||||||
|
r := trans(ReaderFunc(func() (image.Image, func(), error) {
|
||||||
|
return c.src, func() {}, nil
|
||||||
|
}))
|
||||||
|
for i := 0; i < 4; i++ {
|
||||||
|
out, _, err := r.Read()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(c.expected, out) {
|
||||||
|
t.Errorf("Expected output image:\n%v\ngot:\n%v\nrepeat: %d", c.expected, out, i)
|
||||||
|
}
|
||||||
|
// Destroy output contents
|
||||||
|
switch v := out.(type) {
|
||||||
|
case *image.RGBA:
|
||||||
|
v.Stride = 10
|
||||||
|
v.Pix = v.Pix[:1]
|
||||||
|
v.Rect.Max.X = 1
|
||||||
|
case *image.YCbCr:
|
||||||
|
v.YStride = 10
|
||||||
|
v.CStride = 100
|
||||||
|
v.Y = v.Y[:1]
|
||||||
|
v.Cb = v.Cb[:2]
|
||||||
|
v.Cr = v.Cr[:1]
|
||||||
|
v.Rect.Max.X = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func BenchmarkScale(b *testing.B) {
|
func BenchmarkScale(b *testing.B) {
|
||||||
for name, algo := range scalerBenchAlgos {
|
for name, algo := range scalerBenchAlgos {
|
||||||
algo := algo
|
algo := algo
|
||||||
|
@@ -29,7 +29,7 @@ void fastBoxSampling(
|
|||||||
const int sw, const int sh, const int sstride,
|
const int sw, const int sh, const int sstride,
|
||||||
uint32_t* tmp)
|
uint32_t* tmp)
|
||||||
{
|
{
|
||||||
memset(tmp, 0, dw * dh * ch);
|
memset(tmp, 0, dw * dh * ch * sizeof(tmp[0]));
|
||||||
|
|
||||||
for (int sy = 0; sy < sh; sy++)
|
for (int sy = 0; sy < sh; sy++)
|
||||||
{
|
{
|
||||||
|
@@ -30,10 +30,18 @@ func (p *rgbLikeYCbCr) At(x, y int) color.Color {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *rgbLikeYCbCr) Set(x, y int, c color.Color) {
|
func (p *rgbLikeYCbCr) Set(x, y int, c color.Color) {
|
||||||
rgb := c.(*color.RGBA64)
|
switch v := c.(type) {
|
||||||
p.y.SetGray(x, y, color.Gray{uint8(rgb.R / 0x100)})
|
case color.RGBA:
|
||||||
if (image.Point{x, y}.In(p.cb.Rect)) {
|
p.y.SetGray(x, y, color.Gray{v.R})
|
||||||
p.cb.SetGray(x, y, color.Gray{uint8(rgb.G / 0x100)})
|
if (image.Point{x, y}.In(p.cb.Rect)) {
|
||||||
p.cr.SetGray(x, y, color.Gray{uint8(rgb.B / 0x100)})
|
p.cb.SetGray(x, y, color.Gray{v.G})
|
||||||
|
p.cr.SetGray(x, y, color.Gray{v.B})
|
||||||
|
}
|
||||||
|
case *color.RGBA64:
|
||||||
|
p.y.SetGray(x, y, color.Gray{uint8(v.R / 0x100)})
|
||||||
|
if (image.Point{x, y}.In(p.cb.Rect)) {
|
||||||
|
p.cb.SetGray(x, y, color.Gray{uint8(v.G / 0x100)})
|
||||||
|
p.cr.SetGray(x, y, color.Gray{uint8(v.B / 0x100)})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -145,13 +145,17 @@ func (p *MediaConstraints) FitnessDistance(o Media) (float64, bool) {
|
|||||||
cmps.add(p.Width, o.Width)
|
cmps.add(p.Width, o.Width)
|
||||||
cmps.add(p.Height, o.Height)
|
cmps.add(p.Height, o.Height)
|
||||||
cmps.add(p.FrameFormat, o.FrameFormat)
|
cmps.add(p.FrameFormat, o.FrameFormat)
|
||||||
|
// The next line is comment out for now to not include framerate in the fitness function.
|
||||||
|
// As camera.Properties does not have access to the list of available framerate at the moment,
|
||||||
|
// no driver can be matched with a framerate constraint.
|
||||||
|
// Note this also affect screen caputre as screen.Properties does not fill in the Framerate field.
|
||||||
|
// cmps.add(p.FrameRate, o.FrameRate)
|
||||||
cmps.add(p.SampleRate, o.SampleRate)
|
cmps.add(p.SampleRate, o.SampleRate)
|
||||||
cmps.add(p.Latency, o.Latency)
|
cmps.add(p.Latency, o.Latency)
|
||||||
cmps.add(p.ChannelCount, o.ChannelCount)
|
cmps.add(p.ChannelCount, o.ChannelCount)
|
||||||
cmps.add(p.IsBigEndian, o.IsBigEndian)
|
cmps.add(p.IsBigEndian, o.IsBigEndian)
|
||||||
cmps.add(p.IsFloat, o.IsFloat)
|
cmps.add(p.IsFloat, o.IsFloat)
|
||||||
cmps.add(p.IsInterleaved, o.IsInterleaved)
|
cmps.add(p.IsInterleaved, o.IsInterleaved)
|
||||||
|
|
||||||
return cmps.fitnessDistance()
|
return cmps.fitnessDistance()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -53,7 +53,7 @@ func TestBufferStoreCopyAndLoad(t *testing.T) {
|
|||||||
for i := range cloneReal.Data {
|
for i := range cloneReal.Data {
|
||||||
if reflect.ValueOf(originalReal.Data[i]).Pointer() == reflect.ValueOf(cloneReal.Data[i]).Pointer() {
|
if reflect.ValueOf(originalReal.Data[i]).Pointer() == reflect.ValueOf(cloneReal.Data[i]).Pointer() {
|
||||||
err := fmt.Errorf("Channel %d memory address should be different", i)
|
err := fmt.Errorf("Channel %d memory address should be different", i)
|
||||||
t.Errorf("%v: %w", errIdenticalAddress, err)
|
t.Errorf("%v: %s", errIdenticalAddress, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -89,7 +89,7 @@ func TestBufferStoreCopyAndLoad(t *testing.T) {
|
|||||||
for i := range cloneReal.Data {
|
for i := range cloneReal.Data {
|
||||||
if reflect.ValueOf(originalReal.Data[i]).Pointer() == reflect.ValueOf(cloneReal.Data[i]).Pointer() {
|
if reflect.ValueOf(originalReal.Data[i]).Pointer() == reflect.ValueOf(cloneReal.Data[i]).Pointer() {
|
||||||
err := fmt.Errorf("Channel %d memory address should be different", i)
|
err := fmt.Errorf("Channel %d memory address should be different", i)
|
||||||
t.Errorf("%v: %w", errIdenticalAddress, err)
|
t.Errorf("%v: %s", errIdenticalAddress, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -12,5 +12,9 @@
|
|||||||
"packagePatterns": ["^golang.org/x/"],
|
"packagePatterns": ["^golang.org/x/"],
|
||||||
"schedule": ["on the first day of the month"]
|
"schedule": ["on the first day of the month"]
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"ignorePaths": [],
|
||||||
|
"ignoreDeps": [
|
||||||
|
"github.com/pion/mediadevices"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
15
rtpreader.go
15
rtpreader.go
@@ -1,15 +1,20 @@
|
|||||||
package mediadevices
|
package mediadevices
|
||||||
|
|
||||||
import "github.com/pion/rtp"
|
import (
|
||||||
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
|
"github.com/pion/rtp"
|
||||||
|
)
|
||||||
|
|
||||||
type RTPReadCloser interface {
|
type RTPReadCloser interface {
|
||||||
Read() (pkts []*rtp.Packet, release func(), err error)
|
Read() (pkts []*rtp.Packet, release func(), err error)
|
||||||
Close() error
|
Close() error
|
||||||
|
codec.Controllable
|
||||||
}
|
}
|
||||||
|
|
||||||
type rtpReadCloserImpl struct {
|
type rtpReadCloserImpl struct {
|
||||||
readFn func() ([]*rtp.Packet, func(), error)
|
readFn func() ([]*rtp.Packet, func(), error)
|
||||||
closeFn func() error
|
closeFn func() error
|
||||||
|
controllerFn func() codec.EncoderController
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *rtpReadCloserImpl) Read() ([]*rtp.Packet, func(), error) {
|
func (r *rtpReadCloserImpl) Read() ([]*rtp.Packet, func(), error) {
|
||||||
@@ -19,3 +24,7 @@ func (r *rtpReadCloserImpl) Read() ([]*rtp.Packet, func(), error) {
|
|||||||
func (r *rtpReadCloserImpl) Close() error {
|
func (r *rtpReadCloserImpl) Close() error {
|
||||||
return r.closeFn()
|
return r.closeFn()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *rtpReadCloserImpl) Controller() codec.EncoderController {
|
||||||
|
return r.controllerFn()
|
||||||
|
}
|
||||||
|
98
track.go
98
track.go
@@ -8,6 +8,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"github.com/pion/interceptor"
|
||||||
|
"github.com/pion/rtcp"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
"github.com/pion/mediadevices/pkg/codec"
|
"github.com/pion/mediadevices/pkg/codec"
|
||||||
"github.com/pion/mediadevices/pkg/driver"
|
"github.com/pion/mediadevices/pkg/driver"
|
||||||
@@ -20,6 +23,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
rtpOutboundMTU = 1200
|
rtpOutboundMTU = 1200
|
||||||
|
rtcpInboundMTU = 1500
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -56,6 +60,8 @@ type Track interface {
|
|||||||
Kind() webrtc.RTPCodecType
|
Kind() webrtc.RTPCodecType
|
||||||
// StreamID is the group this track belongs too. This must be unique
|
// StreamID is the group this track belongs too. This must be unique
|
||||||
StreamID() string
|
StreamID() string
|
||||||
|
// RID is the RTP Stearm ID for this track. This is only used for Simulcast
|
||||||
|
RID() string
|
||||||
// Bind binds the current track source to the given peer connection. In Pion/webrtc v3, the bind
|
// Bind binds the current track source to the given peer connection. In Pion/webrtc v3, the bind
|
||||||
// call will happen automatically after the SDP negotiation. Users won't need to call this manually.
|
// call will happen automatically after the SDP negotiation. Users won't need to call this manually.
|
||||||
Bind(webrtc.TrackLocalContext) (webrtc.RTPCodecParameters, error)
|
Bind(webrtc.TrackLocalContext) (webrtc.RTPCodecParameters, error)
|
||||||
@@ -115,6 +121,11 @@ func (track *baseTrack) StreamID() string {
|
|||||||
return generator.String()
|
return generator.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RID is only relevant if you wish to use Simulcast
|
||||||
|
func (track *baseTrack) RID() string {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// OnEnded sets an error handler. When a track has been created and started, if an
|
// OnEnded sets an error handler. When a track has been created and started, if an
|
||||||
// error occurs, handler will get called with the error given to the parameter.
|
// error occurs, handler will get called with the error given to the parameter.
|
||||||
func (track *baseTrack) OnEnded(handler func(error)) {
|
func (track *baseTrack) OnEnded(handler func(error)) {
|
||||||
@@ -150,6 +161,7 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
|
|||||||
defer track.mu.Unlock()
|
defer track.mu.Unlock()
|
||||||
|
|
||||||
signalCh := make(chan chan<- struct{})
|
signalCh := make(chan chan<- struct{})
|
||||||
|
var stopRead chan struct{}
|
||||||
track.activePeerConnections[ctx.ID()] = signalCh
|
track.activePeerConnections[ctx.ID()] = signalCh
|
||||||
|
|
||||||
var encodedReader RTPReadCloser
|
var encodedReader RTPReadCloser
|
||||||
@@ -175,9 +187,11 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
|
|||||||
var doneCh chan<- struct{}
|
var doneCh chan<- struct{}
|
||||||
writer := ctx.WriteStream()
|
writer := ctx.WriteStream()
|
||||||
defer func() {
|
defer func() {
|
||||||
|
close(stopRead)
|
||||||
encodedReader.Close()
|
encodedReader.Close()
|
||||||
|
|
||||||
// When there's another call to unbind, it won't block since we mark the signalCh to be closed
|
// When there's another call to unbind, it won't block since we remove the current ctx from active connections
|
||||||
|
track.removeActivePeerConnection(ctx.ID())
|
||||||
close(signalCh)
|
close(signalCh)
|
||||||
if doneCh != nil {
|
if doneCh != nil {
|
||||||
close(doneCh)
|
close(doneCh)
|
||||||
@@ -207,13 +221,58 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
keyFrameController, ok := encodedReader.Controller().(codec.KeyFrameController)
|
||||||
|
if ok {
|
||||||
|
stopRead = make(chan struct{})
|
||||||
|
go track.rtcpReadLoop(ctx.RTCPReader(), keyFrameController, stopRead)
|
||||||
|
}
|
||||||
|
|
||||||
return selectedCodec, nil
|
return selectedCodec, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (track *baseTrack) rtcpReadLoop(reader interceptor.RTCPReader, keyFrameController codec.KeyFrameController, stopRead chan struct{}) {
|
||||||
|
readerBuffer := make([]byte, rtcpInboundMTU)
|
||||||
|
|
||||||
|
readLoop:
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-stopRead:
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
|
readLength, _, err := reader.Read(readerBuffer, interceptor.Attributes{})
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, io.EOF) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logger.Warnf("failed to read rtcp packet: %s", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
pkts, err := rtcp.Unmarshal(readerBuffer[:readLength])
|
||||||
|
if err != nil {
|
||||||
|
logger.Warnf("failed to unmarshal rtcp packet: %s", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, pkt := range pkts {
|
||||||
|
switch pkt.(type) {
|
||||||
|
case *rtcp.PictureLossIndication, *rtcp.FullIntraRequest:
|
||||||
|
if err := keyFrameController.ForceKeyFrame(); err != nil {
|
||||||
|
logger.Warnf("failed to force key frame: %s", err)
|
||||||
|
continue readLoop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (track *baseTrack) unbind(ctx webrtc.TrackLocalContext) error {
|
func (track *baseTrack) unbind(ctx webrtc.TrackLocalContext) error {
|
||||||
ch, err := track.removeActivePeerConnection(ctx.ID())
|
ch := track.removeActivePeerConnection(ctx.ID())
|
||||||
if err != err {
|
// If there isn't a registered chanel for this ctx, it means it has already been unbound
|
||||||
return err
|
if ch == nil {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
doneCh := make(chan struct{})
|
doneCh := make(chan struct{})
|
||||||
@@ -222,17 +281,17 @@ func (track *baseTrack) unbind(ctx webrtc.TrackLocalContext) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (track *baseTrack) removeActivePeerConnection(id string) (chan<- chan<- struct{}, error) {
|
func (track *baseTrack) removeActivePeerConnection(id string) chan<- chan<- struct{} {
|
||||||
track.mu.Lock()
|
track.mu.Lock()
|
||||||
defer track.mu.Unlock()
|
defer track.mu.Unlock()
|
||||||
|
|
||||||
ch, ok := track.activePeerConnections[id]
|
ch, ok := track.activePeerConnections[id]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, errNotFoundPeerConnection
|
return nil
|
||||||
}
|
}
|
||||||
delete(track.activePeerConnections, id)
|
delete(track.activePeerConnections, id)
|
||||||
|
|
||||||
return ch, nil
|
return ch
|
||||||
}
|
}
|
||||||
|
|
||||||
func newTrackFromDriver(d driver.Driver, constraints MediaTrackConstraints, selector *CodecSelector) (Track, error) {
|
func newTrackFromDriver(d driver.Driver, constraints MediaTrackConstraints, selector *CodecSelector) (Track, error) {
|
||||||
@@ -254,6 +313,7 @@ func newTrackFromDriver(d driver.Driver, constraints MediaTrackConstraints, sele
|
|||||||
type VideoTrack struct {
|
type VideoTrack struct {
|
||||||
*baseTrack
|
*baseTrack
|
||||||
*video.Broadcaster
|
*video.Broadcaster
|
||||||
|
shouldCopyFrames bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewVideoTrack constructs a new VideoTrack
|
// NewVideoTrack constructs a new VideoTrack
|
||||||
@@ -261,6 +321,16 @@ func NewVideoTrack(source VideoSource, selector *CodecSelector) Track {
|
|||||||
return newVideoTrackFromReader(source, source, selector)
|
return newVideoTrackFromReader(source, source, selector)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ShouldCopyFrames indicates if readers on this track should receive a clopy of the read buffer instead of sharing one.
|
||||||
|
func (track *VideoTrack) ShouldCopyFrames() bool {
|
||||||
|
return track.shouldCopyFrames
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetShouldCopyFrames enables frame copy for this track, sending each reader a different read buffer instead of sharing one.
|
||||||
|
func (track *VideoTrack) SetShouldCopyFrames(shouldCopyFrames bool) {
|
||||||
|
track.shouldCopyFrames = shouldCopyFrames
|
||||||
|
}
|
||||||
|
|
||||||
func newVideoTrackFromReader(source Source, reader video.Reader, selector *CodecSelector) Track {
|
func newVideoTrackFromReader(source Source, reader video.Reader, selector *CodecSelector) Track {
|
||||||
base := newBaseTrack(source, VideoInput, selector)
|
base := newBaseTrack(source, VideoInput, selector)
|
||||||
wrappedReader := video.ReaderFunc(func() (img image.Image, release func(), err error) {
|
wrappedReader := video.ReaderFunc(func() (img image.Image, release func(), err error) {
|
||||||
@@ -305,7 +375,7 @@ func (track *VideoTrack) Unbind(ctx webrtc.TrackLocalContext) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (track *VideoTrack) newEncodedReader(codecNames ...string) (EncodedReadCloser, *codec.RTPCodec, error) {
|
func (track *VideoTrack) newEncodedReader(codecNames ...string) (EncodedReadCloser, *codec.RTPCodec, error) {
|
||||||
reader := track.NewReader(false)
|
reader := track.NewReader(track.shouldCopyFrames)
|
||||||
inputProp, err := detectCurrentVideoProp(track.Broadcaster)
|
inputProp, err := detectCurrentVideoProp(track.Broadcaster)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
@@ -327,7 +397,8 @@ func (track *VideoTrack) newEncodedReader(codecNames ...string) (EncodedReadClos
|
|||||||
}
|
}
|
||||||
return buffer, release, err
|
return buffer, release, err
|
||||||
},
|
},
|
||||||
closeFn: encodedReader.Close,
|
closeFn: encodedReader.Close,
|
||||||
|
controllerFn: encodedReader.Controller,
|
||||||
}, selectedCodec, nil
|
}, selectedCodec, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -365,7 +436,8 @@ func (track *VideoTrack) NewRTPReader(codecName string, ssrc uint32, mtu int) (R
|
|||||||
pkts := packetizer.Packetize(encoded.Data, encoded.Samples)
|
pkts := packetizer.Packetize(encoded.Data, encoded.Samples)
|
||||||
return pkts, release, err
|
return pkts, release, err
|
||||||
},
|
},
|
||||||
closeFn: encodedReader.Close,
|
closeFn: encodedReader.Close,
|
||||||
|
controllerFn: encodedReader.Controller,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -447,7 +519,8 @@ func (track *AudioTrack) newEncodedReader(codecNames ...string) (EncodedReadClos
|
|||||||
}
|
}
|
||||||
return buffer, release, err
|
return buffer, release, err
|
||||||
},
|
},
|
||||||
closeFn: encodedReader.Close,
|
closeFn: encodedReader.Close,
|
||||||
|
controllerFn: encodedReader.Controller,
|
||||||
}, selectedCodec, nil
|
}, selectedCodec, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -485,6 +558,7 @@ func (track *AudioTrack) NewRTPReader(codecName string, ssrc uint32, mtu int) (R
|
|||||||
pkts := packetizer.Packetize(encoded.Data, encoded.Samples)
|
pkts := packetizer.Packetize(encoded.Data, encoded.Samples)
|
||||||
return pkts, release, err
|
return pkts, release, err
|
||||||
},
|
},
|
||||||
closeFn: encodedReader.Close,
|
closeFn: encodedReader.Close,
|
||||||
|
controllerFn: encodedReader.Controller,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
100
track_test.go
100
track_test.go
@@ -2,6 +2,8 @@ package mediadevices
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"github.com/pion/interceptor"
|
||||||
|
"io"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -53,3 +55,101 @@ func TestOnEnded(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type fakeRTCPReader struct {
|
||||||
|
mockReturn chan []byte
|
||||||
|
end chan struct{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mock *fakeRTCPReader) Read(buffer []byte, attributes interceptor.Attributes) (int, interceptor.Attributes, error) {
|
||||||
|
select {
|
||||||
|
case <-mock.end:
|
||||||
|
return 0, nil, io.EOF
|
||||||
|
case mockReturn := <-mock.mockReturn:
|
||||||
|
if len(buffer) < len(mock.mockReturn) {
|
||||||
|
return 0, nil, io.ErrShortBuffer
|
||||||
|
}
|
||||||
|
|
||||||
|
return copy(buffer, mockReturn), attributes, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type fakeKeyFrameController struct {
|
||||||
|
called chan struct{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mock *fakeKeyFrameController) ForceKeyFrame() error {
|
||||||
|
mock.called <- struct{}{}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRtcpHandler(t *testing.T) {
|
||||||
|
|
||||||
|
t.Run("ShouldStopReading", func(t *testing.T) {
|
||||||
|
tr := &baseTrack{}
|
||||||
|
stop := make(chan struct{}, 1)
|
||||||
|
stopped := make(chan struct{})
|
||||||
|
go func() {
|
||||||
|
tr.rtcpReadLoop(&fakeRTCPReader{end: stop}, &fakeKeyFrameController{}, stop)
|
||||||
|
stopped <- struct{}{}
|
||||||
|
}()
|
||||||
|
|
||||||
|
stop <- struct{}{}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-time.After(100 * time.Millisecond):
|
||||||
|
t.Error("Timeout")
|
||||||
|
case <-stopped:
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("ShouldForceKeyFrame", func(t *testing.T) {
|
||||||
|
for packetType, packet := range map[string][]byte{
|
||||||
|
"PLI": {
|
||||||
|
// v=2, p=0, FMT=1, PSFB, len=1
|
||||||
|
0x81, 0xce, 0x00, 0x02,
|
||||||
|
// ssrc=0x0
|
||||||
|
0x00, 0x00, 0x00, 0x00,
|
||||||
|
// ssrc=0x4bc4fcb4
|
||||||
|
0x4b, 0xc4, 0xfc, 0xb4,
|
||||||
|
},
|
||||||
|
"FIR": {
|
||||||
|
// v=2, p=0, FMT=4, PSFB, len=3
|
||||||
|
0x84, 0xce, 0x00, 0x04,
|
||||||
|
// ssrc=0x0
|
||||||
|
0x00, 0x00, 0x00, 0x00,
|
||||||
|
// ssrc=0x4bc4fcb4
|
||||||
|
0x4b, 0xc4, 0xfc, 0xb4,
|
||||||
|
// ssrc=0x12345678
|
||||||
|
0x12, 0x34, 0x56, 0x78,
|
||||||
|
// Seqno=0x42
|
||||||
|
0x42, 0x00, 0x00, 0x00,
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
t.Run(packetType, func(t *testing.T) {
|
||||||
|
tr := &baseTrack{}
|
||||||
|
tr.OnEnded(func(err error) {
|
||||||
|
if err != io.EOF {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
stop := make(chan struct{}, 1)
|
||||||
|
defer func() {
|
||||||
|
stop <- struct{}{}
|
||||||
|
}()
|
||||||
|
mockKeyFrameController := &fakeKeyFrameController{called: make(chan struct{}, 1)}
|
||||||
|
mockRTCPReader := &fakeRTCPReader{end: stop, mockReturn: make(chan []byte, 1)}
|
||||||
|
|
||||||
|
go tr.rtcpReadLoop(mockRTCPReader, mockKeyFrameController, stop)
|
||||||
|
|
||||||
|
mockRTCPReader.mockReturn <- packet
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-time.After(1000 * time.Millisecond):
|
||||||
|
t.Error("Timeout")
|
||||||
|
case <-mockKeyFrameController.called:
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user