Allow to enable frame copy on a video track

Co-authored-by: Atsushi Watanabe <atsushi.w@ieee.org>

.github/workflows/ci.yaml

@@ -13,16 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go:
+        go: [ '1.16', '1.15' ]
-          - '1.21' # oldest version this package supports
-          - '1.22' # oldstable Go version
-          - '1.23' # stable Go version
     name: Linux Go ${{ matrix.go }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go }}
       - name: Install dependencies
@@ -35,28 +32,24 @@ jobs:
             libx264-dev
       - name: Run Test Suite
         run: make test
-      - uses: codecov/codecov-action@v5
+      - uses: codecov/codecov-action@v2	
-        with:
+        if: matrix.go == '1.16'
-          token: ${{ secrets.CODECOV_TOKEN }}
   build-darwin:
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        go:
+        go: [ '1.16', '1.15' ]
-          - '1.22'
-          - '1.23'
-    runs-on: macos-latest
     name: Darwin Go ${{ matrix.go }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go }}
       - name: Install dependencies
         run: |
-          which brew
           brew install \
             pkg-config \
             opus \
@@ -64,20 +57,17 @@ jobs:
             x264
       - name: Run Test Suite
         run: make test
-      - uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
   check-licenses:
     runs-on: ubuntu-latest
     name: Check Licenses
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: stable
+          go-version: '1.16'
       - name: Installing go-licenses
-        run: go install github.com/google/go-licenses@latest
+        run: go get github.com/google/go-licenses
       - name: Checking licenses
         run: go-licenses check ./...

.github/workflows/renovate-go-mod-fix.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           fetch-depth: 2
       - name: fix

.gitignore

@@ -13,5 +13,3 @@
 
 scripts/cross
 coverage.txt
-
-.idea

.idea/mediadevices.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/mediadevices.iml" filepath="$PROJECT_DIR$/.idea/mediadevices.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="8804a8cb-7b92-421b-8786-b7715667b867" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/mediadevices.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="GOROOT" url="file:///usr/local/opt/go/libexec" />
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GoLibraries">
+    <option name="indexEntireGoPath" value="false" />
+  </component>
+  <component name="KubernetesApiPersistence">
+    <option name="context" value="crane-nts-0" />
+    <option name="namespace" value="default" />
+  </component>
+  <component name="ProjectId" id="25msmAX4e3Virjg5KBrchpLrlbl" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="autoscrollToSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="go.formatter.settings.were.checked" value="true" />
+    <property name="go.import.settings.migrated" value="true" />
+    <property name="go.sdk.automatically.set" value="true" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8804a8cb-7b92-421b-8786-b7715667b867" name="Changes" comment="" />
+      <created>1646143753802</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1646143753802</updated>
+      <workItem from="1646143757180" duration="56000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="VgoProject">
+    <integration-enabled>true</integration-enabled>
+  </component>
+</project>

Makefile

@@ -16,8 +16,7 @@ supported_platforms := \
   linux-arm64 \
   linux-x64 \
   windows-x64 \
-  darwin-x64 \
+  darwin-x64
-  darwin-arm64
 cmd_build := build
 cmd_test := test
 examples_dir := examples
@@ -25,7 +24,7 @@ codec_dir := pkg/codec
 codec_list := $(shell ls $(codec_dir)/*/Makefile)
 codec_list := $(codec_list:$(codec_dir)/%/Makefile=%)
 targets := $(foreach codec, $(codec_list), $(addprefix $(cmd_build)-$(codec)-, $(supported_platforms)))
-pkgs_without_ext_device := $(shell go list ./... | grep -v mmal | grep -v vaapi)
+pkgs_without_mmal := $(shell go list ./... | grep -v mmal)
 pkgs_without_cgo := $(shell go list ./... | grep -v pkg/codec | grep -v pkg/driver | grep -v pkg/avfoundation)
 
 define BUILD_TEMPLATE
@@ -73,11 +72,11 @@ $(foreach codec, $(codec_list), \
 # Description:
 # 	Run a series of tests
 $(cmd_test):
-	go vet $(pkgs_without_ext_device)
+	go vet $(pkgs_without_mmal)
-	go build $(pkgs_without_ext_device)
+	go build $(pkgs_without_mmal)
 	# go build without CGO
 	CGO_ENABLED=0 go build $(pkgs_without_cgo)
 	# go build with CGO
-	CGO_ENABLED=1 go build $(pkgs_without_ext_device)
+	CGO_ENABLED=1 go build $(pkgs_without_mmal)
 	$(MAKE) --directory=$(examples_dir)
-	go test -v -race -coverprofile=coverage.txt -covermode=atomic $(pkgs_without_ext_device)
+	go test -v -race -coverprofile=coverage.txt -covermode=atomic $(pkgs_without_mmal)

README.md

@@ -6,8 +6,8 @@
 <h4 align="center">Go implementation of the <a href="https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices">MediaDevices</a> API</h4>
 <p align="center">
   <a href="https://pion.ly/slack"><img src="https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen" alt="Slack Widget"></a>
-  <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/pion/mediadevices/test.yaml">
+  <a href="https://github.com/pion/mediadevices/actions"><img src="https://github.com/pion/mediadevices/workflows/CI/badge.svg?branch=master" alt="Build status"></a> 
-  <a href="https://pkg.go.dev/github.com/pion/mediadevices"><img src="https://pkg.go.dev/badge/github.com/pion/mediadevices.svg" alt="Go Reference"></a>
+  <a href="https://pkg.go.dev/github.com/pion/mediadevices"><img src="https://godoc.org/github.com/pion/mediadevices?status.svg" alt="GoDoc"></a>
   <a href="https://codecov.io/gh/pion/mediadevices"><img src="https://codecov.io/gh/pion/mediadevices/branch/master/graph/badge.svg" alt="Coverage Status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="License: MIT"></a>
 </p>
@@ -15,13 +15,11 @@
 
 `mediadevices` provides access to media input devices like cameras, microphones, and screen capture. It can also be used to encode your video/audio stream to various codec selections. `mediadevices` abstracts away the complexities of interacting with things like hardware and codecs allowing you to focus on building appilcations, interacting only with an amazingly simple, easy, and elegant API!
 
-### Install
+## Install
 
-```bash
+`go get -u github.com/pion/mediadevices`
-go get -u github.com/pion/mediadevices
-```
 
-### Usage
+## Usage
 
 The following snippet shows how to capture a camera stream and store a frame as a jpeg image:
 
@@ -69,21 +67,25 @@ func main() {
 	output, _ := os.Create("frame.jpg")
 	jpeg.Encode(output, frame, nil)
 }
+
+
 ```
 
-### More Examples
+## More Examples
+
 * [Webrtc](/examples/webrtc) - Use Webrtc to create a realtime peer-to-peer video call
 * [Face Detection](/examples/facedetection) - Use a machine learning algorithm to detect faces in a camera stream
 * [RTP Stream](examples/rtp) - Capture camera stream, encode it in H264/VP8/VP9, and send it to a RTP server
 * [HTTP Broadcast](/examples/http) - Broadcast camera stream through HTTP with MJPEG
 * [Archive](/examples/archive) - Archive H264 encoded video stream from a camera
 
-### Available Media Inputs
+## Available Media Inputs
-| Input      | Linux | Mac | Windows |
+
+| Input  | Linux | Mac | Windows |
 | :--------: | :---: | :-: | :-----: |
-| Camera     | ✔️     | ✔️   | ✔️       |
+|   Camera   |  ✔️   | ✔️  |   ✔️    |
-| Microphone | ✔️     | ✔️   | ✔️       |
+| Microphone |  ✔️   | ✔️  |   ✔️    |
-| Screen     | ✔️     | ✔️   | ✔️       |
+|   Screen   |  ✔️   | ✔️  |   ✔️    |
 
 By default, there's no media input registered. This decision was made to allow you to play only what you need. Therefore, you need to import the associated packages for the media inputs. For example, if you want to use a camera, you need to import the camera package as a side effect:
 
@@ -94,7 +96,8 @@ import (
 )
 ```
 
-### Available Codecs
+## Available Codecs
+
 In order to encode your video/audio, `mediadevices` needs to know what codecs that you want to use and their parameters. To do this, you need to import the associated packages for the codecs, and add them to the codec selector that you'll pass to `GetUserMedia`:
 
 ```go
@@ -127,9 +130,9 @@ Since `mediadevices` doesn't implement the video/audio codecs, it needs to call
 
 Note: we do not provide recommendations on choosing one codec or another as it is very complex and can be subjective.
 
-#### Video Codecs
+### Video Codecs
 
-##### x264
+#### x264
 A free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format.
 
 * Package: [github.com/pion/mediadevices/pkg/codec/x264](https://pkg.go.dev/github.com/pion/mediadevices/pkg/codec/x264)
@@ -137,19 +140,19 @@ A free software library and application for encoding video streams into the H.26
   * Mac: `brew install x264`
   * Ubuntu: `apt install libx264-dev`
   
-##### mmal
+#### mmal
 A framework to enable H264 hardware encoding for Raspberry Pi or boards that use VideoCore GPUs.
 
 * Package: [github.com/pion/mediadevices/pkg/codec/mmal](https://pkg.go.dev/github.com/pion/mediadevices/pkg/codec/mmal)
 * Installation: no installation needed, mmal should come built in Raspberry Pi devices
 
-##### openh264
+#### openh264
 A codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications.
 
 * Package: [github.com/pion/mediadevices/pkg/codec/openh264](https://pkg.go.dev/github.com/pion/mediadevices/pkg/codec/openh264)
 * Installation: no installation needed, included as a static binary
 
-##### vpx
+#### vpx
 A free software video codec library from Google and the Alliance for Open Media that implements VP8/VP9 video coding formats.
 
 * Package: [github.com/pion/mediadevices/pkg/codec/vpx](https://pkg.go.dev/github.com/pion/mediadevices/pkg/codec/vpx)
@@ -157,7 +160,7 @@ A free software video codec library from Google and the Alliance for Open Media
   * Mac: `brew install libvpx`
   * Ubuntu: `apt install libvpx-dev`
   
-##### vaapi
+#### vaapi
 An open source API that allows applications such as VLC media player or GStreamer to use hardware video acceleration capabilities (currently support VP8/VP9).
 
 * Package: [github.com/pion/mediadevices/pkg/codec/vaapi](https://pkg.go.dev/github.com/pion/mediadevices/pkg/codec/vaapi)
@@ -165,9 +168,9 @@ An open source API that allows applications such as VLC media player or GStreame
   * Ubuntu: `apt install libva-dev`
 
 
-#### Audio Codecs
+### Audio Codecs
 
-##### opus
+#### opus
 A totally open, royalty-free, highly versatile audio codec.
 
 * Package: [github.com/pion/mediadevices/pkg/codec/opus](https://pkg.go.dev/github.com/pion/mediadevices/pkg/codec/opus)
@@ -175,14 +178,16 @@ A totally open, royalty-free, highly versatile audio codec.
   * Mac: `brew install opus`
   * Ubuntu: `apt install libopus-dev`
 
-### Benchmark
+## Benchmark
+
 Result as of Nov 4, 2020 with Go 1.14 on a Raspberry pi 3, `mediadevices` can produce video, encode, send across network, and decode at **720p, 30 fps with < 500 ms latency**.  
 
 The test was taken by capturing a camera stream, decoding the raw frames, encoding the video stream with mmal, and sending the stream through Webrtc.
 
-### FAQ
+## FAQ
+
+### Failed to find the best driver that fits the constraints
 
-#### Failed to find the best driver that fits the constraints
 `mediadevices` provides an automated driver discovery through `GetUserMedia` and `GetDisplayMedia`. The driver discover algorithm works something like:
 
 1. Open all registered drivers
@@ -193,14 +198,13 @@ So, when `mediadevices` returns `failed to find the best driver that fits the co
 * Driver was not imported as a side effect in your program, e.g. `import _ github.com/pion/mediadevices/pkg/driver/camera`
 * Your constraint is too strict that there's no driver can fullfil your requirements. In this case, you can try to turn up the debug level by specifying the following environment variable: `export PION_LOG_DEBUG=all` to see what was too strict and tune that.
 * Your driver is not supported/implemented. In this case, you can either let us know (file an issue) and wait for the maintainers to implement it. Or, you can implement it yourself and register it through `RegisterDriverAdapter`
-* If trying to use `import _ github.com/pion/mediadevices/pkg/driver/screen` note that you will need to use `GetDisplayMedia` instead of `GetUserMedia` 
 
-#### Failed to find vpx/x264/mmal/opus codecs
+### Failed to find vpx/x264/mmal/opus codecs
+
 Since `mediadevices` uses cgo to access video/audio codecs, it needs to find these libraries from the system. To accomplish this, [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) is used for library discovery.
 
 If you see the following error message at compile time:
-
+```
-```bash
 # pkg-config --cflags  -- vpx
 Package vpx was not found in the pkg-config search path.
 Perhaps you should add the directory containing `vpx.pc'
@@ -214,10 +218,8 @@ There are 2 common problems:
 * The required codec library is not installed (vpx in this example). In this case, please refer to the [available codecs](#available-codecs).
 * Pkg-config fails to find the `.pc` files for this codec ([reference](https://people.freedesktop.org/~dbn/pkg-config-guide.html#using)). In this case, you need to find where the codec library's `.pc` is stored, and let pkg-config knows with: `export PKG_CONFIG_PATH=/path/to/directory`.
 
-### Roadmap
-The library can be used with our WebRTC implementation. Please refer to that [roadmap](https://github.com/pion/webrtc/issues/9) to track our major milestones.
 
-### Community
+## Community
 Pion has an active community on the [Slack](https://pion.ly/slack).
 
 Follow the [Pion Twitter](https://twitter.com/_pion) for project updates and important WebRTC news.
@@ -225,8 +227,11 @@ Follow the [Pion Twitter](https://twitter.com/_pion) for project updates and imp
 We are always looking to support **your projects**. Please reach out if you have something to build!
 If you need commercial support or don't want to use public methods you can contact us at [team@pion.ly](mailto:team@pion.ly)
 
-### Contributing
+## Contributing
-Check out the [contributing wiki](https://github.com/pion/webrtc/wiki/Contributing) to join the group of amazing people making this project possible
+Check out the **[contributing wiki](https://github.com/pion/webrtc/wiki/Contributing)** to join the group of amazing people making this project possible:
 
-### License
+* [Lukas Herman](https://github.com/lherman-cs) - _Original Author_
+* [Atsushi Watanabe](https://github.com/at-wat) - _VP8, Screencast, etc._
+
+## License
 MIT License - see [LICENSE](LICENSE) for full text

codec.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pion/mediadevices/pkg/io/audio"
 	"github.com/pion/mediadevices/pkg/io/video"
 	"github.com/pion/mediadevices/pkg/prop"
-	"github.com/pion/webrtc/v4"
+	"github.com/pion/webrtc/v3"
 )
 
 // CodecSelector is a container of video and audio encoder builders, which later will be used

dockerfiles/darwin-arm64.Dockerfile

@@ -1,47 +0,0 @@
-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}

dockerfiles/darwin-arm64.cmake

@@ -1,8 +0,0 @@
-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})

examples/go.mod

@@ -1,37 +1,11 @@
 module github.com/pion/mediadevices/examples
 
-go 1.21
+go 1.14
 
 require (
-	github.com/esimov/pigo v1.4.6
+	github.com/esimov/pigo v1.4.3
 	github.com/pion/mediadevices v0.0.0
-	github.com/pion/webrtc/v4 v4.0.5
+	github.com/pion/webrtc/v3 v3.0.20
-)
-
-require (
-	github.com/blackjack/webcam v0.6.1 // indirect
-	github.com/gen2brain/malgo v0.11.22 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/pion/datachannel v1.5.9 // indirect
-	github.com/pion/dtls/v3 v3.0.4 // indirect
-	github.com/pion/ice/v4 v4.0.3 // indirect
-	github.com/pion/interceptor v0.1.37 // indirect
-	github.com/pion/logging v0.2.2 // indirect
-	github.com/pion/mdns/v2 v2.0.7 // indirect
-	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/rtcp v1.2.14 // indirect
-	github.com/pion/rtp v1.8.9 // indirect
-	github.com/pion/sctp v1.8.34 // indirect
-	github.com/pion/sdp/v3 v3.0.9 // indirect
-	github.com/pion/srtp/v3 v3.0.4 // indirect
-	github.com/pion/stun/v3 v3.0.0 // indirect
-	github.com/pion/transport/v3 v3.0.7 // indirect
-	github.com/pion/turn/v4 v4.0.0 // indirect
-	github.com/wlynxg/anet v0.0.5 // indirect
-	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/image v0.21.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
 )
 
 replace github.com/pion/mediadevices v0.0.0 => ../

examples/go.sum

@@ -1,78 +1,166 @@
-github.com/blackjack/webcam v0.6.1 h1:K0T6Q0zto23U99gNAa5q/hFoye6uGcKr2aE6hFoxVoE=
+github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/blackjack/webcam v0.6.1/go.mod h1:zs+RkUZzqpFPHPiwBZ6U5B34ZXXe9i+SiHLKnnukJuI=
+github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539 h1:1aIqYfg9s9RETAJHGfVKZW4ok0b22p4QTwk8MsdRtPs=
+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.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/disintegration/imaging v1.6.1/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
-github.com/esimov/pigo v1.4.6 h1:wpB9FstbqeGP/CZP+nTR52tUJe7XErq8buG+k4xCXlw=
+github.com/esimov/pigo v1.4.3 h1:xl098Z9CHmouywvyRZepuKx8aSWHBs/0lZtp7Yt5g28=
-github.com/esimov/pigo v1.4.6/go.mod h1:uqj9Y3+3IRYhFK071rxz1QYq0ePhA6+R9jrUZavi46M=
+github.com/esimov/pigo v1.4.3/go.mod h1:aOTYpOWsqniACzXKdSOGkqI6CnWQpP8tFjgtUOARoEs=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/fogleman/gg v1.0.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/gen2brain/malgo v0.11.22 h1:fRtTbzVI9CDWnfEJGo/GxKxN7pXtCb0NsAeUVUjZk9U=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gen2brain/malgo v0.11.22/go.mod h1:f9TtuN7DVrXMiV/yIceMeWpvanyVzJQMlBecJFVMxww=
+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.29/go.mod h1:zHSUNZAXfCeNsZou0RtQ6Zk7gDYLIcKOrUWtAdksnEs=
+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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/pion/datachannel v1.5.9 h1:LpIWAOYPyDrXtU+BW7X0Yt/vGtYxtXQ8ql7dFfYUVZA=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/pion/datachannel v1.5.9/go.mod h1:kDUuk4CU4Uxp82NH4LQZbISULkX/HtzKa4P7ldf9izE=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/pion/dtls/v3 v3.0.4 h1:44CZekewMzfrn9pmGrj5BNnTMDCFwr+6sLH+cCuLM7U=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/pion/dtls/v3 v3.0.4/go.mod h1:R373CsjxWqNPf6MEkfdy3aSe9niZvL/JaKlGeFphtMg=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/pion/ice/v4 v4.0.3 h1:9s5rI1WKzF5DRqhJ+Id8bls/8PzM7mau0mj1WZb4IXE=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/pion/ice/v4 v4.0.3/go.mod h1:VfHy0beAZ5loDT7BmJ2LtMtC4dbawIkkkejHPRZNB3Y=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/pion/interceptor v0.1.37 h1:aRA8Zpab/wE7/c0O3fh1PqY0AJI3fCSEM5lRWJVorwI=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/pion/interceptor v0.1.37/go.mod h1:JzxbJ4umVTlZAf+/utHzNesY8tmRkM2lVmkS82TTj8Y=
+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/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/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/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/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.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+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.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+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.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
+github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0=
+github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg=
+github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8=
+github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho=
+github.com/pion/ice/v2 v2.1.7 h1:FjgDfUNrVYTxQabJrkBX6ld12tvYbgzHenqPh3PJF6E=
+github.com/pion/ice/v2 v2.1.7/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0=
+github.com/pion/interceptor v0.0.12 h1:eC1iVneBIAQJEfaNAfDqAncJWhMDAnaXPRCJsltdokE=
+github.com/pion/interceptor v0.0.12/go.mod h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4=
 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/mdns/v2 v2.0.7 h1:c9kM8ewCgjslaAmicYMFQIde2H9/lrZpjBkN8VwoVtM=
+github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
-github.com/pion/mdns/v2 v2.0.7/go.mod h1:vAdSYNAT0Jy3Ru0zl2YiW3Rm/fJCwIeM0nToenfOJKA=
+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/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
-github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE=
+github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo=
-github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
-github.com/pion/rtp v1.8.9 h1:E2HX740TZKaqdcPmf4pw6ZZuG8u5RlMMt+l3dxeu6Wk=
+github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U=
-github.com/pion/rtp v1.8.9/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/sctp v1.8.34 h1:rCuD3m53i0oGxCSp7FLQKvqVx0Nf5AUAHhMRXTTQjBc=
+github.com/pion/rtp v1.6.5 h1:o2cZf8OascA5HF/b0PAbTxRKvOWxTQxWYt7SlToxFGI=
-github.com/pion/sctp v1.8.34/go.mod h1:yWkCClkXlzVW7BXfI2PjrUGBwUI0CjXJBkhLt+sdo4U=
+github.com/pion/rtp v1.6.5/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY=
+github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0=
-github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M=
+github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY=
-github.com/pion/srtp/v3 v3.0.4 h1:2Z6vDVxzrX3UHEgrUyIGM4rRouoC7v+NiF1IHtp9B5M=
+github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
-github.com/pion/srtp/v3 v3.0.4/go.mod h1:1Jx3FwDoxpRaTh1oRV8A/6G1BnFL+QI82eK4ms8EEJQ=
+github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8=
-github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw=
+github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
-github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU=
+github.com/pion/srtp/v2 v2.0.2 h1:664iGzVmaY7KYS5M0gleY0DscRo9ReDfTxQrq4UgGoU=
-github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
+github.com/pion/srtp/v2 v2.0.2/go.mod h1:VEyLv4CuxrwGY8cxM+Ng3bmVy8ckz/1t6A0q/msKOw0=
-github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
+github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
-github.com/pion/turn/v4 v4.0.0 h1:qxplo3Rxa9Yg1xXDxxH8xaqcyGUtbHYw4QSCvmFWvhM=
+github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
-github.com/pion/turn/v4 v4.0.0/go.mod h1:MuPDkm15nYSklKpN8vWJ9W2M0PlyQZqYt1McGuxG7mA=
+github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A=
-github.com/pion/webrtc/v4 v4.0.5 h1:8cVPojcv3cQTwVga2vF1rzCNvkiEimnYdCCG7yF317I=
+github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
-github.com/pion/webrtc/v4 v4.0.5/go.mod h1:LvP8Np5b/sM0uyJIcUPvJcCvhtjHxJwzh2H2PYzE6cQ=
+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/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA=
+github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw=
+github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
+github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/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.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
-github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+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/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+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-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-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210420210106-798c2154c571 h1:Q6Bg8xzKzpFPU4Oi1sBnBTHBwlMsLeEXpu4hYBY8rAg=
+golang.org/x/net v0.0.0-20210420210106-798c2154c571/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
+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-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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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-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-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe h1:WdX7u8s3yOigWAhHEaDl8r9G+4XwFQEQFtBMYyN+kXQ=
+golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20191110171634-ad39bd3f0407/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+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-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+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-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+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.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 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-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+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.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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

examples/vnc/.gitignore

@@ -1 +0,0 @@
-vnc

examples/vnc/main.go

@@ -2,13 +2,12 @@ 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/v4"
+	"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
@@ -17,6 +16,7 @@ import (
 	// 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"
@@ -84,7 +84,7 @@ func main() {
 		})
 
 		_, err = peerConnection.AddTransceiverFromTrack(track,
-			webrtc.RTPTransceiverInit{
+			webrtc.RtpTransceiverInit{
 				Direction: webrtc.RTPTransceiverDirectionSendonly,
 			},
 		)

examples/webrtc/main.go

@@ -7,7 +7,7 @@ import (
 	"github.com/pion/mediadevices/examples/internal/signal"
 	"github.com/pion/mediadevices/pkg/frame"
 	"github.com/pion/mediadevices/pkg/prop"
-	"github.com/pion/webrtc/v4"
+	"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
@@ -90,7 +90,7 @@ func main() {
 		})
 
 		_, err = peerConnection.AddTransceiverFromTrack(track,
-			webrtc.RTPTransceiverInit{
+			webrtc.RtpTransceiverInit{
 				Direction: webrtc.RTPTransceiverDirectionSendonly,
 			},
 		)

go.mod

@@ -1,43 +1,18 @@
 module github.com/pion/mediadevices
 
-go 1.21
+go 1.13
+
+replace github.com/pion/webrtc/v3 => github.com/EmrysMyrddin/webrtc/v3 v3.1.25-0.20220301142221-d92d68ff068f
 
 require (
-	github.com/blackjack/webcam v0.6.1
+	github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539
-	github.com/gen2brain/malgo v0.11.23
+	github.com/gen2brain/malgo v0.10.35
-	github.com/google/uuid v1.6.0
+	github.com/google/uuid v1.3.0
-	github.com/kbinani/screenshot v0.0.0-20240820160931-a8a2c5d0e191
+	github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329
-	github.com/pion/interceptor v0.1.37
 	github.com/pion/logging v0.2.2
-	github.com/pion/rtcp v1.2.14
+	github.com/pion/rtcp v1.2.9
-	github.com/pion/rtp v1.8.9
+	github.com/pion/rtp v1.7.4
-	github.com/pion/webrtc/v4 v4.0.5
+	github.com/pion/webrtc/v3 v3.1.10
-	github.com/stretchr/testify v1.10.0
+	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
-	golang.org/x/image v0.23.0
-)
-
-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gen2brain/shm v0.1.0 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/jezek/xgb v1.1.1 // indirect
-	github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect
-	github.com/pion/datachannel v1.5.9 // indirect
-	github.com/pion/dtls/v3 v3.0.4 // indirect
-	github.com/pion/ice/v4 v4.0.3 // indirect
-	github.com/pion/mdns/v2 v2.0.7 // indirect
-	github.com/pion/randutil v0.1.0 // indirect
-	github.com/pion/sctp v1.8.34 // indirect
-	github.com/pion/sdp/v3 v3.0.9 // indirect
-	github.com/pion/srtp/v3 v3.0.4 // indirect
-	github.com/pion/stun/v3 v3.0.0 // indirect
-	github.com/pion/transport/v3 v3.0.7 // indirect
-	github.com/pion/turn/v4 v4.0.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/wlynxg/anet v0.0.5 // indirect
-	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,86 +1,170 @@
-github.com/blackjack/webcam v0.6.1 h1:K0T6Q0zto23U99gNAa5q/hFoye6uGcKr2aE6hFoxVoE=
+github.com/EmrysMyrddin/webrtc/v3 v3.1.25-0.20220301142221-d92d68ff068f h1:o7MCxR85nZxyOgjkmjtnXHsmPmchX3AEbWb/Bgpy3aI=
-github.com/blackjack/webcam v0.6.1/go.mod h1:zs+RkUZzqpFPHPiwBZ6U5B34ZXXe9i+SiHLKnnukJuI=
+github.com/EmrysMyrddin/webrtc/v3 v3.1.25-0.20220301142221-d92d68ff068f/go.mod h1:mO/yv7fBN3Lp7YNlnYcTj1jtpvNvssJG+7eh6itZ4xM=
+github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539 h1:1aIqYfg9s9RETAJHGfVKZW4ok0b22p4QTwk8MsdRtPs=
+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.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gen2brain/malgo v0.11.23 h1:3/VAI8DP9/Wyx1CUDNlUQJVdWUvGErhjHDqYcHVk9ME=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gen2brain/malgo v0.11.23/go.mod h1:f9TtuN7DVrXMiV/yIceMeWpvanyVzJQMlBecJFVMxww=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gen2brain/shm v0.1.0 h1:MwPeg+zJQXN0RM9o+HqaSFypNoNEcNpeoGp0BTSx2YY=
+github.com/gen2brain/malgo v0.10.35 h1:D6aNo/Q0SnzQLHomTydTXxj4AJFdGJcVoE7I8JxPoUo=
-github.com/gen2brain/shm v0.1.0/go.mod h1:UgIcVtvmOu+aCJpqJX7GOtiN7X2ct+TKLg4RTxwPIUA=
+github.com/gen2brain/malgo v0.10.35/go.mod h1:zHSUNZAXfCeNsZou0RtQ6Zk7gDYLIcKOrUWtAdksnEs=
-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5 h1:Y5Q2mEwfzjMt5+3u70Gtw93ZOu2UuPeeeTBDntF7FoY=
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/kbinani/screenshot v0.0.0-20240820160931-a8a2c5d0e191 h1:5UHVWNX1qrIbNw7OpKbxe5bHkhHRk3xRKztMjERuCsU=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/kbinani/screenshot v0.0.0-20240820160931-a8a2c5d0e191/go.mod h1:Pmpz2BLf55auQZ67u3rvyI2vAQvNetkK/4zYUmpauZQ=
+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.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.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.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/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jezek/xgb v0.0.0-20210312150743-0e0f116e1240 h1:dy+DS31tGEGCsZzB45HmJJNHjur8GDgtRNX9U7HnSX4=
+github.com/jezek/xgb v0.0.0-20210312150743-0e0f116e1240/go.mod h1:3P4UH/k22rXyHIJD2w4h2XMqPX4Of/eySEZq9L6wqc4=
+github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o=
+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.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
-github.com/pion/datachannel v1.5.9 h1:LpIWAOYPyDrXtU+BW7X0Yt/vGtYxtXQ8ql7dFfYUVZA=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/pion/datachannel v1.5.9/go.mod h1:kDUuk4CU4Uxp82NH4LQZbISULkX/HtzKa4P7ldf9izE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/pion/dtls/v3 v3.0.4 h1:44CZekewMzfrn9pmGrj5BNnTMDCFwr+6sLH+cCuLM7U=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/pion/dtls/v3 v3.0.4/go.mod h1:R373CsjxWqNPf6MEkfdy3aSe9niZvL/JaKlGeFphtMg=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/pion/ice/v4 v4.0.3 h1:9s5rI1WKzF5DRqhJ+Id8bls/8PzM7mau0mj1WZb4IXE=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/pion/ice/v4 v4.0.3/go.mod h1:VfHy0beAZ5loDT7BmJ2LtMtC4dbawIkkkejHPRZNB3Y=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/pion/interceptor v0.1.37 h1:aRA8Zpab/wE7/c0O3fh1PqY0AJI3fCSEM5lRWJVorwI=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/pion/interceptor v0.1.37/go.mod h1:JzxbJ4umVTlZAf+/utHzNesY8tmRkM2lVmkS82TTj8Y=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+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/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
+github.com/pion/dtls/v2 v2.1.2/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
+github.com/pion/dtls/v2 v2.1.3 h1:3UF7udADqous+M2R5Uo2q/YaP4EzUoWKdfX2oscCUio=
+github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
+github.com/pion/ice/v2 v2.2.1 h1:R3MeuJZpU1ty3diPqpD5OxaxcZ15eprAc+EtUiSoFxg=
+github.com/pion/ice/v2 v2.2.1/go.mod h1:Op8jlPtjeiycsXh93Cs4jK82C9j/kh7vef6ztIOvtIQ=
+github.com/pion/interceptor v0.1.7 h1:HThW0tIIKT9RRoDWGURe8rlZVOx0fJHxBHpA0ej0+bo=
+github.com/pion/interceptor v0.1.7/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U=
 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/mdns/v2 v2.0.7 h1:c9kM8ewCgjslaAmicYMFQIde2H9/lrZpjBkN8VwoVtM=
+github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
-github.com/pion/mdns/v2 v2.0.7/go.mod h1:vAdSYNAT0Jy3Ru0zl2YiW3Rm/fJCwIeM0nToenfOJKA=
+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/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
-github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE=
+github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
-github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
-github.com/pion/rtp v1.8.9 h1:E2HX740TZKaqdcPmf4pw6ZZuG8u5RlMMt+l3dxeu6Wk=
+github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
-github.com/pion/rtp v1.8.9/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/sctp v1.8.34 h1:rCuD3m53i0oGxCSp7FLQKvqVx0Nf5AUAHhMRXTTQjBc=
+github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA=
-github.com/pion/sctp v1.8.34/go.mod h1:yWkCClkXlzVW7BXfI2PjrUGBwUI0CjXJBkhLt+sdo4U=
+github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY=
+github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
-github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M=
+github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
-github.com/pion/srtp/v3 v3.0.4 h1:2Z6vDVxzrX3UHEgrUyIGM4rRouoC7v+NiF1IHtp9B5M=
+github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
-github.com/pion/srtp/v3 v3.0.4/go.mod h1:1Jx3FwDoxpRaTh1oRV8A/6G1BnFL+QI82eK4ms8EEJQ=
+github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8=
-github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw=
+github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
-github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU=
+github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ=
-github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
+github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A=
-github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
+github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
-github.com/pion/turn/v4 v4.0.0 h1:qxplo3Rxa9Yg1xXDxxH8xaqcyGUtbHYw4QSCvmFWvhM=
+github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
-github.com/pion/turn/v4 v4.0.0/go.mod h1:MuPDkm15nYSklKpN8vWJ9W2M0PlyQZqYt1McGuxG7mA=
+github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
-github.com/pion/webrtc/v4 v4.0.5 h1:8cVPojcv3cQTwVga2vF1rzCNvkiEimnYdCCG7yF317I=
+github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
-github.com/pion/webrtc/v4 v4.0.5/go.mod h1:LvP8Np5b/sM0uyJIcUPvJcCvhtjHxJwzh2H2PYzE6cQ=
+github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY=
+github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g=
+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/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
 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/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.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE=
-github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
+golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+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-20210119194325-5f4716e94777/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-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 h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+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-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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/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 h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/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-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.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-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-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+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-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+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.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 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/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+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.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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

mediadevices_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/pion/mediadevices/pkg/driver"
 	_ "github.com/pion/mediadevices/pkg/driver/audiotest"
 	_ "github.com/pion/mediadevices/pkg/driver/videotest"
-	"github.com/pion/mediadevices/pkg/frame"
 	"github.com/pion/mediadevices/pkg/prop"
 )
 
@@ -98,145 +97,37 @@ func TestSelectBestDriverConstraintsResultIsSetProperly(t *testing.T) {
 		t.Fatal("expect to get at least 1 property")
 	}
 	expectedProp := driver.Properties()[0]
+	// Since this is a continuous value, bestConstraints should be set with the value that user specified
+	expectedProp.FrameRate = 30.0
 
-	// By reducing the value from the driver by a tiny amount, this property should be chosen.
+	wantConstraints := MediaTrackConstraints{
-	// At the same time, we'll be able to find out if the return constraints will be properly set
+		MediaConstraints: prop.MediaConstraints{
-	// to the best constraints.
+			VideoConstraints: prop.VideoConstraints{
-	cases := map[string]struct {
+				// By reducing the width from the driver by a tiny amount, this property should be chosen.
-		width, height int
+				// At the same time, we'll be able to find out if the return constraints will be properly set
-		frameFormat   frame.Format
+				// to the best constraints.
-		frameRate     float32
+				Width:       prop.Int(expectedProp.Width - 1),
-	}{
+				Height:      prop.Int(expectedProp.Width),
-		"DifferentWidth": {
+				FrameFormat: prop.FrameFormat(expectedProp.FrameFormat),
-			width:       expectedProp.Width - 1,
+				FrameRate:   prop.Float(30.0),
-			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,
 		},
 	}
 
-	for name, c := range cases {
+	bestDriver, bestConstraints, err := selectBestDriver(filterFn, wantConstraints)
-		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 {
-		t.Fatal("expect to open driver successfully")
+		t.Fatal(err)
-	}
-	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,
-		},
 	}
 
-	for name, c := range cases {
+	if driver != bestDriver {
-		c := c
+		t.Fatal("best driver is not expected")
-		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),
-					},
-				},
-			}
 
-			_, _, err := selectBestDriver(filterFn, wantConstraints)
+	s := bestConstraints.selectedMedia
-			if err == nil {
+	if s.Width != expectedProp.Width ||
-				t.Fatal("expect to not find a driver that fits the constraints")
+		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)
 	}
 }

mediastream.go

@@ -3,7 +3,7 @@ package mediadevices
 import (
 	"sync"
 
-	"github.com/pion/webrtc/v4"
+	"github.com/pion/webrtc/v3"
 )
 
 // MediaStream is an interface that represents a collection of existing tracks.

mediastream_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/pion/webrtc/v4"
+	"github.com/pion/webrtc/v3"
 )
 
 type mockMediaStreamTrack struct {

pkg/avfoundation/AVFoundationBind/AVFoundationBind.h

@@ -27,7 +27,6 @@
 #define MAX_DEVICES                      8
 #define MAX_PROPERTIES                   64
 #define MAX_DEVICE_UID_CHARS             64
-#define MAX_DEVICE_NAME_CHARS            64
 
 typedef const char* STATUS;
 static STATUS STATUS_OK                       = (STATUS) NULL;
@@ -47,7 +46,7 @@ typedef enum AVBindFrameFormat {
     AVBindFrameFormatI420,
     AVBindFrameFormatNV21,
     AVBindFrameFormatNV12,
-    AVBindFrameFormatYUYV,
+    AVBindFrameFormatYUY2,
     AVBindFrameFormatUYVY,
 } AVBindFrameFormat;
 
@@ -66,7 +65,6 @@ typedef struct AVBindSession AVBindSession, *PAVBindSession;
 
 typedef struct {
     char uid[MAX_DEVICE_UID_CHARS + 1];
-    char name[MAX_DEVICE_NAME_CHARS + 1];
 } AVBindDevice, *PAVBindDevice;
 
 // AVBindDevices returns a list of AVBindDevices. The result array is pointing to a static

pkg/avfoundation/AVFoundationBind/AVFoundationBind.m

@@ -46,8 +46,6 @@
         } \
     } while(0)
 
-static NSString *const UnrecognizedMacOSVersionException = @"UnrecognizedMacOSVersionException";
-
 @interface VideoDataDelegate : NSObject<AVCaptureVideoDataOutputSampleBufferDelegate>
 
 @property (readonly) AVBindDataCallback mCallback;
@@ -76,61 +74,26 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
     if (CMSampleBufferGetNumSamples(sampleBuffer) != 1 ||
         !CMSampleBufferIsValid(sampleBuffer) ||
         !CMSampleBufferDataIsReady(sampleBuffer)) {
-        return;
+      return;
     }
 
     CVImageBufferRef imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
     if (imageBuffer == NULL) {
-        return;
+      return;
     }
 
-    CVBufferRetain(imageBuffer);
+    imageBuffer = CVBufferRetain(imageBuffer);
     CVReturn ret =
         CVPixelBufferLockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly);
     if (ret != kCVReturnSuccess) {
-        CVBufferRelease(imageBuffer);
+      return;
-        return;
-    }
-    
-    // Handle NV12 special case
-    OSType pixelFormat = CVPixelBufferGetPixelFormatType(imageBuffer);
-    if (pixelFormat == kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange) {
-        // Get actual dimensions of image (without padding)
-        size_t width = CVPixelBufferGetWidth(imageBuffer);
-        size_t height = CVPixelBufferGetHeight(imageBuffer);
-        size_t totalSize = /*Y plane*/ width * height + /*UV plane*/ width * height / 2;
-
-        size_t bytesPerRowY = CVPixelBufferGetBytesPerRowOfPlane(imageBuffer, 0);
-        size_t bytesPerRowUV = CVPixelBufferGetBytesPerRowOfPlane(imageBuffer, 1);
-
-        void *mergedBuffer = malloc(totalSize);
-        if (!mergedBuffer) {
-            NSLog(@"Failed to allocate memory for merged buffer");
-            CVPixelBufferUnlockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly);
-            CVBufferRelease(imageBuffer);
-            return;
-        }
-
-        // Truncate data where we know it should end to strip padding
-        void *yPlaneBuf = CVPixelBufferGetBaseAddressOfPlane(imageBuffer, 0);
-        for (size_t row = 0; row < height; ++row) {
-            memcpy(mergedBuffer + row * width, yPlaneBuf + row * bytesPerRowY, width);
-        }
-
-        void *uvPlaneBuf = CVPixelBufferGetBaseAddressOfPlane(imageBuffer, 1);
-        for (size_t row = 0; row < height / 2; ++row) {
-            memcpy(mergedBuffer + width * height + row * width, uvPlaneBuf + row * bytesPerRowUV, width);
-        }
-
-        _mCallback(_mPUserData, mergedBuffer, (int)totalSize);
-        free(mergedBuffer);
-    } else {
-        void *buf = CVPixelBufferGetBaseAddress(imageBuffer);
-        size_t dataSize = CVPixelBufferGetDataSize(imageBuffer);
-        _mCallback(_mPUserData, buf, (int)dataSize);
     }
 
-    CVPixelBufferUnlockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly);
+    void *buf = CVPixelBufferGetBaseAddressOfPlane(imageBuffer, 0);
+    size_t dataSize = CVPixelBufferGetDataSize(imageBuffer);
+    _mCallback(_mPUserData, buf, (int)dataSize);
+
+    CVPixelBufferUnlockBaseAddress(imageBuffer, 0);
     CVBufferRelease(imageBuffer);
 }
 
@@ -176,7 +139,7 @@ STATUS frameFormatToFourCC(AVBindFrameFormat format, FourCharCode *pFourCC) {
         case AVBindFrameFormatUYVY:
             *pFourCC = kCVPixelFormatType_422YpCbCr8;
             break;
-        case AVBindFrameFormatYUYV:
+        case AVBindFrameFormatYUY2:
             *pFourCC = kCVPixelFormatType_422YpCbCr8_yuvs;
             break;
         // TODO: Add the rest of frame formats
@@ -200,7 +163,7 @@ STATUS frameFormatFromFourCC(FourCharCode fourCC, AVBindFrameFormat *pFormat) {
             *pFormat = AVBindFrameFormatUYVY;
             break;
         case kCVPixelFormatType_422YpCbCr8_yuvs:
-            *pFormat = AVBindFrameFormatYUYV;
+            *pFormat = AVBindFrameFormatYUY2;
             break;
          // TODO: Add the rest of frame formats
         default:
@@ -219,32 +182,15 @@ STATUS AVBindDevices(AVBindMediaType mediaType, PAVBindDevice *ppDevices, int *p
 
     PAVBindDevice pDevice;
     AVMediaType _mediaType = mediaType == AVBindMediaTypeVideo ? AVMediaTypeVideo : AVMediaTypeAudio;
-
+    NSArray *refAllTypes = @[
-    NSArray *refAllTypes;
+        AVCaptureDeviceTypeBuiltInWideAngleCamera,
-    #if defined(MAC_OS_VERSION_14_0)
+        AVCaptureDeviceTypeBuiltInMicrophone,
-        if (@available(macOS 14.0, *)) {
+        AVCaptureDeviceTypeExternalUnknown
-            refAllTypes = @[
+    ];
-                AVCaptureDeviceTypeBuiltInWideAngleCamera,
-                AVCaptureDeviceTypeMicrophone,
-                AVCaptureDeviceTypeExternal,
-            ];
-        } else {
-            @throw [NSException exceptionWithName:UnrecognizedMacOSVersionException
-                                                   reason:@"Unrecognized or unsupported macOS version detected."
-                                                 userInfo:nil];
-        }
-    #else
-        refAllTypes = @[
-           AVCaptureDeviceTypeBuiltInWideAngleCamera,
-           AVCaptureDeviceTypeBuiltInMicrophone,
-           AVCaptureDeviceTypeExternalUnknown,
-        ];
-    #endif
-
     AVCaptureDeviceDiscoverySession *refSession = [AVCaptureDeviceDiscoverySession
-                                                   discoverySessionWithDeviceTypes: refAllTypes
+        discoverySessionWithDeviceTypes: refAllTypes
-                                                   mediaType: _mediaType
+        mediaType: _mediaType
-                                                   position: AVCaptureDevicePositionUnspecified];
+        position: AVCaptureDevicePositionUnspecified];
 
     int i = 0;
     for (AVCaptureDevice *refDevice in refSession.devices) {
@@ -255,8 +201,6 @@ STATUS AVBindDevices(AVBindMediaType mediaType, PAVBindDevice *ppDevices, int *p
         pDevice = devices + i;
         strncpy(pDevice->uid, refDevice.uniqueID.UTF8String, MAX_DEVICE_UID_CHARS);
         pDevice->uid[MAX_DEVICE_UID_CHARS] = '\0';
-        strncpy(pDevice->name, refDevice.localizedName.UTF8String, MAX_DEVICE_NAME_CHARS);
-        pDevice->name[MAX_DEVICE_NAME_CHARS] = '\0';
         i++;
     }
 

pkg/avfoundation/avfoundation_darwin.go

@@ -11,10 +11,8 @@ package avfoundation
 // }
 import "C"
 import (
-	"context"
 	"fmt"
 	"io"
-	"sync"
 	"unsafe"
 
 	"github.com/pion/mediadevices/pkg/frame"
@@ -34,7 +32,6 @@ type Device struct {
 	// UID is a unique identifier for a device
 	UID     string
 	cDevice C.AVBindDevice
-	Name    string
 }
 
 func frameFormatToAVBind(f frame.Format) (C.AVBindFrameFormat, bool) {
@@ -45,8 +42,8 @@ func frameFormatToAVBind(f frame.Format) (C.AVBindFrameFormat, bool) {
 		return C.AVBindFrameFormatNV21, true
 	case frame.FormatNV12:
 		return C.AVBindFrameFormatNV12, true
-	case frame.FormatYUYV:
+	case frame.FormatYUY2:
-		return C.AVBindFrameFormatYUYV, true
+		return C.AVBindFrameFormatYUY2, true
 	case frame.FormatUYVY:
 		return C.AVBindFrameFormatUYVY, true
 	default:
@@ -62,8 +59,8 @@ func frameFormatFromAVBind(f C.AVBindFrameFormat) (frame.Format, bool) {
 		return frame.FormatNV21, true
 	case C.AVBindFrameFormatNV12:
 		return frame.FormatNV12, true
-	case C.AVBindFrameFormatYUYV:
+	case C.AVBindFrameFormatYUY2:
-		return frame.FormatYUYV, true
+		return frame.FormatYUY2, true
 	case C.AVBindFrameFormatUYVY:
 		return frame.FormatUYVY, true
 	default:
@@ -88,7 +85,6 @@ func Devices(mediaType MediaType) ([]Device, error) {
 	for i := range devices {
 		devices[i].UID = C.GoString(&cDevices[i].uid[0])
 		devices[i].cDevice = cDevices[i]
-		devices[i].Name = C.GoString(&cDevices[i].name[0])
 	}
 
 	return devices, nil
@@ -97,13 +93,9 @@ func Devices(mediaType MediaType) ([]Device, error) {
 // ReadCloser is a wrapper around the data callback from AVFoundation. The data received from the
 // the underlying callback can be retrieved by calling Read.
 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 {
@@ -111,25 +103,12 @@ func newReadCloser(onClose func()) *ReadCloser {
 	rc.dataChan = make(chan []byte, 1)
 	rc.onClose = onClose
 	rc.id = register(rc.dataCb)
-	cancelCtx, cancelFunc := context.WithCancel(context.Background())
-	rc.cancelCtx = cancelCtx
-	rc.cancelFunc = cancelFunc
 	return &rc
 }
 
 func (rc *ReadCloser) dataCb(data []byte) {
-	rc.closeWG.Add(1)
-	defer rc.closeWG.Done()
-
 	// TODO: add a policy for slow reader
-	if rc.cancelCtx.Err() != nil {
+	rc.dataChan <- data
-		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:
@@ -145,28 +124,17 @@ func (rc *ReadCloser) Read() ([]byte, func(), error) {
 
 // Close closes the capturing session, and no data will flow anymore
 func (rc *ReadCloser) Close() {
-	rc.lock.Lock()
-	defer rc.lock.Unlock()
-
-	if rc.cancelCtx.Err() != nil {
-		return // already closed
-	}
-
 	if rc.onClose != nil {
 		rc.onClose()
 	}
-	rc.cancelFunc()
-	unregister(rc.id)
-	rc.closeWG.Wait()
 	close(rc.dataChan)
+	unregister(rc.id)
 }
 
 // Session represents a capturing session.
 type Session struct {
 	device   Device
 	cSession C.PAVBindSession
-	lock     sync.Mutex
-	closed   bool
 }
 
 // NewSession creates a new capturing session
@@ -184,13 +152,6 @@ func NewSession(device Device) (*Session, error) {
 
 // Close stops capturing session and frees up resources
 func (session *Session) Close() error {
-	session.lock.Lock()
-	defer session.lock.Unlock()
-	if session.closed {
-		return nil
-	}
-	session.closed = true
-
 	if session.cSession == nil {
 		return nil
 	}

pkg/codec/codec.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pion/mediadevices/pkg/prop"
 	"github.com/pion/rtp"
 	"github.com/pion/rtp/codecs"
-	"github.com/pion/webrtc/v4"
+	"github.com/pion/webrtc/v3"
 )
 
 // RTPCodec wraps webrtc.RTPCodec. RTPCodec might extend webrtc.RTPCodec in the future.

pkg/codec/internal/codectest/codectest.go

@@ -119,41 +119,3 @@ func VideoEncoderCloseTwiceTest(t *testing.T, c codec.VideoEncoderBuilder, p pro
 		t.Fatal(err)
 	}
 }
-
-func AudioEncoderReadAfterCloseTest(t *testing.T, c codec.AudioEncoderBuilder, p prop.Media, w wave.Audio) {
-	enc, err := c.BuildAudioEncoder(audio.ReaderFunc(func() (wave.Audio, func(), error) {
-		return w, nil, nil
-	}), p)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := assertNoPanic(t, enc.Close, "on Close()"); err != nil {
-		t.Fatal(err)
-	}
-	if err := assertNoPanic(t, func() error {
-		_, _, err := enc.Read()
-		return err
-	}, "on Read()"); err != io.EOF {
-		t.Fatalf("Expected: %v, got: %v", io.EOF, err)
-	}
-}
-
-func VideoEncoderReadAfterCloseTest(t *testing.T, c codec.VideoEncoderBuilder, p prop.Media, img image.Image) {
-	enc, err := c.BuildVideoEncoder(video.ReaderFunc(func() (image.Image, func(), error) {
-		return img, nil, nil
-	}), p)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := assertNoPanic(t, enc.Close, "on Close()"); err != nil {
-		t.Fatal(err)
-	}
-	if err := assertNoPanic(t, func() error {
-		_, _, err := enc.Read()
-		return err
-	}, "on Read()"); err != io.EOF {
-		t.Fatalf("Expected: %v, got: %v", io.EOF, err)
-	}
-}

pkg/codec/mmal/mmal.go

@@ -64,11 +64,10 @@ func (e *encoder) Read() ([]byte, func(), error) {
 		return nil, func() {}, io.EOF
 	}
 
-	img, release, err := e.r.Read()
+	img, _, err := e.r.Read()
 	if err != nil {
 		return nil, func() {}, err
 	}
-	defer release()
 	imgReal := img.(*image.YCbCr)
 	var y, cb, cr C.Slice
 	y.data = (*C.uchar)(&imgReal.Y[0])

pkg/codec/mmal/mmal_test.go

@@ -44,25 +44,6 @@ func TestEncoder(t *testing.T) {
 			},
 		})
 	})
-	t.Run("ReadAfterClose", func(t *testing.T) {
-		p, err := NewParams()
-		if err != nil {
-			t.Fatal(err)
-		}
-		codectest.VideoEncoderReadAfterCloseTest(t, &p,
-			prop.Media{
-				Video: prop.Video{
-					Width:       256,
-					Height:      144,
-					FrameFormat: frame.FormatI420,
-				},
-			},
-			image.NewYCbCr(
-				image.Rect(0, 0, 256, 144),
-				image.YCbCrSubsampleRatio420,
-			),
-		)
-	})
 }
 
 func TestShouldImplementBitRateControl(t *testing.T) {

pkg/codec/openh264/bridge.cpp

@@ -21,26 +21,29 @@ Encoder *enc_new(const EncoderOptions opts, int *eresult) {
     return NULL;
   }
 
-  params.iUsageType = opts.usage_type;
+  // TODO: Remove hardcoded values
+  params.iUsageType = CAMERA_VIDEO_REAL_TIME;
   params.iPicWidth = opts.width;
   params.iPicHeight = opts.height;
   params.iTargetBitrate = opts.target_bitrate;
   params.iMaxBitrate = opts.target_bitrate;
-  params.iRCMode = opts.rc_mode;
+  params.iRCMode = RC_BITRATE_MODE;
   params.fMaxFrameRate = opts.max_fps;
-  params.bEnableFrameSkip = opts.enable_frame_skip;
+  params.bEnableFrameSkip = true;
-  params.uiMaxNalSize = opts.max_nal_size;
+  params.uiMaxNalSize = 0;
-  params.uiIntraPeriod = opts.intra_period;
+  params.uiIntraPeriod = 30;
-  params.iMultipleThreadIdc = opts.multiple_thread_idc;
+  // set to 0, so that it'll automatically use multi threads when needed
+  params.iMultipleThreadIdc = 0;
   // The base spatial layer 0 is the only one we use.
   params.sSpatialLayers[0].iVideoWidth = params.iPicWidth;
   params.sSpatialLayers[0].iVideoHeight = params.iPicHeight;
   params.sSpatialLayers[0].fFrameRate = params.fMaxFrameRate;
   params.sSpatialLayers[0].iSpatialBitrate = params.iTargetBitrate;
   params.sSpatialLayers[0].iMaxSpatialBitrate = params.iTargetBitrate;
-  params.sSpatialLayers[0].sSliceArgument.uiSliceNum = opts.slice_num;
+  // Single NAL unit mode
-  params.sSpatialLayers[0].sSliceArgument.uiSliceMode = opts.slice_mode;
+  params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
-  params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = opts.slice_size_constraint;
+  params.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE;
+  params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = 12800;
 
   rv = engine->InitializeExt(&params);
   if (rv != 0) {
@@ -78,15 +81,16 @@ Slice enc_encode(Encoder *e, Frame f, int *eresult) {
   Slice payload = {0};
 
   if(e->force_key_frame == 1) {
-    e->engine->ForceIntraFrame(true);
+    info.eFrameType = videoFrameTypeI;
     e->force_key_frame = 0;
   }
 
   pic.iPicWidth = f.width;
   pic.iPicHeight = f.height;
   pic.iColorFormat = videoFormatI420;
-  pic.iStride[0] = f.ystride;
+  // We always received I420 format
-  pic.iStride[1] = pic.iStride[2] = f.cstride;
+  pic.iStride[0] = pic.iPicWidth;
+  pic.iStride[1] = pic.iStride[2] = pic.iPicWidth / 2;
   pic.pData[0] = (unsigned char *)f.y;
   pic.pData[1] = (unsigned char *)f.u;
   pic.pData[2] = (unsigned char *)f.v;

pkg/codec/openh264/bridge.hpp

@@ -12,8 +12,6 @@ typedef struct Slice {
 
 typedef struct Frame {
   void *y, *u, *v;
-  int ystride;
-  int cstride;
   int height;
   int width;
 } Frame;
@@ -22,15 +20,6 @@ typedef struct EncoderOptions {
   int width, height;
   int target_bitrate;
   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;
 
 typedef struct Encoder {

pkg/codec/openh264/openh264.go

@@ -33,19 +33,10 @@ func newEncoder(r video.Reader, p prop.Media, params Params) (codec.ReadCloser,
 
 	var rv C.int
 	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)
 	if err := errResult(rv); err != nil {
 		return nil, fmt.Errorf("failed in creating encoder: %v", err)
@@ -65,23 +56,20 @@ func (e *encoder) Read() ([]byte, func(), error) {
 		return nil, func() {}, io.EOF
 	}
 
-	img, release, err := e.r.Read()
+	img, _, err := e.r.Read()
 	if err != nil {
 		return nil, func() {}, err
 	}
-	defer release()
 
 	yuvImg := img.(*image.YCbCr)
 	bounds := yuvImg.Bounds()
 	var rv C.int
 	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]),
-		ystride: C.int(yuvImg.YStride),
+		height: C.int(bounds.Max.Y - bounds.Min.Y),
-		cstride: C.int(yuvImg.CStride),
+		width:  C.int(bounds.Max.X - bounds.Min.X),
-		height:  C.int(bounds.Max.Y - bounds.Min.Y),
-		width:   C.int(bounds.Max.X - bounds.Min.X),
 	}, &rv)
 	if err := errResult(rv); err != nil {
 		return nil, func() {}, fmt.Errorf("failed in encoding: %v", err)

pkg/codec/openh264/openh264_static.go

@@ -8,6 +8,5 @@ package openh264
 //#cgo linux,arm64 LDFLAGS: ${SRCDIR}/lib/libopenh264-linux-arm64.a
 //#cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/libopenh264-linux-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
 import "C"

pkg/codec/openh264/openh264_test.go

@@ -60,23 +60,4 @@ func TestEncoder(t *testing.T) {
 			},
 		})
 	})
-	t.Run("ReadAfterClose", func(t *testing.T) {
-		p, err := NewParams()
-		if err != nil {
-			t.Fatal(err)
-		}
-		codectest.VideoEncoderReadAfterCloseTest(t, &p,
-			prop.Media{
-				Video: prop.Video{
-					Width:       256,
-					Height:      144,
-					FrameFormat: frame.FormatI420,
-				},
-			},
-			image.NewYCbCr(
-				image.Rect(0, 0, 256, 144),
-				image.YCbCrSubsampleRatio420,
-			),
-		)
-	})
 }

pkg/codec/openh264/params.go

@@ -1,8 +1,5 @@
 package openh264
 
-// #include <openh264/codec_api.h>
-import "C"
-
 import (
 	"github.com/pion/mediadevices/pkg/codec"
 	"github.com/pion/mediadevices/pkg/io/video"
@@ -12,62 +9,14 @@ import (
 // Params stores libopenh264 specific encoding parameters.
 type Params struct {
 	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.
 func NewParams() (Params, error) {
 	return Params{
 		BaseParams: codec.BaseParams{
 			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
 }
 

pkg/codec/opus/opus.go

@@ -3,8 +3,6 @@ package opus
 import (
 	"errors"
 	"fmt"
-	"io"
-	"sync"
 
 	"github.com/pion/mediadevices/pkg/codec"
 	"github.com/pion/mediadevices/pkg/io/audio"
@@ -16,7 +14,7 @@ import (
 /*
 #include <opus.h>
 
-int pion_set_encoder_bitrate(OpusEncoder *e, opus_int32 bitrate)
+int bridge_encoder_set_bitrate(OpusEncoder *e, opus_int32 bitrate)
 {
 	return opus_encoder_ctl(e, OPUS_SET_BITRATE(bitrate));
 }
@@ -27,8 +25,6 @@ type encoder struct {
 	inBuff wave.Audio
 	reader audio.Reader
 	engine *C.OpusEncoder
-
-	mu sync.Mutex
 }
 
 func newEncoder(r audio.Reader, p prop.Media, params Params) (codec.ReadCloser, error) {
@@ -83,12 +79,6 @@ func (e *encoder) Read() ([]byte, func(), error) {
 		return nil, func() {}, err
 	}
 
-	e.mu.Lock()
-	defer e.mu.Unlock()
-	if e.engine == nil {
-		return nil, nil, io.EOF
-	}
-
 	encoded := make([]byte, 1024)
 	var n C.opus_int32
 	switch b := buff.(type) {
@@ -120,7 +110,7 @@ func (e *encoder) Read() ([]byte, func(), error) {
 }
 
 func (e *encoder) SetBitRate(bitRate int) error {
-	cerror := C.pion_set_encoder_bitrate(
+	cerror := C.bridge_encoder_set_bitrate(
 		e.engine,
 		C.int(bitRate),
 	)
@@ -136,8 +126,6 @@ func (e *encoder) Controller() codec.EncoderController {
 }
 
 func (e *encoder) Close() error {
-	e.mu.Lock()
-	defer e.mu.Unlock()
 	if e.engine == nil {
 		return nil
 	}

pkg/codec/opus/opus_static.go

@@ -8,6 +8,5 @@ package opus
 //#cgo linux,arm64 LDFLAGS: ${SRCDIR}/lib/libopus-linux-arm64.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,arm64 LDFLAGS: ${SRCDIR}/lib/libopus-darwin-arm64.a
 //#cgo windows,amd64 LDFLAGS: ${SRCDIR}/lib/libopus-windows-x64.a
 import "C"

pkg/codec/opus/opus_test.go

@@ -57,23 +57,4 @@ func TestEncoder(t *testing.T) {
 			},
 		})
 	})
-	t.Run("ReadAfterClose", func(t *testing.T) {
-		p, err := NewParams()
-		if err != nil {
-			t.Fatal(err)
-		}
-		codectest.AudioEncoderReadAfterCloseTest(t, &p,
-			prop.Media{
-				Audio: prop.Audio{
-					SampleRate:   48000,
-					ChannelCount: 2,
-				},
-			},
-			wave.NewInt16Interleaved(wave.ChunkInfo{
-				Len:          960,
-				SamplingRate: 48000,
-				Channels:     2,
-			}),
-		)
-	})
 }

pkg/codec/vaapi/vaapi_test.go

@@ -65,25 +65,6 @@ func TestEncoder(t *testing.T) {
 					},
 				})
 			})
-			t.Run("ReadAfterClose", func(t *testing.T) {
-				p, err := factory()
-				if err != nil {
-					t.Fatal(err)
-				}
-				codectest.VideoEncoderReadAfterCloseTest(t, p,
-					prop.Media{
-						Video: prop.Video{
-							Width:       256,
-							Height:      144,
-							FrameFormat: frame.FormatI420,
-						},
-					},
-					image.NewYCbCr(
-						image.Rect(0, 0, 256, 144),
-						image.YCbCrSubsampleRatio420,
-					),
-				)
-			})
 		})
 	}
 }

pkg/codec/vaapi/vp8.go

@@ -62,7 +62,6 @@ import (
 	"image"
 	"io"
 	"sync"
-	"sync/atomic"
 	"unsafe"
 
 	"github.com/pion/mediadevices/pkg/codec"
@@ -101,8 +100,6 @@ type encoderVP8 struct {
 
 	rate *framerateDetector
 
-	forceKeyFrame atomic.Bool
-
 	mu     sync.Mutex
 	closed bool
 }
@@ -307,11 +304,10 @@ func (e *encoderVP8) Read() ([]byte, func(), error) {
 		return nil, func() {}, io.EOF
 	}
 
-	img, release, err := e.r.Read()
+	img, _, err := e.r.Read()
 	if err != nil {
 		return nil, func() {}, err
 	}
-	defer release()
 	yuvImg := img.(*image.YCbCr)
 
 	kf := e.frameCnt%e.params.KeyFrameInterval == 0
@@ -319,7 +315,7 @@ func (e *encoderVP8) Read() ([]byte, func(), error) {
 
 	e.frParam.data.framerate = C.uint(e.rate.Calc())
 
-	if kf || e.forceKeyFrame.CompareAndSwap(true, false) {
+	if kf {
 		// Key frame
 		C.setForceKFFlagVP8(&e.picParam, 1)
 		C.setFrameTypeFlagVP8(&e.picParam, 0)
@@ -545,14 +541,10 @@ func (e *encoderVP8) Read() ([]byte, func(), error) {
 	return encoded, func() {}, err
 }
 
-func (e *encoderVP8) Controller() codec.EncoderController {
+func (e *encoder) Controller() codec.EncoderController {
 	return e
 }
 
-func (e *encoderVP8) ForceKeyFrame() {
-	e.forceKeyFrame.Store(true)
-}
-
 func (e *encoderVP8) Close() error {
 	e.mu.Lock()
 	defer e.mu.Unlock()

pkg/codec/vaapi/vp8_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 )
 
-func TestVP8ShouldImplementBitRateControl(t *testing.T) {
+func TestShouldImplementBitRateControl(t *testing.T) {
 	t.SkipNow() // TODO: Implement bit rate control
 
 	e := &encoderVP8{}
@@ -17,7 +17,9 @@ func TestVP8ShouldImplementBitRateControl(t *testing.T) {
 	}
 }
 
-func TestVP8ShouldImplementKeyFrameControl(t *testing.T) {
+func TestShouldImplementKeyFrameControl(t *testing.T) {
+	t.SkipNow() // TODO: Implement key frame control
+
 	e := &encoderVP8{}
 	if _, ok := e.Controller().(codec.KeyFrameController); !ok {
 		t.Error()

pkg/codec/vaapi/vp9.go

@@ -45,7 +45,6 @@ import (
 	"image"
 	"io"
 	"sync"
-	"sync/atomic"
 	"unsafe"
 
 	"github.com/pion/mediadevices/pkg/codec"
@@ -93,8 +92,6 @@ type encoderVP9 struct {
 
 	rate *framerateDetector
 
-	forceKeyFrame atomic.Bool
-
 	mu     sync.Mutex
 	closed bool
 }
@@ -296,11 +293,10 @@ func (e *encoderVP9) Read() ([]byte, func(), error) {
 		return nil, func() {}, io.EOF
 	}
 
-	img, release, err := e.r.Read()
+	img, _, err := e.r.Read()
 	if err != nil {
 		return nil, func() {}, err
 	}
-	defer release()
 	yuvImg := img.(*image.YCbCr)
 
 	kf := e.frameCnt%e.params.KeyFrameInterval == 0
@@ -308,7 +304,7 @@ func (e *encoderVP9) Read() ([]byte, func(), error) {
 
 	e.frParam.data.framerate = C.uint(e.rate.Calc())
 
-	if kf || e.forceKeyFrame.CompareAndSwap(true, false) {
+	if kf {
 		C.setForceKFFlag9(&e.picParam, 1)
 		C.setFrameTypeFlagVP9(&e.picParam, 0)
 		e.picParam.refresh_frame_flags = 0
@@ -480,14 +476,10 @@ func (e *encoderVP9) Read() ([]byte, func(), error) {
 	return encoded, func() {}, err
 }
 
-func (e *encoderVP9) Controller() codec.EncoderController {
+func (e *encoder) Controller() codec.EncoderController {
 	return e
 }
 
-func (e *encoderVP9) ForceKeyFrame() {
-	e.forceKeyFrame.Store(true)
-}
-
 func (e *encoderVP9) Close() error {
 	e.mu.Lock()
 	defer e.mu.Unlock()

pkg/codec/vaapi/vp9_test.go

@@ -3,12 +3,7 @@
 
 package vaapi
 
-import (
+func TestShouldImplementBitRateControl(t *testing.T) {
-	"github.com/pion/mediadevices/pkg/codec"
-	"testing"
-)
-
-func TestVP9ShouldImplementBitRateControl(t *testing.T) {
 	t.SkipNow() // TODO: Implement bit rate control
 
 	e := &encoderVP9{}
@@ -17,7 +12,9 @@ func TestVP9ShouldImplementBitRateControl(t *testing.T) {
 	}
 }
 
-func TestVP9ShouldImplementKeyFrameControl(t *testing.T) {
+func TestShouldImplementKeyFrameControl(t *testing.T) {
+	t.SkipNow() // TODO: Implement key frame control
+
 	e := &encoderVP9{}
 	if _, ok := e.Controller().(codec.KeyFrameController); !ok {
 		t.Error()

pkg/codec/vpx/vpx.go

@@ -219,11 +219,10 @@ func (e *encoder) Read() ([]byte, func(), error) {
 		return nil, func() {}, io.EOF
 	}
 
-	img, release, err := e.r.Read()
+	img, _, err := e.r.Read()
 	if err != nil {
 		return nil, func() {}, err
 	}
-	defer release()
 	yuvImg := img.(*image.YCbCr)
 	bounds := yuvImg.Bounds()
 	height := C.int(bounds.Dy())

pkg/codec/vpx/vpx_test.go

@@ -60,25 +60,6 @@ func TestEncoder(t *testing.T) {
 					},
 				})
 			})
-			t.Run("ReadAfterClose", func(t *testing.T) {
-				p, err := factory()
-				if err != nil {
-					t.Fatal(err)
-				}
-				codectest.VideoEncoderReadAfterCloseTest(t, p,
-					prop.Media{
-						Video: prop.Video{
-							Width:       256,
-							Height:      144,
-							FrameFormat: frame.FormatI420,
-						},
-					},
-					image.NewYCbCr(
-						image.Rect(0, 0, 256, 144),
-						image.YCbCrSubsampleRatio420,
-					),
-				)
-			})
 		})
 	}
 }

pkg/codec/x264/bridge.h

@@ -18,7 +18,6 @@ typedef struct Encoder {
   x264_t *h;
   x264_picture_t pic_in;
   x264_param_t param;
-  int force_key_frame;
 } Encoder;
 
 Encoder *enc_new(x264_param_t param, char *preset, int *rc) {
@@ -86,14 +85,8 @@ 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[1] = cb;
   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);
-  e->force_key_frame = 0;
   Slice s = {.data_len = frame_size};
   if (frame_size <= 0) {
     *rc = ERR_ENCODE;

pkg/codec/x264/x264.go

@@ -102,11 +102,10 @@ func (e *encoder) Read() ([]byte, func(), error) {
 		return nil, func() {}, io.EOF
 	}
 
-	img, release, err := e.r.Read()
+	img, _, err := e.r.Read()
 	if err != nil {
 		return nil, func() {}, err
 	}
-	defer release()
 	yuvImg := img.(*image.YCbCr)
 
 	var rc C.int
@@ -125,14 +124,6 @@ func (e *encoder) Read() ([]byte, func(), error) {
 	return encoded, func() {}, err
 }
 
-// TODO: Implement bit rate control
-//var _ codec.BitRateController = (*encoder)(nil)
-
-func (e *encoder) ForceKeyFrame() error {
-	e.engine.force_key_frame = C.int(1)
-	return nil
-}
-
 func (e *encoder) Controller() codec.EncoderController {
 	return e
 }

pkg/codec/x264/x264_test.go

@@ -46,26 +46,6 @@ func TestEncoder(t *testing.T) {
 			},
 		})
 	})
-	t.Run("ReadAfterClose", func(t *testing.T) {
-		p, err := NewParams()
-		if err != nil {
-			t.Fatal(err)
-		}
-		p.BitRate = 200000
-		codectest.VideoEncoderReadAfterCloseTest(t, &p,
-			prop.Media{
-				Video: prop.Video{
-					Width:       256,
-					Height:      144,
-					FrameFormat: frame.FormatI420,
-				},
-			},
-			image.NewYCbCr(
-				image.Rect(0, 0, 256, 144),
-				image.YCbCrSubsampleRatio420,
-			),
-		)
-	})
 }
 
 func TestShouldImplementKeyFrameControl(t *testing.T) {

pkg/driver/availability/error.go

@@ -1,28 +0,0 @@
-package availability
-
-import (
-	"errors"
-)
-
-var (
-	ErrUnimplemented = NewError("not implemented")
-	ErrBusy          = NewError("device or resource busy")
-	ErrNoDevice      = NewError("no such device")
-)
-
-type errorString struct {
-	s string
-}
-
-func NewError(text string) error {
-	return &errorString{text}
-}
-
-func IsError(err error) bool {
-	var target *errorString
-	return errors.As(err, &target)
-}
-
-func (e *errorString) Error() string {
-	return e.s
-}

pkg/driver/camera/camera_darwin.go

@@ -13,15 +13,9 @@ import (
 type camera struct {
 	device  avfoundation.Device
 	session *avfoundation.Session
-	rcClose func()
 }
 
 func init() {
-	Initialize()
-}
-
-// Initialize finds and registers camera devices. This is part of an experimental API.
-func Initialize() {
 	devices, err := avfoundation.Devices(avfoundation.Video)
 	if err != nil {
 		panic(err)
@@ -32,7 +26,6 @@ func Initialize() {
 		driver.GetManager().Register(cam, driver.Info{
 			Label:      device.UID,
 			DeviceType: driver.Camera,
-			Name:       device.Name,
 		})
 	}
 }
@@ -50,9 +43,6 @@ func (cam *camera) Open() error {
 }
 
 func (cam *camera) Close() error {
-	if cam.rcClose != nil {
-		cam.rcClose()
-	}
 	return cam.session.Close()
 }
 
@@ -66,7 +56,6 @@ func (cam *camera) VideoRecord(property prop.Media) (video.Reader, error) {
 	if err != nil {
 		return nil, err
 	}
-	cam.rcClose = rc.Close
 	r := video.ReaderFunc(func() (image.Image, func(), error) {
 		frame, _, err := rc.Read()
 		if err != nil {

pkg/driver/camera/camera_linux.go

@@ -8,15 +8,9 @@ import (
 	"errors"
 	"image"
 	"io"
-	"math"
 	"os"
 	"path/filepath"
-	"strconv"
 	"sync"
-	"syscall"
-	"time"
-
-	"github.com/pion/mediadevices/pkg/driver/availability"
 
 	"github.com/blackjack/webcam"
 	"github.com/pion/mediadevices/pkg/driver"
@@ -65,8 +59,6 @@ var (
 	}
 )
 
-const bufCount = 2
-
 // Camera implementation using v4l2
 // Reference: https://linuxtv.org/downloads/v4l-dvb-apis/uapi/v4l/videodev.html#videodev
 type camera struct {
@@ -77,23 +69,10 @@ type camera struct {
 	started         bool
 	mutex           sync.Mutex
 	cancel          func()
-	prevFrameTime   time.Time
 }
 
 func init() {
-	Initialize()
-}
-
-// Initialize finds and registers camera devices. This is part of an experimental API.
-func Initialize() {
-	// Clear all registered camera devices to prevent duplicates.
-	// If first initalize call, this will be a noop.
-	manager := driver.GetManager()
-	for _, d := range manager.Query(driver.FilterVideoRecorder()) {
-		manager.Delete(d.ID())
-	}
 	discovered := make(map[string]struct{})
-	discover(discovered, "/dev/v4l/by-id/*")
 	discover(discovered, "/dev/v4l/by-path/*")
 	discover(discovered, "/dev/video*")
 }
@@ -122,22 +101,7 @@ func discover(discovered map[string]struct{}, pattern string) {
 		if reallink == prioritizedDevice {
 			priority = driver.PriorityHigh
 		}
-
-		var name, busInfo string
-		if webcamCam, err := webcam.Open(cam.path); err == nil {
-			defer webcamCam.Close()
-			name, _ = webcamCam.GetName()
-			busInfo, _ = webcamCam.GetBusInfo()
-		}
-
 		driver.GetManager().Register(cam, driver.Info{
-			// 	Source: https://www.kernel.org/doc/html/v4.9/media/uapi/v4l/vidioc-querycap.html
-			//	Name of the device, a NUL-terminated UTF-8 string. For example: “Yoyodyne TV/FM”. One driver may support
-			//	different brands or models of video hardware. This information is intended for users, for example in a
-			//	menu of available devices. Since multiple TV cards of the same brand may be installed which are
-			//	supported by the same driver, this name should be combined with the character device file name
-			//	(e.g. /dev/video2) or the bus_info string to avoid ambiguities.
-			Name:       name + LabelSeparator + busInfo,
 			Label:      label + LabelSeparator + reallink,
 			DeviceType: driver.Camera,
 			Priority:   priority,
@@ -169,32 +133,14 @@ func newCamera(path string) *camera {
 	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 {
 	cam, err := webcam.Open(c.path)
 	if err != nil {
 		return err
 	}
 
-	// Buffering should be handled in higher level.
+	// Late frames should be discarded. Buffering should be handled in higher level.
-	err = cam.SetBufferCount(bufCount)
+	cam.SetBufferCount(1)
-	if err != nil {
-		return err
-	}
-
-	c.prevFrameTime = time.Now()
 	c.cam = cam
 	return nil
 }
@@ -233,21 +179,12 @@ func (c *camera) VideoRecord(p prop.Media) (video.Reader, error) {
 		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 {
 		return nil, err
 	}
 
 	cam := c.cam
 
-	readTimeoutSec := getCameraReadTimeout()
-
 	ctx, cancel := context.WithCancel(context.Background())
 	c.cancel = cancel
 	var buf []byte
@@ -263,14 +200,7 @@ func (c *camera) VideoRecord(p prop.Media) (video.Reader, error) {
 				return nil, func() {}, io.EOF
 			}
 
-			if p.DiscardFramesOlderThan != 0 && time.Now().Sub(c.prevFrameTime) >= p.DiscardFramesOlderThan {
+			err := cam.WaitForFrame(5) // 5 seconds
-				for i := 0; i < bufCount; i++ {
-					_ = cam.WaitForFrame(readTimeoutSec)
-					_, _ = cam.ReadFrame()
-				}
-			}
-
-			err := cam.WaitForFrame(readTimeoutSec)
 			switch err.(type) {
 			case nil:
 			case *webcam.Timeout:
@@ -286,10 +216,6 @@ func (c *camera) VideoRecord(p prop.Media) (video.Reader, error) {
 				return nil, func() {}, err
 			}
 
-			if p.DiscardFramesOlderThan != 0 {
-				c.prevFrameTime = time.Now()
-			}
-
 			// Frame is empty.
 			// Retry reading and return errEmptyFrame if it exceeds maxEmptyFrameCount.
 			if len(b) == 0 {
@@ -323,31 +249,13 @@ func (c *camera) Properties() []prop.Media {
 			}
 
 			if frameSize.StepWidth == 0 || frameSize.StepHeight == 0 {
-				framerates := c.cam.GetSupportedFramerates(format, uint32(frameSize.MaxWidth), uint32(frameSize.MaxHeight))
+				properties = append(properties, prop.Media{
-				// If the camera doesn't support framerate, we just add the resolution and format
+					Video: prop.Video{
-				if len(framerates) == 0 {
+						Width:       int(frameSize.MaxWidth),
-					properties = append(properties, prop.Media{
+						Height:      int(frameSize.MaxHeight),
-						Video: prop.Video{
+						FrameFormat: supportedFormat,
-							Width:       int(frameSize.MaxWidth),
+					},
-							Height:      int(frameSize.MaxHeight),
+				})
-							FrameFormat: supportedFormat,
-						},
-					})
-					continue
-				}
-
-				for _, framerate := range framerates {
-					for _, fps := range enumFramerate(framerate) {
-						properties = append(properties, prop.Media{
-							Video: prop.Video{
-								Width:       int(frameSize.MaxWidth),
-								Height:      int(frameSize.MaxHeight),
-								FrameFormat: supportedFormat,
-								FrameRate:   fps,
-							},
-						})
-					}
-				}
 			} else {
 				// FIXME: we should probably use a custom data structure to capture all of the supported resolutions
 				for _, supportedResolution := range supportedResolutions {
@@ -366,100 +274,16 @@ func (c *camera) Properties() []prop.Media {
 						continue
 					}
 
-					framerates := c.cam.GetSupportedFramerates(format, uint32(width), uint32(height))
+					properties = append(properties, prop.Media{
-					if len(framerates) == 0 {
+						Video: prop.Video{
-						properties = append(properties, prop.Media{
+							Width:       width,
-							Video: prop.Video{
+							Height:      height,
-								Width:       width,
+							FrameFormat: supportedFormat,
-								Height:      height,
+						},
-								FrameFormat: supportedFormat,
+					})
-							},
-						})
-						continue
-					}
-
-					for _, framerate := range framerates {
-						for _, fps := range enumFramerate(framerate) {
-							properties = append(properties, prop.Media{
-								Video: prop.Video{
-									Width:       width,
-									Height:      height,
-									FrameFormat: supportedFormat,
-									FrameRate:   fps,
-								},
-							})
-						}
-					}
 				}
 			}
 		}
 	}
 	return properties
 }
-
-func (c *camera) IsAvailable() (bool, error) {
-	var err error
-
-	// close the opened file descriptor as quickly as possible and in all cases, including panics
-	func() {
-		var cam *webcam.Webcam
-		if cam, err = webcam.Open(c.path); err == nil {
-			defer cam.Close()
-			var index int32
-			// "Drivers must implement all the input ioctls when the device has one or more inputs..."
-			// Source: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/video.html?highlight=vidioc_enuminput
-			if index, err = cam.GetInput(); err == nil {
-				err = cam.SelectInput(uint32(index))
-			}
-		}
-	}()
-
-	var errno syscall.Errno
-	errors.As(err, &errno)
-
-	// See https://man7.org/linux/man-pages/man3/errno.3.html
-	switch {
-	case err == nil:
-		return true, nil
-	case errno == syscall.EBUSY:
-		return false, availability.ErrBusy
-	case errno == syscall.ENODEV || errno == syscall.ENOENT:
-		return false, availability.ErrNoDevice
-	default:
-		return false, availability.NewError(errno.Error())
-	}
-}
-
-// enumFramerate returns a list of fps options from a FrameRate struct.
-// discrete framerates will return a list of 1 fps element.
-// stepwise framerates will return a list of all possible fps options.
-func enumFramerate(framerate webcam.FrameRate) []float32 {
-	var framerates []float32
-	if framerate.StepNumerator == 0 && framerate.StepDenominator == 0 {
-		fr, err := calcFramerate(framerate.MaxNumerator, framerate.MaxDenominator)
-		if err != nil {
-			return framerates
-		}
-		framerates = append(framerates, fr)
-	} else {
-		for n := framerate.MinNumerator; n <= framerate.MaxNumerator; n += framerate.StepNumerator {
-			for d := framerate.MinDenominator; d <= framerate.MaxDenominator; d += framerate.StepDenominator {
-				fr, err := calcFramerate(n, d)
-				if err != nil {
-					continue
-				}
-				framerates = append(framerates, fr)
-			}
-		}
-	}
-	return framerates
-}
-
-// calcFramerate turns fraction into a float32 fps value.
-func calcFramerate(numerator uint32, denominator uint32) (float32, error) {
-	if denominator == 0 {
-		return 0, errors.New("framerate denominator is zero")
-	}
-	// round to three decimal places to avoid floating point precision issues
-	return float32(math.Round(1000.0/((float64(numerator))/float64(denominator))) / 1000), nil
-}

pkg/driver/camera/camera_linux_test.go

@@ -57,7 +57,6 @@ func TestDiscover(t *testing.T) {
 		drvs[0].Info().Label,
 		drvs[1].Info().Label,
 	}
-
 	// Returned drivers are unordered. Sort to get static result.
 	sort.Sort(sort.StringSlice(labels))
 
@@ -71,123 +70,3 @@ func TestDiscover(t *testing.T) {
 		t.Errorf("Expected label: %s, got: %s", expectedNoLink, label)
 	}
 }
-
-func TestDiscoverByID(t *testing.T) {
-	const (
-		shortName  = "id-unittest-video0"
-		shortName2 = "id-unittest-video1"
-		longName   = "id-unittest-long-device-name:0:1:2:3"
-	)
-
-	dir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	byIdDir := filepath.Join(dir, "v4l", "by-id")
-	if err := os.MkdirAll(byIdDir, 0755); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(dir, shortName), []byte{}, 0644); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(dir, shortName2), []byte{}, 0644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Symlink(
-		filepath.Join(dir, shortName),
-		filepath.Join(byIdDir, longName),
-	); err != nil {
-		t.Fatal(err)
-	}
-
-	discovered := make(map[string]struct{})
-	discover(discovered, filepath.Join(byIdDir, "*"))
-	discover(discovered, filepath.Join(dir, "id-unittest-video*"))
-
-	drvs := driver.GetManager().Query(func(d driver.Driver) bool {
-		// Ignore real cameras.
-		return d.Info().DeviceType == driver.Camera && strings.Contains(d.Info().Label, "id-unittest")
-	})
-	if len(drvs) != 2 {
-		t.Fatalf("Expected 2 driver, got %d drivers", len(drvs))
-	}
-
-	labels := []string{
-		drvs[0].Info().Label,
-		drvs[1].Info().Label,
-	}
-
-	// Returned drivers are unordered. Sort to get static result.
-	sort.Sort(sort.StringSlice(labels))
-
-	expected := longName + LabelSeparator + shortName
-	if label := labels[0]; label != expected {
-		t.Errorf("Expected label: %s, got: %s", expected, label)
-	}
-
-	expectedNoLink := shortName2 + LabelSeparator + shortName2
-	if label := labels[1]; label != expectedNoLink {
-		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)
-	}
-}
-
-func TestCalcFramerate(t *testing.T) {
-	framerates := []struct {
-		numerator   uint32
-		denominator uint32
-		expected    float32
-	}{
-		{1, 10, 10.0},
-		{1, 15, 15.0},
-		{1, 30, 30.0},
-		{1, 60, 60.0},
-		{1, 120, 120.0},
-	}
-
-	for _, framerate := range framerates {
-		value, err := calcFramerate(framerate.numerator, framerate.denominator)
-		if err != nil {
-			t.Fatal(err)
-		}
-		// make sure we do not have any rounding errors
-		if value != framerate.expected {
-			t.Errorf("Expected: %f, got: %f", framerate.expected, value)
-		}
-	}
-
-	// divide by zero check
-	_, err := calcFramerate(1, 0)
-	if err == nil {
-		t.Errorf("Expected divide by zero error")
-	}
-}

pkg/driver/camera/camera_windows.cpp

@@ -8,18 +8,6 @@
 #include "camera_windows.hpp"
 #include "_cgo_export.h"
 
-
-imageProp* getProp(camera* cam, int i)
-{
-  return &cam->props[i];
-}
-
-char* getName(cameraList* list, int i)
-{
-  return list->name[i];
-}
-
-
 // printErr shows string representation of HRESULT.
 // This is for debugging.
 void printErr(HRESULT hr)
@@ -88,7 +76,6 @@ int listCamera(cameraList* list, const char** errstr)
     {
       list->name[i] = getCameraName(moniker);
       moniker->Release();
-      i++;
     }
   }
 

pkg/driver/camera/camera_windows.go

@@ -32,11 +32,6 @@ type camera struct {
 }
 
 func init() {
-	Initialize()
-}
-
-// Initialize finds and registers camera devices. This is part of an experimental API.
-func Initialize() {
 	C.CoInitializeEx(nil, C.COINIT_MULTITHREADED)
 
 	var list C.cameraList

pkg/driver/camera/camera_windows.hpp

@@ -40,9 +40,15 @@ int listResolution(camera* cam, const char** errstr);
 int listCamera(cameraList* list, const char** errstr);
 int freeCameraList(cameraList* list, const char** errstr);
 
-imageProp* getProp(camera* cam, int i);
+inline imageProp* getProp(camera* cam, int i)
+{
+  return &cam->props[i];
+}
 
-char* getName(cameraList* list, int i);
+inline char* getName(cameraList* list, int i)
+{
+  return list->name[i];
+}
 
 #ifdef __cplusplus
 }

pkg/driver/driver.go

@@ -1,7 +1,6 @@
 package driver
 
 import (
-	"github.com/pion/mediadevices/pkg/driver/availability"
 	"github.com/pion/mediadevices/pkg/io/audio"
 	"github.com/pion/mediadevices/pkg/io/video"
 	"github.com/pion/mediadevices/pkg/prop"
@@ -31,7 +30,6 @@ type Info struct {
 	Label      string
 	DeviceType DeviceType
 	Priority   Priority
-	Name       string
 }
 
 type Adapter interface {
@@ -46,14 +44,3 @@ type Driver interface {
 	Info() Info
 	Status() State
 }
-
-type AvailabilityAdapter interface {
-	IsAvailable() (bool, error)
-}
-
-func IsAvailable(d Driver) (bool, error) {
-	if aa, ok := d.(AvailabilityAdapter); ok {
-		return aa.IsAvailable()
-	}
-	return false, availability.ErrUnimplemented
-}

pkg/driver/manager.go

@@ -1,7 +1,5 @@
 package driver
 
-import "sync"
-
 // FilterFn is being used to decide if a driver should be included in the
 // query result.
 type FilterFn func(Driver) bool
@@ -57,7 +55,6 @@ func FilterNot(filter FilterFn) FilterFn {
 
 // Manager is a singleton to manage multiple drivers and their states
 type Manager struct {
-	mu      sync.Mutex
 	drivers map[string]Driver
 }
 
@@ -72,8 +69,6 @@ func GetManager() *Manager {
 
 // Register registers adapter to be discoverable by Query
 func (m *Manager) Register(a Adapter, info Info) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
 	d := wrapAdapter(a, info)
 	m.drivers[d.ID()] = d
 	return nil
@@ -81,8 +76,6 @@ func (m *Manager) Register(a Adapter, info Info) error {
 
 // Query queries by using f to filter drivers, and simply return the filtered results.
 func (m *Manager) Query(f FilterFn) []Driver {
-	m.mu.Lock()
-	defer m.mu.Unlock()
 	results := make([]Driver, 0)
 	for _, d := range m.drivers {
 		if ok := f(d); ok {
@@ -92,10 +85,3 @@ func (m *Manager) Query(f FilterFn) []Driver {
 
 	return results
 }
-
-// Delete deletes a driver from manager given its ID
-func (m *Manager) Delete(id string) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	delete(m.drivers, id)
-}

pkg/driver/manager_test.go

@@ -1,17 +1,13 @@
 package driver
 
 import (
-	"github.com/pion/mediadevices/pkg/io/audio"
-	"github.com/pion/mediadevices/pkg/io/video"
-	"github.com/pion/mediadevices/pkg/prop"
-	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
-func filterTrue(_ Driver) bool {
+func filterTrue(d Driver) bool {
 	return true
 }
-func filterFalse(_ Driver) bool {
+func filterFalse(d Driver) bool {
 	return false
 }
 
@@ -44,71 +40,3 @@ func TestFilterAnd(t *testing.T) {
 		t.Error("FilterAnd(filterTrue, filterTrue, filterTrue)() must be true")
 	}
 }
-
-type fakeVideoAdapter struct{}
-
-func (a *fakeVideoAdapter) Open() error              { return nil }
-func (a *fakeVideoAdapter) Close() error             { return nil }
-func (a *fakeVideoAdapter) Properties() []prop.Media { return nil }
-
-func (a *fakeVideoAdapter) VideoRecord(_ prop.Media) (r video.Reader, err error) { return nil, nil }
-
-type fakeAudioAdapter struct{}
-
-func (a *fakeAudioAdapter) Open() error              { return nil }
-func (a *fakeAudioAdapter) Close() error             { return nil }
-func (a *fakeAudioAdapter) Properties() []prop.Media { return nil }
-
-func (a *fakeAudioAdapter) AudioRecord(_ prop.Media) (r audio.Reader, err error) { return nil, nil }
-
-type fakeAdapter struct{}
-
-func (a *fakeAdapter) Open() error              { return nil }
-func (a *fakeAdapter) Close() error             { return nil }
-func (a *fakeAdapter) Properties() []prop.Media { return nil }
-
-func TestRegister(t *testing.T) {
-	m := GetManager()
-
-	va := &fakeVideoAdapter{}
-	err := m.Register(va, Info{})
-	assert.NoError(t, err, "cannot register video adapter")
-	assert.Equal(t, len(m.Query(filterTrue)), 1)
-
-	aa := &fakeAudioAdapter{}
-	err = m.Register(aa, Info{})
-	assert.NoError(t, err, "cannot register audio adapter")
-	assert.Equal(t, len(m.Query(filterTrue)), 2)
-
-	a := &fakeAdapter{}
-	assert.Panics(t, func() { m.Register(a, Info{}) }, "should not register adapter that is neither audio nor video")
-	assert.Equal(t, len(m.Query(filterTrue)), 2)
-}
-
-func TestRegisterSync(t *testing.T) {
-	m := GetManager()
-	start := make(chan struct{})
-	race := func() {
-		<-start
-		assert.NoError(t, m.Register(&fakeVideoAdapter{}, Info{}))
-	}
-
-	go race()
-	go race()
-	close(start)
-}
-
-func TestQuerySync(t *testing.T) {
-	m := GetManager()
-	start := make(chan struct{})
-	race := func() {
-		<-start
-		m.Query(filterTrue)
-	}
-
-	go race()
-	go race()
-	close(start)
-	// write while reading
-	assert.NoError(t, m.Register(&fakeVideoAdapter{}, Info{}))
-}

pkg/driver/microphone/microphone.go

@@ -1,12 +1,10 @@
 package microphone
 
 import (
-	"context"
 	"encoding/binary"
 	"errors"
 	"fmt"
 	"io"
-	"sync"
 	"time"
 	"unsafe"
 
@@ -34,16 +32,10 @@ var (
 
 type microphone struct {
 	malgo.DeviceInfo
-	chunkChan       chan []byte
+	chunkChan chan []byte
-	deviceCloseFunc func()
 }
 
 func init() {
-	Initialize()
-}
-
-// Initialize finds and registers active playback or capture devices. This is part of an experimental API.
-func Initialize() {
 	var err error
 	ctx, err = malgo.InitContext(nil, malgo.ContextConfig{}, func(message string) {
 		logger.Debugf("%v\n", message)
@@ -68,7 +60,6 @@ func Initialize() {
 				Label:      device.ID.String(),
 				DeviceType: driver.Microphone,
 				Priority:   priority,
-				Name:       info.Name(),
 			})
 		}
 	}
@@ -96,8 +87,9 @@ func (m *microphone) Open() error {
 }
 
 func (m *microphone) Close() error {
-	if m.deviceCloseFunc != nil {
+	if m.chunkChan != nil {
-		m.deviceCloseFunc()
+		close(m.chunkChan)
+		m.chunkChan = nil
 	}
 	return nil
 }
@@ -119,9 +111,6 @@ func (m *microphone) AudioRecord(inputProp prop.Media) (audio.Reader, error) {
 	config.PerformanceProfile = malgo.LowLatency
 	config.Capture.Channels = uint32(inputProp.ChannelCount)
 	config.SampleRate = uint32(inputProp.SampleRate)
-	config.PeriodSizeInMilliseconds = uint32(inputProp.Latency.Milliseconds())
-	//FIX: Turn on the microphone with the current device id
-	config.Capture.DeviceID = m.ID.Pointer()
 	if inputProp.SampleSize == 4 && inputProp.IsFloat {
 		config.Capture.Format = malgo.FormatF32
 	} else if inputProp.SampleSize == 2 && !inputProp.IsFloat {
@@ -130,44 +119,26 @@ func (m *microphone) AudioRecord(inputProp prop.Media) (audio.Reader, error) {
 		return nil, errUnsupportedFormat
 	}
 
-	cancelCtx, cancel := context.WithCancel(context.Background())
 	onRecvChunk := func(_, chunk []byte, framecount uint32) {
-		select {
+		m.chunkChan <- chunk
-		case <-cancelCtx.Done():
-		case m.chunkChan <- chunk:
-		}
 	}
 	callbacks.Data = onRecvChunk
 
 	device, err := malgo.InitDevice(ctx.Context, config, callbacks)
 	if err != nil {
-		cancel()
 		return nil, err
 	}
 
 	err = device.Start()
 	if err != nil {
-		cancel()
 		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) {
 		chunk, ok := <-m.chunkChan
 		if !ok {
-			m.deviceCloseFunc()
+			device.Stop()
+			device.Uninit()
 			return nil, func() {}, io.EOF
 		}
 
@@ -197,39 +168,36 @@ func (m *microphone) Properties() []prop.Media {
 		isBigEndian = true
 	}
 
-	for _, format := range m.Formats {
+	for ch := m.MinChannels; ch <= m.MaxChannels; ch++ {
 		// FIXME: Currently support 48kHz only. We need to implement a resampler first.
 		// for sampleRate := m.MinSampleRate; sampleRate <= m.MaxSampleRate; sampleRate += sampleRateStep {
 		sampleRate := 48000
-		supportedProp := prop.Media{
+		for i := 0; i < int(m.FormatCount); i++ {
-			Audio: prop.Audio{
+			format := m.Formats[i]
-				ChannelCount: int(format.Channels),
-				SampleRate:   int(sampleRate),
-				IsBigEndian:  isBigEndian,
-				// miniaudio only supports interleaved at the moment
-				IsInterleaved: true,
-				// FIXME: should change this to a less discrete value
-				Latency: time.Millisecond * 20,
-			},
-		}
 
-		supportedFormat := true
+			supportedProp := prop.Media{
-		switch malgo.FormatType(format.Format) {
+				Audio: prop.Audio{
-		case malgo.FormatF32:
+					ChannelCount: int(ch),
-			supportedProp.SampleSize = 4
+					SampleRate:   int(sampleRate),
-			supportedProp.IsFloat = true
+					IsBigEndian:  isBigEndian,
-		case malgo.FormatS16:
+					// miniaudio only supports interleaved at the moment
-			supportedProp.SampleSize = 2
+					IsInterleaved: true,
-			supportedProp.IsFloat = false
+					// FIXME: should change this to a less discrete value
-		default:
+					Latency: time.Millisecond * 20,
-			supportedFormat = false
+				},
-		}
+			}
 
-		if !supportedFormat {
+			switch malgo.FormatType(format) {
-			logger.Warnf("format '%s' not supported", format.Format)
+			case malgo.FormatF32:
-			continue
+				supportedProp.SampleSize = 4
+				supportedProp.IsFloat = true
+			case malgo.FormatS16:
+				supportedProp.SampleSize = 2
+				supportedProp.IsFloat = false
+			}
+
+			supportedProps = append(supportedProps, supportedProp)
 		}
-		supportedProps = append(supportedProps, supportedProp)
 		// }
 	}
 	return supportedProps

pkg/driver/screen/screen.go

@@ -20,11 +20,6 @@ type screen struct {
 }
 
 func init() {
-	Initialize()
-}
-
-// Initialize finds and registers active displays. This is part of an experimental API.
-func Initialize() {
 	activeDisplays := screenshot.NumActiveDisplays()
 	for i := 0; i < activeDisplays; i++ {
 		priority := driver.PriorityNormal

pkg/driver/screen/x11_linux.go

@@ -22,11 +22,6 @@ func deviceID(num int) string {
 }
 
 func init() {
-	Initialize()
-}
-
-// Initialize finds and registers active displays. This is part of an experimental API.
-func Initialize() {
 	dp, err := openDisplay()
 	if err != nil {
 		// No x11 display available.

pkg/driver/videotest/dummy.go

@@ -47,6 +47,10 @@ func (d *dummy) Close() error {
 }
 
 func (d *dummy) VideoRecord(p prop.Media) (video.Reader, error) {
+	if p.FrameRate == 0 {
+		p.FrameRate = 30
+	}
+
 	colors := [][3]byte{
 		{235, 128, 128},
 		{210, 16, 146},
@@ -139,7 +143,6 @@ func (d dummy) Properties() []prop.Media {
 				Width:       640,
 				Height:      480,
 				FrameFormat: frame.FormatYUYV,
-				FrameRate:   30,
 			},
 		},
 	}

pkg/driver/vncdriver/vnc/README.md

@@ -3,13 +3,7 @@
 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][rfc6143].
+This library implements [RFC 6143](http://tools.ietf.org/html/rfc6143).
-
-## RFCs
-### Implemented
-- **RFC **: [The Remote Framebuffer Protocol][rfc6143]
-
-[rfc6143]: http://tools.ietf.org/html/rfc6143
 
 ## Usage & Installation
 

pkg/driver/vncdriver/vnc/encoding.go

@@ -18,32 +18,13 @@ type Encoding interface {
 	// 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
+	Colors []Color
-	RawPixel []uint32 //RGBA
+	RawPixel []uint32	//RGBA
 }
 
 func (*RawEncoding) Type() int32 {
@@ -51,7 +32,6 @@ func (*RawEncoding) Type() int32 {
 }
 
 func (*RawEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encoding, error) {
-	//fmt.Println("RawEncoding")
 	bytesPerPixel := c.PixelFormat.BPP / 8
 	pixelBytes := make([]uint8, bytesPerPixel)
 
@@ -61,7 +41,7 @@ func (*RawEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encoding,
 	}
 
 	colors := make([]Color, int(rect.Height)*int(rect.Width))
-	rawPixels := make([]uint32, 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 {
@@ -82,30 +62,24 @@ func (*RawEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encoding,
 				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)
+			rawPixels[int(y)*int(rect.Width)+int(x)]=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
+	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
+	Colors  []Color
-	RawPixel []uint32
+	RawPixel[] uint32
-	ZStream  *bytes.Buffer
+	ZStream *bytes.Buffer
-	ZReader  io.ReadCloser
+	ZReader io.ReadCloser
 }
 
 func (*ZlibEncoding) Type() int32 {
@@ -113,7 +87,6 @@ func (*ZlibEncoding) Type() int32 {
 }
 
 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)
 
@@ -125,6 +98,7 @@ func (ze *ZlibEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encod
 	// Format
 	// 4 bytes        | uint32 | length
 	// 'length' bytes | []byte | zlibData
+
 	// Read zlib length
 	var zipLength uint32
 	err := binary.Read(r, binary.BigEndian, &zipLength)
@@ -172,7 +146,7 @@ func (ze *ZlibEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encod
 	colorReader := bytes.NewReader(colorBytes)
 
 	colors := make([]Color, int(rect.Height)*int(rect.Width))
-	rawPixels := make([]uint32, 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 {
@@ -193,19 +167,14 @@ func (ze *ZlibEncoding) Read(c *ClientConn, rect *Rectangle, r io.Reader) (Encod
 				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)
+			rawPixels[int(y)*int(rect.Width)+int(x)]=uint32(color.B)<<16 | uint32(color.G)<<8 | uint32(color.R)
 		}
 	}
 
-	return &ZlibEncoding{Colors: colors, RawPixel: rawPixels}, nil
+	return &ZlibEncoding{Colors: colors,RawPixel: rawPixels}, nil
 }
 
 func (ze *ZlibEncoding) Close() {
@@ -214,4 +183,4 @@ func (ze *ZlibEncoding) Close() {
 		ze.ZReader.Close()
 		ze.ZReader = nil
 	}
-}
+}

pkg/driver/vncdriver/vncdriver.go

@@ -5,14 +5,13 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+	"github.com/pion/mediadevices/pkg/driver/vncdriver/vnc"
 	"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"
@@ -33,12 +32,12 @@ func NewVnc(vncAddr string) *vncDevice {
 	return &vncDevice{vncAddr: vncAddr}
 }
 func (d *vncDevice) PointerEvent(mask uint8, x, y uint16) {
-	if d.vClient != nil {
+	if d.vClient!=nil{
 		d.vClient.PointerEvent(vnc.ButtonMask(mask), x, y)
 	}
 }
 func (d *vncDevice) KeyEvent(keysym uint32, down bool) {
-	if d.vClient != nil {
+	if d.vClient!=nil {
 		d.vClient.KeyEvent(keysym, down)
 	}
 }
@@ -50,10 +49,7 @@ func (d *vncDevice) Open() error {
 	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,
 	}
@@ -70,7 +66,6 @@ func (d *vncDevice) Open() error {
 	d.vClient.SetEncodings([]vnc.Encoding{
 		&vnc.ZlibEncoding{},
 		&vnc.RawEncoding{},
-		&vnc.CursorEncoding{},
 	})
 	d.w = int(d.vClient.FrameBufferWidth)
 	d.h = int(d.vClient.FrameBufferHeight)
@@ -94,9 +89,6 @@ func (d *vncDevice) Open() error {
 					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:
@@ -105,16 +97,19 @@ func (d *vncDevice) Open() error {
 						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))])
+								//BigEndian
 							}
 						}
 
 					}
+					//time.Sleep(33 * time.Millisecond)
 					d.vClient.FramebufferUpdateRequest(true, 0, 0, uint16(d.w), uint16(d.h))
 					break
 				default:
 
 				}
 			case <-time.After(10 * time.Second):
+				//fmt.Println("Timeout FramebufferUpdate")
 				if d.vClient.FramebufferUpdateRequest(true, 0, 0, uint16(d.w), uint16(d.h)) != nil {
 					d.cancel()
 					return
@@ -142,12 +137,13 @@ func (d *vncDevice) Close() error {
 
 func (d *vncDevice) VideoRecord(p prop.Media) (video.Reader, error) {
 	if p.FrameRate == 0 {
-		p.FrameRate = 30
+		p.FrameRate = 15
 	}
 
 	tick := time.NewTicker(time.Duration(float32(time.Second) / p.FrameRate))
 	d.tick = tick
 	closed := d.closed
+	pixs := make([]byte, d.h*d.w*4)
 	r := video.ReaderFunc(func() (image.Image, func(), error) {
 		select {
 		case <-closed:
@@ -157,8 +153,9 @@ func (d *vncDevice) VideoRecord(p prop.Media) (video.Reader, error) {
 		}
 
 		<-tick.C
+		copy(pixs, d.rawPixel)
 		return &image.RGBA{
-			Pix:    d.rawPixel,
+			Pix:    pixs,
 			Stride: 4,
 			Rect:   image.Rect(0, 0, d.w, d.h),
 		}, func() {}, nil

pkg/driver/wrapper.go

@@ -2,7 +2,6 @@ package driver
 
 import (
 	"github.com/google/uuid"
-	"github.com/pion/mediadevices/pkg/driver/availability"
 	"github.com/pion/mediadevices/pkg/io/audio"
 	"github.com/pion/mediadevices/pkg/io/video"
 	"github.com/pion/mediadevices/pkg/prop"
@@ -22,10 +21,6 @@ func wrapAdapter(a Adapter, info Info) Driver {
 		state:   StateClosed,
 	}
 
-	if aa, ok := a.(AvailabilityAdapter); ok {
-		d.isAvailable = aa.IsAvailable
-	}
-
 	switch v := a.(type) {
 	case VideoRecorder:
 		// Only expose Driver and VideoRecorder interfaces
@@ -33,8 +28,7 @@ func wrapAdapter(a Adapter, info Info) Driver {
 		r := &struct {
 			Driver
 			VideoRecorder
-			AvailabilityAdapter
+		}{d, d}
-		}{d, d, d}
 		return r
 	case AudioRecorder:
 		// Only expose Driver and AudioRecorder interfaces
@@ -42,8 +36,7 @@ func wrapAdapter(a Adapter, info Info) Driver {
 		return &struct {
 			Driver
 			AudioRecorder
-			AvailabilityAdapter
+		}{d, d}
-		}{d, d, d}
 	default:
 		panic("adapter has to be either VideoRecorder/AudioRecorder")
 	}
@@ -53,10 +46,9 @@ type adapterWrapper struct {
 	Adapter
 	VideoRecorder
 	AudioRecorder
-	id          string
+	id    string
-	info        Info
+	info  Info
-	state       State
+	state State
-	isAvailable func() (bool, error)
 }
 
 func (w *adapterWrapper) ID() string {
@@ -112,10 +104,3 @@ func (w *adapterWrapper) AudioRecord(p prop.Media) (r audio.Reader, err error) {
 	}
 	return
 }
-
-func (w *adapterWrapper) IsAvailable() (bool, error) {
-	if w.isAvailable == nil {
-		return false, availability.ErrUnimplemented
-	}
-	return w.isAvailable()
-}

pkg/driver/wrapper_test.go

@@ -39,10 +39,6 @@ func (a *audioAdapterBrokenMock) AudioRecord(p prop.Media) (r audio.Reader, err
 	return nil, recordErr
 }
 
-type availabilityAdapterMock struct{ videoAdapterMock }
-
-func (a *availabilityAdapterMock) IsAvailable() (bool, error) { return true, nil }
-
 func TestVideoWrapperState(t *testing.T) {
 	var a videoAdapterMock
 	d := wrapAdapter(&a, Info{})
@@ -140,38 +136,3 @@ func TestAudioWrapperWithBrokenRecorderState(t *testing.T) {
 		t.Errorf("expected the status to be %v, but got %v", StateClosed, d.Status())
 	}
 }
-
-func TestWrapperAvailabilityAdapter(t *testing.T) {
-	var aa availabilityAdapterMock
-	d := wrapAdapter(&aa, Info{})
-
-	ok, err := IsAvailable(d)
-	if err != nil {
-		t.Errorf("expected nil, but got %v", err)
-	}
-	if !ok {
-		t.Errorf("expected true, but got %v", ok)
-	}
-
-	var v videoAdapterMock
-	d = wrapAdapter(&v, Info{})
-
-	ok, err = IsAvailable(d)
-	if err == nil {
-		t.Errorf("expected err, but got %v", err)
-	}
-	if ok {
-		t.Errorf("expected false, but got %v", ok)
-	}
-
-	var a audioAdapterMock
-	d = wrapAdapter(&a, Info{})
-
-	ok, err = IsAvailable(d)
-	if err == nil {
-		t.Errorf("expected err, but got %v", err)
-	}
-	if ok {
-		t.Errorf("expected false, but got %v", ok)
-	}
-}

pkg/frame/compressed.go

@@ -2,86 +2,11 @@ package frame
 
 import (
 	"bytes"
-	"errors"
 	"image"
 	"image/jpeg"
 )
 
-/*
-Thank you to https://github.com/filiptc/gorbit/blob/fa87ff39b68a6706306f34c318e0b9a5a3c97110/image/overlay.go#L37-L40
-for addMotionDht, dhtMarker, dht, and sosMarker. These are protected under the following license:
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Philip Thomas Casado
-
-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.
-
-*/
-
-var (
-	dhtMarker                                       = []byte{255, 196}
-	dht                                             = []byte{1, 162, 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125, 1, 2, 3, 0, 4, 17, 5, 18, 33, 49, 65, 6, 19, 81, 97, 7, 34, 113, 20, 50, 129, 145, 161, 8, 35, 66, 177, 193, 21, 82, 209, 240, 36, 51, 98, 114, 130, 9, 10, 22, 23, 24, 25, 26, 37, 38, 39, 40, 41, 42, 52, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121, 122, 131, 132, 133, 134, 135, 136, 137, 138, 146, 147, 148, 149, 150, 151, 152, 153, 154, 162, 163, 164, 165, 166, 167, 168, 169, 170, 178, 179, 180, 181, 182, 183, 184, 185, 186, 194, 195, 196, 197, 198, 199, 200, 201, 202, 210, 211, 212, 213, 214, 215, 216, 217, 218, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 17, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119, 0, 1, 2, 3, 17, 4, 5, 33, 49, 6, 18, 65, 81, 7, 97, 113, 19, 34, 50, 129, 8, 20, 66, 145, 161, 177, 193, 9, 35, 51, 82, 240, 21, 98, 114, 209, 10, 22, 36, 52, 225, 37, 241, 23, 24, 25, 26, 38, 39, 40, 41, 42, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121, 122, 130, 131, 132, 133, 134, 135, 136, 137, 138, 146, 147, 148, 149, 150, 151, 152, 153, 154, 162, 163, 164, 165, 166, 167, 168, 169, 170, 178, 179, 180, 181, 182, 183, 184, 185, 186, 194, 195, 196, 197, 198, 199, 200, 201, 202, 210, 211, 212, 213, 214, 215, 216, 217, 218, 226, 227, 228, 229, 230, 231, 232, 233, 234, 242, 243, 244, 245, 246, 247, 248, 249, 250}
-	sosMarker                                       = []byte{255, 218}
-	huffmanTableInfoLength                          = len(dhtMarker) + len(dht) + len(sosMarker)
-	uninitializedHuffmanTableError jpeg.FormatError = jpeg.FormatError("uninitialized Huffman table")
-)
-
 func decodeMJPEG(frame []byte, width, height int) (image.Image, func(), error) {
 	img, err := jpeg.Decode(bytes.NewReader(frame))
-	if err == nil {
-		return img, func() {}, err
-	}
-
-	if errors.As(err, &uninitializedHuffmanTableError) {
-		if err.Error() == uninitializedHuffmanTableError.Error() {
-			img, err = jpeg.Decode(bytes.NewReader(addMotionDht(frame)))
-		}
-	}
-
-	if err != nil {
-		return nil, nil, err
-	}
-
 	return img, func() {}, err
 }
-
-func addMotionDht(frame []byte) []byte {
-	jpegParts := bytes.Split(frame, sosMarker)
-	if len(jpegParts) != 2 {
-		return frame
-	}
-	correctedFrame := make([]byte, len(jpegParts[0])+huffmanTableInfoLength+len(jpegParts[1]))
-	correctedFrameOffset := 0
-
-	copy(correctedFrame[correctedFrameOffset:], jpegParts[0])
-	correctedFrameOffset += len(jpegParts[0])
-
-	copy(correctedFrame[correctedFrameOffset:], dhtMarker)
-	correctedFrameOffset += len(dhtMarker)
-
-	copy(correctedFrame[correctedFrameOffset:], dht)
-	correctedFrameOffset += len(dht)
-
-	copy(correctedFrame[correctedFrameOffset:], sosMarker)
-	correctedFrameOffset += len(sosMarker)
-
-	copy(correctedFrame[correctedFrameOffset:], jpegParts[1])
-	return correctedFrame
-}

pkg/frame/compressed_test.go

@@ -1,51 +0,0 @@
-package frame
-
-import (
-	"bytes"
-	"image/jpeg"
-	"testing"
-)
-
-func TestAddMotionDht(t *testing.T) {
-	uninitializedHuffmanTableFrame, err := jpeg.Decode(bytes.NewReader(UninitializedHuffmanTable))
-
-	// Decode fails with an uninitialized Huffman table error for sample input
-	expectedErrorMessage := "invalid JPEG format: uninitialized Huffman table"
-	if err.Error() != expectedErrorMessage {
-		t.Fatalf("Wrong decode error result,\nexpected:\n%+v\ngot:\n%+v", expectedErrorMessage, err)
-	}
-
-	// Decode passes after adding default Huffman table to
-	defaultHuffmanTableFrame, err := jpeg.Decode(bytes.NewReader(addMotionDht(UninitializedHuffmanTable)))
-	if err != nil {
-		t.Fatalf("Expected decode function to pass after adding default Huffman table. Failed with %v\n", err)
-	}
-
-	// Adding default Huffman table to a valid frame without a Huffman table changes the table
-	if uninitializedHuffmanTableFrame == defaultHuffmanTableFrame {
-		t.Fatalf("Expected addMotionDht to update frame. Instead returned original frame")
-	}
-
-	// Check that an improperly constructed frame does not get updated by addMotionDht
-	randomBytes := []byte{1, 2, 3, 4}
-	frame1, err := jpeg.Decode(bytes.NewReader(randomBytes))
-	if err == nil {
-		t.Fatalf("Expected decode function to fail with random bytes but passed.")
-	}
-
-	frame2, err := jpeg.Decode(bytes.NewReader(addMotionDht(randomBytes)))
-	if err == nil {
-		t.Fatalf("Expected decode function to fail with random bytes but passed.")
-	}
-
-	if frame1 != frame2 {
-		t.Fatalf("addMotionDht updated the frame despite being improperly constructed")
-	}
-}
-
-func TestDecodeMJPEG(t *testing.T) {
-	_, _, err := decodeMJPEG(UninitializedHuffmanTable, 640, 480)
-	if err != nil {
-		t.Fatalf("Expected decode function to pass. Failed with %v\n", err)
-	}
-}

pkg/frame/decode.go

@@ -7,38 +7,36 @@ import (
 type Format string
 
 const (
-	// FormatI420 https://wiki.videolan.org/YUV#I420
+	// FormatI420 https://www.fourcc.org/pixel-format/yuv-i420/
 	FormatI420 Format = "I420"
 	// FormatI444 is a YUV format without sub-sampling
 	FormatI444 Format = "I444"
-	// FormatNV21 https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-nv12.html
+	// FormatNV21 https://www.fourcc.org/pixel-format/yuv-nv21/
 	FormatNV21 = "NV21"
-	// FormatNV12 https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-nv12.html
+	// FormatNV12 https://www.fourcc.org/pixel-format/yuv-nv12/
 	FormatNV12 = "NV12"
-	// FormatYUY2 https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-yuyv.html
+	// FormatYUY2 https://www.fourcc.org/pixel-format/yuv-yuy2/
-	// YUY2 is what Windows calls YUYV
 	FormatYUY2 = "YUY2"
-	// FormatYUYV https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-yuyv.html
+	// FormatUYVY https://www.fourcc.org/pixel-format/yuv-uyvy/
-	FormatYUYV = "YUYV"
-	// FormatUYVY https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-uyvy.html
 	FormatUYVY = "UYVY"
 
-	// FormatRGBA https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-rgb.html
+	// FormatRGBA https://www.fourcc.org/pixel-format/rgb-rgba/
 	FormatRGBA Format = "RGBA"
 
-	// FormatMJPEG https://wiki.videolan.org/MJPEG
+	// FormatMJPEG https://www.fourcc.org/mjpg/
 	FormatMJPEG = "MJPEG"
 
 	// FormatZ16 https://www.kernel.org/doc/html/v5.9/userspace-api/media/v4l/pixfmt-z16.html
 	FormatZ16 = "Z16"
 )
 
+const FormatYUYV = FormatYUY2
+
 var decoderMap = map[Format]decoderFunc{
 	FormatI420:  decodeI420,
 	FormatNV21:  decodeNV21,
 	FormatNV12:  decodeNV12,
 	FormatYUY2:  decodeYUY2,
-	FormatYUYV:  decodeYUY2,
 	FormatUYVY:  decodeUYVY,
 	FormatMJPEG: decodeMJPEG,
 	FormatZ16:   decodeZ16,

pkg/io/broadcast.go

@@ -141,9 +141,7 @@ func (broadcaster *Broadcaster) NewReader(copyFn func(interface{}) interface{})
 			data, err, currentCount = ringData.data, ringData.err, ringData.count
 		}
 
-		if data != nil { // data is nil if an error occurred during reading
+		data = copyFn(data)
-			data = copyFn(data)
-		}
 		return
 	})
 }

pkg/io/video/broadcast_test.go

@@ -1,7 +1,6 @@
 package video
 
 import (
-	"errors"
 	"image"
 	"reflect"
 	"testing"
@@ -48,21 +47,3 @@ func TestBroadcast(t *testing.T) {
 		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")
-	}
-}

pkg/io/video/convert.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"image"
 	"image/color"
-	"sync"
 )
 
 // imageToYCbCr converts src to *image.YCbCr and store it to dst
@@ -61,61 +60,30 @@ func imageToYCbCr(dst *image.YCbCr, src image.Image) {
 	}
 }
 
-// bytePool stores slices to be reused
-// New method is not set as the slice size
-// should be allocated according to subsample ratio
-var bytesPool sync.Pool
-
 // ToI420 converts r to a new reader that will output images in I420 format
 func ToI420(r Reader) Reader {
 	var yuvImg image.YCbCr
-
-	getSlice := func(cLen int) []uint8 {
-		// Retrieve slice from pool
-		dst, ok := bytesPool.Get().([]byte)
-
-		// Compare value or capacity of retrieved object
-		// If less than expected, reallocate new object
-		if !ok || cap(dst) < 2*cLen {
-			// Allocating memory for Cb and Cr
-			dst = make([]byte, 2*cLen, 2*cLen)
-		}
-
-		return dst
-	}
-
 	return ReaderFunc(func() (image.Image, func(), error) {
 		img, _, err := r.Read()
 		if err != nil {
 			return nil, func() {}, err
 		}
 
-		var releaseFunc func() = func() {}
-
 		imageToYCbCr(&yuvImg, img)
 
 		// Covert pixel format to I420
 		switch yuvImg.SubsampleRatio {
-		case image.YCbCrSubsampleRatio420:
 		case image.YCbCrSubsampleRatio444:
-			cLen := yuvImg.CStride * yuvImg.Rect.Dy() / 4
+			i444ToI420(&yuvImg)
-			dst := getSlice(cLen)
-			yuvImg = i444ToI420(yuvImg, dst)
-			releaseFunc = func() {
-				bytesPool.Put(dst)
-			}
 		case image.YCbCrSubsampleRatio422:
-			cLen := yuvImg.CStride * (yuvImg.Rect.Dy() / 2)
+			i422ToI420(&yuvImg)
-			dst := getSlice(cLen)
+		case image.YCbCrSubsampleRatio420:
-			yuvImg = i422ToI420(yuvImg, dst)
-			releaseFunc = func() {
-				bytesPool.Put(dst)
-			}
 		default:
-			return nil, releaseFunc, fmt.Errorf("unsupported pixel format: %s", yuvImg.SubsampleRatio)
+			return nil, func() {}, fmt.Errorf("unsupported pixel format: %s", yuvImg.SubsampleRatio)
 		}
 
-		return &yuvImg, releaseFunc, nil
+		yuvImg.SubsampleRatio = image.YCbCrSubsampleRatio420
+		return &yuvImg, func() {}, nil
 	})
 }
 

pkg/io/video/convert_cgo.c

@@ -3,8 +3,6 @@
 #include "_cgo_export.h"
 
 void i444ToI420CGO(
-    unsigned char *cb_dst,
-    unsigned char *cr_dst,
     unsigned char* cb,
     unsigned char* cr,
     const int stride, const int h)
@@ -24,8 +22,8 @@ void i444ToI420CGO(
           ((uint16_t)cr[isrc0] + (uint16_t)cr[isrc1] +
            (uint16_t)cr[isrc0 + 1] + (uint16_t)cr[isrc1 + 1]) /
           4;
-      cb_dst[idst] = cb2;
+      cb[idst] = cb2;
-      cr_dst[idst] = cr2;
+      cr[idst] = cr2;
       isrc0 += 2;
       isrc1 += 2;
       idst++;
@@ -36,8 +34,6 @@ void i444ToI420CGO(
 }
 
 void i422ToI420CGO(
-    unsigned char *cb_dst,
-    unsigned char *cr_dst,
     unsigned char* cb,
     unsigned char* cr,
     const int stride, const int h)
@@ -50,8 +46,8 @@ void i422ToI420CGO(
     {
       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;
-      cb_dst[idst] = cb2;
+      cb[idst] = cb2;
-      cr_dst[idst] = cr2;
+      cr[idst] = cr2;
       isrc++;
       idst++;
     }

pkg/io/video/convert_cgo.go

@@ -1,4 +1,3 @@
-//go:build cgo
 // +build cgo
 
 package video
@@ -15,41 +14,27 @@ import "C"
 // All functions switched at runtime must be declared also in convert_nocgo.go.
 const hasCGOConvert = true
 
-func i444ToI420(img image.YCbCr, dst []uint8) image.YCbCr {
+func i444ToI420(img *image.YCbCr) {
 	h := img.Rect.Dy()
-	cLen := img.CStride * h / 4
-	// Divide preallocated memory to cbDst and crDst
-	// and truncate cap and len to cLen
-	cbDst, crDst := dst[:cLen:cLen], dst[cLen:]
-	crDst = crDst[:cLen:cLen]
 	C.i444ToI420CGO(
-		(*C.uchar)(&cbDst[0]), (*C.uchar)(&crDst[0]),
 		(*C.uchar)(&img.Cb[0]), (*C.uchar)(&img.Cr[0]),
 		C.int(img.CStride), C.int(h),
 	)
 	img.CStride = img.CStride / 2
-	img.Cb = cbDst
+	cLen := img.CStride * (h / 2)
-	img.Cr = crDst
+	img.Cb = img.Cb[:cLen]
-	img.SubsampleRatio = image.YCbCrSubsampleRatio420
+	img.Cr = img.Cr[:cLen]
-	return img
 }
 
-func i422ToI420(img image.YCbCr, dst []uint8) image.YCbCr {
+func i422ToI420(img *image.YCbCr) {
 	h := img.Rect.Dy()
-	cLen := img.CStride * (h / 2)
-	// Divide preallocated memory to cbDst and crDst
-	// and truncate cap and len to cLen
-	cbDst, crDst := dst[:cLen:cLen], dst[cLen:]
-	crDst = crDst[:cLen:cLen]
 	C.i422ToI420CGO(
-		(*C.uchar)(&cbDst[0]), (*C.uchar)(&crDst[0]),
 		(*C.uchar)(&img.Cb[0]), (*C.uchar)(&img.Cr[0]),
 		C.int(img.CStride), C.int(h),
 	)
-	img.Cb = cbDst
+	cLen := img.CStride * (h / 2)
-	img.Cr = crDst
+	img.Cb = img.Cb[:cLen]
-	img.SubsampleRatio = image.YCbCrSubsampleRatio420
+	img.Cr = img.Cr[:cLen]
-	return img
 }
 
 func rgbToYCbCrCGO(y, cb, cr *uint8, r, g, b uint8) { // For testing

pkg/io/video/convert_cgo.h

@@ -1,13 +1,9 @@
 void i444ToI420CGO(
-    unsigned char *cb_dst,
-    unsigned char *cr_dst,
     unsigned char* cb,
     unsigned char* cr,
     const int stride, const int h);
 
 void i422ToI420CGO(
-    unsigned char *cb_dst,
-    unsigned char *cr_dst,
     unsigned char* cb,
     unsigned char* cr,
     const int stride, const int h);

pkg/io/video/convert_nocgo.go

@@ -1,4 +1,3 @@
-//go:build !cgo
 // +build !cgo
 
 package video
@@ -10,25 +9,19 @@ import (
 
 const hasCGOConvert = false
 
-func i444ToI420(img image.YCbCr, dst []uint8) image.YCbCr {
+func i444ToI420(img *image.YCbCr) {
 	h := img.Rect.Dy()
 	addrSrc0 := 0
 	addrSrc1 := img.CStride
-	cLen := img.CStride * (h / 4)
 	addrDst := 0
-	// Divide preallocated memory to cbDst and crDst
-	// and truncate cap and len to cLen
-	cbDst, crDst := dst[:cLen:cLen], dst[cLen:]
-	crDst = crDst[:cLen:cLen]
-
 	for i := 0; i < h/2; i++ {
 		for j := 0; j < img.CStride/2; j++ {
 			cb := uint16(img.Cb[addrSrc0]) + uint16(img.Cb[addrSrc1]) +
 				uint16(img.Cb[addrSrc0+1]) + uint16(img.Cb[addrSrc1+1])
 			cr := uint16(img.Cr[addrSrc0]) + uint16(img.Cr[addrSrc1]) +
 				uint16(img.Cr[addrSrc0+1]) + uint16(img.Cr[addrSrc1+1])
-			cbDst[addrDst] = uint8(cb / 4)
+			img.Cb[addrDst] = uint8(cb / 4)
-			crDst[addrDst] = uint8(cr / 4)
+			img.Cr[addrDst] = uint8(cr / 4)
 			addrSrc0 += 2
 			addrSrc1 += 2
 			addrDst++
@@ -37,37 +30,29 @@ func i444ToI420(img image.YCbCr, dst []uint8) image.YCbCr {
 		addrSrc1 += img.CStride
 	}
 	img.CStride = img.CStride / 2
-	img.Cb = cbDst
+	cLen := img.CStride * (h / 2)
-	img.Cr = crDst
+	img.Cb = img.Cb[:cLen]
-	img.SubsampleRatio = image.YCbCrSubsampleRatio420
+	img.Cr = img.Cr[:cLen]
-	return img
 }
 
-func i422ToI420(img image.YCbCr, dst []uint8) image.YCbCr {
+func i422ToI420(img *image.YCbCr) {
 	h := img.Rect.Dy()
 	addrSrc := 0
-	cLen := img.CStride * (h / 2)
-	// Divide preallocated memory to cbDst and crDst
-	// and truncate cap and len to cLen
-	cbDst, crDst := dst[:cLen:cLen], dst[cLen:]
-	crDst = crDst[:cLen:cLen]
 	addrDst := 0
-
 	for i := 0; i < h/2; i++ {
 		for j := 0; j < img.CStride; j++ {
 			cb := uint16(img.Cb[addrSrc]) + uint16(img.Cb[addrSrc+img.CStride])
 			cr := uint16(img.Cr[addrSrc]) + uint16(img.Cr[addrSrc+img.CStride])
-			cbDst[addrDst] = uint8(cb / 2)
+			img.Cb[addrDst] = uint8(cb / 2)
-			crDst[addrDst] = uint8(cr / 2)
+			img.Cr[addrDst] = uint8(cr / 2)
-			addrSrc++
 			addrDst++
+			addrSrc++
 		}
 		addrSrc += img.CStride
 	}
-	img.Cb = cbDst
+	cLen := img.CStride * (h / 2)
-	img.Cr = crDst
+	img.Cb = img.Cb[:cLen]
-	img.SubsampleRatio = image.YCbCrSubsampleRatio420
+	img.Cr = img.Cr[:cLen]
-	return img
 }
 
 func i444ToRGBA(dst *image.RGBA, src *image.YCbCr) {

pkg/io/video/convert_test.go

@@ -147,11 +147,10 @@ func TestToI420(t *testing.T) {
 			r := ToI420(ReaderFunc(func() (image.Image, func(), error) {
 				return c.src, func() {}, nil
 			}))
-			out, release, err := r.Read()
+			out, _, err := r.Read()
 			if err != nil {
 				t.Fatalf("Unexpected error: %v", err)
 			}
-			defer release()
 			if !reflect.DeepEqual(c.expected, out) {
 				t.Errorf("Expected output image:\n%v\ngot:\n%v", c.expected, out)
 			}
@@ -223,19 +222,18 @@ func BenchmarkToI420(b *testing.B) {
 			"RGBA": image.NewRGBA(image.Rect(0, 0, sz[0], sz[1])),
 		}
 		b.Run(name, func(b *testing.B) {
-			for _, name := range [...]string{"I444", "I422", "I420", "RGBA"} {
+			for name, img := range cases {
-				img := cases[name]
+				img := img
 				b.Run(name, func(b *testing.B) {
 					r := ToI420(ReaderFunc(func() (image.Image, func(), error) {
 						return img, func() {}, nil
 					}))
 
 					for i := 0; i < b.N; i++ {
-						_, release, err := r.Read()
+						_, _, err := r.Read()
 						if err != nil {
 							b.Fatalf("Unexpected error: %v", err)
 						}
-						release()
 					}
 				})
 			}

pkg/io/video/scale.go

@@ -109,7 +109,7 @@ func Scale(width, height int, scaler Scaler) TransformFunc {
 			yDy := rect.Dy()
 			cRect := fixedRect(rect, i1.SubsampleRatio)
 			cDx := cRect.Dx()
-			cDy := cRect.Dy()
+			cDy := cRect.Dx()
 			yLen := yDx * yDy
 			cLen := cDx * cDy
 			if len(imgDst.Y) < yLen {

pkg/io/video/scale_test.go

@@ -36,32 +36,6 @@ func TestScale(t *testing.T) {
 				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": {
 			src: &image.YCbCr{
 				SubsampleRatio: image.YCbCrSubsampleRatio444,
@@ -117,70 +91,6 @@ func TestScale(t *testing.T) {
 				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": {
 			src: &image.YCbCr{
 				SubsampleRatio: image.YCbCrSubsampleRatio422,
@@ -245,82 +155,6 @@ func TestScale(t *testing.T) {
 				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": {
 			src: &image.YCbCr{
 				SubsampleRatio: image.YCbCrSubsampleRatio420,
@@ -373,118 +207,6 @@ func TestScale(t *testing.T) {
 				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 {
 		algo := algo
@@ -525,183 +247,6 @@ func TestScale(t *testing.T) {
 	}
 }
 
-func TestScaleFastBoxSampling(t *testing.T) {
-	if !hasCGOConvert {
-		t.Skip("Skip: nocgo implementation is not supported for FastBoxSampling")
-	}
-	cases := map[string]struct {
-		src           image.Image
-		width, height int
-		expected      image.Image
-	}{
-		"I420NonSquareImage": {
-			src: &image.YCbCr{
-				SubsampleRatio: image.YCbCrSubsampleRatio420,
-				Y: []uint8{
-					0xF0, 0xF8, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x10,
-					0xF8, 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,
-					0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
-					0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 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, 0x34, 0x34,
-					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{
-					0xF4, 0x10, 0x00, 0x00, 0xF0, 0x10,
-					0x00, 0x00, 0x40, 0x00, 0x40, 0x00,
-					0x04, 0x00, 0x00, 0x00, 0x02, 0x00,
-					0x00, 0x80, 0x30, 0x00, 0x30, 0x00,
-				},
-				Cb: []uint8{
-					0x20, 0x80, 0x50,
-					0x80, 0xE0, 0x32,
-				},
-				Cr: []uint8{
-					0xE0, 0x80, 0xB0,
-					0xF0, 0x40, 0xC0,
-				},
-				YStride: 6,
-				CStride: 3,
-				Rect:    image.Rect(0, 0, 6, 4),
-			},
-		},
-		"I420Uneven6x4to3x2": {
-			src: &image.YCbCr{
-				SubsampleRatio: image.YCbCrSubsampleRatio420,
-				Y: []uint8{
-					0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00,
-					0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00,
-					0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
-				},
-				Cb: []uint8{
-					0x20, 0x20, 0x80,
-					0x20, 0x20, 0x80,
-				},
-				Cr: []uint8{
-					0xE0, 0xE0, 0x80,
-					0xE0, 0xE0, 0x80,
-					0xFF, // dummy data to detect out of range read
-				},
-				YStride: 6,
-				CStride: 3,
-				Rect:    image.Rect(0, 0, 6, 3),
-			},
-			width:  4,
-			height: 2,
-			expected: &image.YCbCr{
-				SubsampleRatio: image.YCbCrSubsampleRatio420,
-				Y: []uint8{
-					0xF0, 0x10, 0x08, 0x00,
-					0x00, 0x00, 0x20, 0x40,
-				},
-				Cb: []uint8{
-					0x20, 0x80,
-				},
-				Cr: []uint8{
-					0xE0, 0x80,
-				},
-				YStride: 4,
-				CStride: 2,
-				Rect:    image.Rect(0, 0, 4, 2),
-			},
-		},
-		"I420Uneven6x3to5x2": {
-			src: &image.YCbCr{
-				SubsampleRatio: image.YCbCrSubsampleRatio420,
-				Y: []uint8{
-					0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00,
-					0xF0, 0xF0, 0x10, 0x10, 0x00, 0x00,
-					0x00, 0x00, 0x00, 0x00, 0x40, 0x50,
-				},
-				Cb: []uint8{
-					0x20, 0x20, 0x80,
-					0x20, 0x20, 0x80,
-				},
-				Cr: []uint8{
-					0xE0, 0xE0, 0x80,
-					0xE0, 0xE0, 0x80,
-					0xFF, // dummy data to detect out of range read
-				},
-				YStride: 6,
-				CStride: 3,
-				Rect:    image.Rect(0, 0, 6, 3),
-			},
-			width:  5,
-			height: 2,
-			expected: &image.YCbCr{
-				SubsampleRatio: image.YCbCrSubsampleRatio420,
-				Y: []uint8{
-					0xF0, 0x10, 0x10, 0x00, 0x00,
-					0x00, 0x00, 0x00, 0x40, 0x50,
-				},
-				Cb: []uint8{
-					0x20, 0x80, 0x00,
-				},
-				Cr: []uint8{
-					0xE0, 0x80, 0x00,
-				},
-				YStride: 5,
-				CStride: 3,
-				Rect:    image.Rect(0, 0, 5, 2),
-			},
-		},
-	}
-
-	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) {
 	for name, algo := range scalerBenchAlgos {
 		algo := algo

pkg/io/video/scaler_cgo.c

@@ -29,7 +29,7 @@ void fastBoxSampling(
     const int sw, const int sh, const int sstride,
     uint32_t* tmp)
 {
-  memset(tmp, 0, dstride * dh * ch * sizeof(tmp[0]));
+  memset(tmp, 0, dw * dh * ch);
 
   for (int sy = 0; sy < sh; sy++)
   {
@@ -39,14 +39,13 @@ void fastBoxSampling(
     uint32_t* tmp2 = &tmp[ty * dstride];
     for (int sx = 0; sx < sw * ch; sx += ch)
     {
+      if (tx * sw < sx * dw)
+        tx += ch;
+
       for (int c = 0; c < ch; c++)
       {
         tmp2[tx + c] += 0x10000 | src2[sx + c];
       }
-      if (tx * sw < sx * dw)
-      {
-        tx += ch;
-      }
     }
   }
 

pkg/io/video/scaler_nocgo.go

@@ -1,22 +0,0 @@
-//go:build !cgo
-// +build !cgo
-
-package video
-
-import (
-	"golang.org/x/image/draw"
-	"image"
-)
-
-// ScalerFastBoxSampling mock scaler for nocgo implementation to pass tests for CGO_ENABLED=0
-var (
-	ScalerFastBoxSampling = Scaler(&FastBoxSampling{})
-)
-
-// FastBoxSampling mock implementation for nocgo implementation
-// TODO implement nocgo FastBoxSampling scaling algorithm
-type FastBoxSampling struct {
-}
-
-func (f *FastBoxSampling) Scale(_ draw.Image, _ image.Rectangle, _ image.Image, _ image.Rectangle, _ draw.Op, _ *draw.Options) {
-}

pkg/io/video/scaleycrcb.go

@@ -30,18 +30,10 @@ func (p *rgbLikeYCbCr) At(x, y int) color.Color {
 }
 
 func (p *rgbLikeYCbCr) Set(x, y int, c color.Color) {
-	switch v := c.(type) {
+	rgb := c.(*color.RGBA64)
-	case color.RGBA:
+	p.y.SetGray(x, y, color.Gray{uint8(rgb.R / 0x100)})
-		p.y.SetGray(x, y, color.Gray{v.R})
+	if (image.Point{x, y}.In(p.cb.Rect)) {
-		if (image.Point{x, y}.In(p.cb.Rect)) {
+		p.cb.SetGray(x, y, color.Gray{uint8(rgb.G / 0x100)})
-			p.cb.SetGray(x, y, color.Gray{v.G})
+		p.cr.SetGray(x, y, color.Gray{uint8(rgb.B / 0x100)})
-			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)})
-		}
 	}
 }

pkg/prop/prop.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pion/mediadevices/pkg/frame"
 )
 
-// MediaConstraints represents set of media property constraints.
+// MediaConstraints represents set of media propaty constraints.
 // Each field constrains property by min/ideal/max range, exact match, or oneof match.
 type MediaConstraints struct {
 	DeviceID StringConstraint
@@ -145,16 +145,13 @@ func (p *MediaConstraints) FitnessDistance(o Media) (float64, bool) {
 	cmps.add(p.Width, o.Width)
 	cmps.add(p.Height, o.Height)
 	cmps.add(p.FrameFormat, o.FrameFormat)
-	// skip framerate if not available in media properties
-	if o.FrameRate > 0.0 {
-		cmps.add(p.FrameRate, o.FrameRate)
-	}
 	cmps.add(p.SampleRate, o.SampleRate)
 	cmps.add(p.Latency, o.Latency)
 	cmps.add(p.ChannelCount, o.ChannelCount)
 	cmps.add(p.IsBigEndian, o.IsBigEndian)
 	cmps.add(p.IsFloat, o.IsFloat)
 	cmps.add(p.IsInterleaved, o.IsInterleaved)
+
 	return cmps.fitnessDistance()
 }
 
@@ -228,18 +225,16 @@ func (c *comparisons) fitnessDistance() (float64, bool) {
 
 // VideoConstraints represents a video's constraints
 type VideoConstraints struct {
-	Width, Height          IntConstraint
+	Width, Height IntConstraint
-	FrameRate              FloatConstraint
+	FrameRate     FloatConstraint
-	FrameFormat            FrameFormatConstraint
+	FrameFormat   FrameFormatConstraint
-	DiscardFramesOlderThan time.Duration
 }
 
 // Video represents a video's constraints
 type Video struct {
-	Width, Height          int
+	Width, Height int
-	FrameRate              float32
+	FrameRate     float32
-	FrameFormat            frame.Format
+	FrameFormat   frame.Format
-	DiscardFramesOlderThan time.Duration
 }
 
 // AudioConstraints represents an audio's constraints

pkg/prop/prop_test.go

@@ -85,60 +85,6 @@ func TestCompareMatch(t *testing.T) {
 			}},
 			true,
 		},
-		"FloatExactMatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: FloatExact(30),
-			}},
-			Media{Video: Video{
-				FrameRate: 30.0,
-			}},
-			true,
-		},
-		"FloatExactUnmatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: FloatExact(30),
-			}},
-			Media{Video: Video{
-				FrameRate: 30.1,
-			}},
-			false,
-		},
-		"FloatIdealMatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: Float(30),
-			}},
-			Media{Video: Video{
-				FrameRate: 30.0,
-			}},
-			true,
-		},
-		"FloatIdealUnmatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: Float(30),
-			}},
-			Media{Video: Video{
-				FrameRate: 10.0,
-			}},
-			true,
-		},
-		"FloatRangeMatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: FloatRanged{Min: 30, Max: 40},
-			}},
-			Media{Video: Video{
-				FrameRate: 35.0,
-			}},
-			true,
-		},
-		"FloatRangeUnmatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: FloatRanged{Min: 30, Max: 40},
-			}},
-			Media{Video: Video{
-				FrameRate: 50.0,
-			}},
-			false,
-		},
 		"FrameFormatOneOfUnmatch": {
 			MediaConstraints{VideoConstraints: VideoConstraints{
 				FrameFormat: FrameFormatOneOf{frame.FormatYUYV, frame.FormatUYVY},
@@ -420,63 +366,3 @@ func TestString(t *testing.T) {
 		})
 	})
 }
-
-func TestFrameRateProps(t *testing.T) {
-	testDataSet := map[string]struct {
-		a     MediaConstraints
-		b     Media
-		score float64
-		match bool
-	}{
-		"FrameRateIdealMatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: Float(30.0),
-			}},
-			Media{Video: Video{
-				FrameRate: 30.0,
-			}},
-			0.0,
-			true,
-		},
-		"FrameRateIdealUnmatch": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: Float(30.0),
-			}},
-			Media{Video: Video{
-				FrameRate: 60.0,
-			}},
-			0.5,
-			true,
-		},
-		"FrameRateConstraintMissing": {
-			// empty video fps constraint
-			MediaConstraints{VideoConstraints: VideoConstraints{}},
-			Media{Video: Video{
-				FrameRate: 30.0,
-			}},
-			0.0,
-			true,
-		},
-		"FrameRatePropMissing": {
-			MediaConstraints{VideoConstraints: VideoConstraints{
-				FrameRate: Float(30.0),
-			}},
-			// empty video fps property
-			Media{Video: Video{}},
-			0.0,
-			true,
-		},
-	}
-
-	for name, data := range testDataSet {
-		t.Run(name, func(t *testing.T) {
-			score, match := data.a.FitnessDistance(data.b)
-			if score != data.score {
-				t.Errorf("expected score %f, got %f", data.score, score)
-			}
-			if match != data.match {
-				t.Errorf("expected match %t, got %t", data.match, match)
-			}
-		})
-	}
-}

pkg/wave/buffer_test.go

@@ -53,7 +53,7 @@ func TestBufferStoreCopyAndLoad(t *testing.T) {
 				for i := range cloneReal.Data {
 					if reflect.ValueOf(originalReal.Data[i]).Pointer() == reflect.ValueOf(cloneReal.Data[i]).Pointer() {
 						err := fmt.Errorf("Channel %d memory address should be different", i)
-						t.Errorf("%v: %s", errIdenticalAddress, err)
+						t.Errorf("%v: %w", errIdenticalAddress, err)
 					}
 				}
 			},
@@ -89,7 +89,7 @@ func TestBufferStoreCopyAndLoad(t *testing.T) {
 				for i := range cloneReal.Data {
 					if reflect.ValueOf(originalReal.Data[i]).Pointer() == reflect.ValueOf(cloneReal.Data[i]).Pointer() {
 						err := fmt.Errorf("Channel %d memory address should be different", i)
-						t.Errorf("%v: %s", errIdenticalAddress, err)
+						t.Errorf("%v: %w", errIdenticalAddress, err)
 					}
 				}
 			},

renovate.json

@@ -11,16 +11,6 @@
     {
       "packagePatterns": ["^golang.org/x/"],
       "schedule": ["on the first day of the month"]
-    },
-    {
-      "description": "Disable updating minimum Go version: https://github.com/renovatebot/renovate/issues/16715",
-      "matchManagers": ["gomod"],
-      "matchDepTypes": ["golang"],
-      "enabled": false
     }
-  ],
-  "ignorePaths": [],
-  "ignoreDeps": [
-    "github.com/pion/mediadevices"
   ]
 }

track.go

@@ -3,14 +3,12 @@ package mediadevices
 import (
 	"errors"
 	"fmt"
+	"github.com/pion/rtcp"
 	"image"
 	"io"
 	"strings"
 	"sync"
 
-	"github.com/pion/interceptor"
-	"github.com/pion/rtcp"
-
 	"github.com/google/uuid"
 	"github.com/pion/mediadevices/pkg/codec"
 	"github.com/pion/mediadevices/pkg/driver"
@@ -18,12 +16,11 @@ import (
 	"github.com/pion/mediadevices/pkg/io/video"
 	"github.com/pion/mediadevices/pkg/wave"
 	"github.com/pion/rtp"
-	"github.com/pion/webrtc/v4"
+	"github.com/pion/webrtc/v3"
 )
 
 const (
 	rtpOutboundMTU = 1200
-	rtcpInboundMTU = 1500
 )
 
 var (
@@ -83,7 +80,6 @@ type baseTrack struct {
 	Source
 	err                   error
 	onErrorHandler        func(error)
-	errMu                 sync.Mutex
 	mu                    sync.Mutex
 	endOnce               sync.Once
 	kind                  MediaDeviceType
@@ -130,10 +126,10 @@ func (track *baseTrack) RID() string {
 // 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.
 func (track *baseTrack) OnEnded(handler func(error)) {
-	track.errMu.Lock()
+	track.mu.Lock()
 	track.onErrorHandler = handler
 	err := track.err
-	track.errMu.Unlock()
+	track.mu.Unlock()
 
 	if err != nil && handler != nil {
 		// Already errored.
@@ -145,10 +141,10 @@ func (track *baseTrack) OnEnded(handler func(error)) {
 
 // onError is a callback when an error occurs
 func (track *baseTrack) onError(err error) {
-	track.errMu.Lock()
+	track.mu.Lock()
 	track.err = err
 	handler := track.onErrorHandler
-	track.errMu.Unlock()
+	track.mu.Unlock()
 
 	if handler != nil {
 		track.endOnce.Do(func() {
@@ -162,7 +158,7 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
 	defer track.mu.Unlock()
 
 	signalCh := make(chan chan<- struct{})
-	stopRead := make(chan struct{})
+	var stopRead chan struct{}
 	track.activePeerConnections[ctx.ID()] = signalCh
 
 	var encodedReader RTPReadCloser
@@ -172,14 +168,6 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
 	for _, wantedCodec := range ctx.CodecParameters() {
 		logger.Debugf("trying to build %s rtp reader", wantedCodec.MimeType)
 		encodedReader, err = specializedTrack.NewRTPReader(wantedCodec.MimeType, uint32(ctx.SSRC()), rtpOutboundMTU)
-
-		track.errMu.Lock()
-		if track.err != nil {
-			err = track.err
-			encodedReader = nil
-		}
-		track.errMu.Unlock()
-
 		if err == nil {
 			selectedCodec = wantedCodec
 			break
@@ -199,8 +187,7 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
 			close(stopRead)
 			encodedReader.Close()
 
-			// When there's another call to unbind, it won't block since we remove the current ctx from active connections
+			// When there's another call to unbind, it won't block since we mark the signalCh to be closed
-			track.removeActivePeerConnection(ctx.ID())
 			close(signalCh)
 			if doneCh != nil {
 				close(doneCh)
@@ -232,55 +219,42 @@ func (track *baseTrack) bind(ctx webrtc.TrackLocalContext, specializedTrack Trac
 
 	keyFrameController, ok := encodedReader.Controller().(codec.KeyFrameController)
 	if ok {
-		go track.rtcpReadLoop(ctx.RTCPReader(), keyFrameController, stopRead)
+		stopRead = make(chan struct{})
+		go func() {
+			reader := ctx.ReadStream()
+			for {
+				select {
+				case <-stopRead:
+					return
+				default:
+				}
+
+				pkts, _, err := reader.ReadRTCP()
+				if err != nil {
+					track.onError(err)
+					return
+				}
+
+				for _, pkt := range pkts {
+					switch pkt.(type) {
+					case *rtcp.PictureLossIndication, *rtcp.FullIntraRequest:
+						if err := keyFrameController.ForceKeyFrame(); err != nil {
+							track.onError(err)
+							return
+						}
+					}
+				}
+			}
+		}()
 	}
 
 	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 {
-	ch := track.removeActivePeerConnection(ctx.ID())
+	ch, err := track.removeActivePeerConnection(ctx.ID())
-	// If there isn't a registered chanel for this ctx, it means it has already been unbound
+	if err != err {
-	if ch == nil {
+		return err
-		return nil
 	}
 
 	doneCh := make(chan struct{})
@@ -289,17 +263,17 @@ func (track *baseTrack) unbind(ctx webrtc.TrackLocalContext) error {
 	return nil
 }
 
-func (track *baseTrack) removeActivePeerConnection(id string) chan<- chan<- struct{} {
+func (track *baseTrack) removeActivePeerConnection(id string) (chan<- chan<- struct{}, error) {
 	track.mu.Lock()
 	defer track.mu.Unlock()
 
 	ch, ok := track.activePeerConnections[id]
 	if !ok {
-		return nil
+		return nil, errNotFoundPeerConnection
 	}
 	delete(track.activePeerConnections, id)
 
-	return ch
+	return ch, nil
 }
 
 func newTrackFromDriver(d driver.Driver, constraints MediaTrackConstraints, selector *CodecSelector) (Track, error) {
@@ -321,7 +295,7 @@ func newTrackFromDriver(d driver.Driver, constraints MediaTrackConstraints, sele
 type VideoTrack struct {
 	*baseTrack
 	*video.Broadcaster
-	shouldCopyFrames bool
+	ShouldCopyFrames bool
 }
 
 // NewVideoTrack constructs a new VideoTrack
@@ -329,16 +303,6 @@ func NewVideoTrack(source VideoSource, selector *CodecSelector) Track {
 	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 {
 	base := newBaseTrack(source, VideoInput, selector)
 	wrappedReader := video.ReaderFunc(func() (img image.Image, release func(), err error) {
@@ -383,7 +347,7 @@ func (track *VideoTrack) Unbind(ctx webrtc.TrackLocalContext) error {
 }
 
 func (track *VideoTrack) newEncodedReader(codecNames ...string) (EncodedReadCloser, *codec.RTPCodec, error) {
-	reader := track.NewReader(track.shouldCopyFrames)
+	reader := track.NewReader(track.ShouldCopyFrames)
 	inputProp, err := detectCurrentVideoProp(track.Broadcaster)
 	if err != nil {
 		return nil, nil, err
@@ -527,8 +491,7 @@ func (track *AudioTrack) newEncodedReader(codecNames ...string) (EncodedReadClos
 			}
 			return buffer, release, err
 		},
-		closeFn:      encodedReader.Close,
+		closeFn: encodedReader.Close,
-		controllerFn: encodedReader.Controller,
 	}, selectedCodec, nil
 }
 
@@ -566,7 +529,6 @@ func (track *AudioTrack) NewRTPReader(codecName string, ssrc uint32, mtu int) (R
 			pkts := packetizer.Packetize(encoded.Data, encoded.Samples)
 			return pkts, release, err
 		},
-		closeFn:      encodedReader.Close,
+		closeFn: encodedReader.Close,
-		controllerFn: encodedReader.Controller,
 	}, nil
 }

track_test.go

@@ -2,33 +2,12 @@ package mediadevices
 
 import (
 	"errors"
-	"io"
-	"sync"
 	"testing"
 	"time"
-
-	"github.com/pion/interceptor"
-	"github.com/pion/webrtc/v4"
 )
 
-var errExpected error = errors.New("an error")
-
-type DummyBindTrack struct {
-	*baseTrack
-}
-
-func (track *DummyBindTrack) Bind(ctx webrtc.TrackLocalContext) (webrtc.RTPCodecParameters, error) {
-	track.mu.Lock()
-	defer track.mu.Unlock()
-
-	track.onError(errExpected)
-
-	<-time.After(5 * time.Millisecond)
-
-	return webrtc.RTPCodecParameters{}, nil
-}
-
 func TestOnEnded(t *testing.T) {
+	errExpected := errors.New("an error")
 
 	t.Run("ErrorAfterRegister", func(t *testing.T) {
 		tr := &baseTrack{}
@@ -73,134 +52,4 @@ func TestOnEnded(t *testing.T) {
 			t.Error("Timeout")
 		}
 	})
-
-	t.Run("ErrorDurringBind", func(t *testing.T) {
-		tr := &DummyBindTrack{
-			baseTrack: &baseTrack{
-				activePeerConnections: make(map[string]chan<- chan<- struct{}),
-				mu:                    sync.Mutex{},
-			},
-		}
-
-		called := make(chan error, 1)
-		tr.OnEnded(func(err error) {
-			called <- errExpected
-		})
-
-		_, err := tr.Bind(&fakeTrackLocalContext{})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		select {
-		case err := <-called:
-			if err != errExpected {
-				t.Errorf("Expected to receive error: %v, got: %v", errExpected, err)
-			}
-		case <-time.After(10 * time.Millisecond):
-			t.Error("Timeout")
-		}
-	})
-}
-
-type fakeTrackLocalContext struct {
-	webrtc.TrackLocalContext
-}
-
-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:
-				}
-			})
-		}
-	})
 }