mirror of
https://github.com/pion/mediadevices.git
synced 2025-09-27 04:46:10 +08:00
Compare commits
56 Commits
refractor
...
add-broadc
Author | SHA1 | Date | |
---|---|---|---|
![]() |
186ee09102 | ||
![]() |
20fadef555 | ||
![]() |
0734092a11 | ||
![]() |
70f7360b92 | ||
![]() |
30d49e1fd3 | ||
![]() |
0cd870fd4b | ||
![]() |
13e6dcc437 | ||
![]() |
366885e01c | ||
![]() |
86e3a3f14c | ||
![]() |
b4c11d5a0c | ||
![]() |
18da7ff1c6 | ||
![]() |
f7068296d3 | ||
![]() |
6d07cc2a58 | ||
![]() |
d857d04dc9 | ||
![]() |
cfdb2221a4 | ||
![]() |
297b4adb4b | ||
![]() |
6269ed6508 | ||
![]() |
aacb05c421 | ||
![]() |
4692cd76e9 | ||
![]() |
2f437a5cc6 | ||
![]() |
fa82237095 | ||
![]() |
74f1fa4910 | ||
![]() |
714d0fa839 | ||
![]() |
6d3f9dbc3e | ||
![]() |
45056e6922 | ||
![]() |
a4faa89c6c | ||
![]() |
122aec0536 | ||
![]() |
c3c1177455 | ||
![]() |
74723dd9f1 | ||
![]() |
4fbce4769b | ||
![]() |
09ff95645e | ||
![]() |
1ebba951fb | ||
![]() |
cce22b117a | ||
![]() |
e87f899777 | ||
![]() |
0d1e856f7d | ||
![]() |
d2d9259f15 | ||
![]() |
0c3bf8af3b | ||
![]() |
438ee8a3d0 | ||
![]() |
8c49553179 | ||
![]() |
6735d5541e | ||
![]() |
94b57d40e3 | ||
![]() |
8d7947b594 | ||
![]() |
fad6c3ec4b | ||
![]() |
73812503a3 | ||
![]() |
96c19f3635 | ||
![]() |
ea879e1172 | ||
![]() |
f641417d1e | ||
![]() |
8bfce0c818 | ||
![]() |
00eca231a7 | ||
![]() |
27d966611e | ||
![]() |
ecff5e63a5 | ||
![]() |
305b7086e3 | ||
![]() |
6471064956 | ||
![]() |
c6e685964f | ||
![]() |
65b744f639 | ||
![]() |
a2b74babc4 |
42
.github/workflows/ci.yaml
vendored
42
.github/workflows/ci.yaml
vendored
@@ -8,12 +8,12 @@ on:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
build-linux:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
go: [ '1.14', '1.13' ]
|
||||
name: Go ${{ matrix.go }}
|
||||
go: [ '1.15', '1.14' ]
|
||||
name: Linux Go ${{ matrix.go }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
@@ -43,5 +43,37 @@ jobs:
|
||||
run: go test . pkg/... -v
|
||||
env:
|
||||
CGO_ENABLED: 0
|
||||
#- name: golint
|
||||
# run: go lint ./...
|
||||
build-darwin:
|
||||
runs-on: macos-latest
|
||||
strategy:
|
||||
matrix:
|
||||
go: [ '1.15', '1.14' ]
|
||||
name: Darwin Go ${{ matrix.go }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Setup Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: ${{ matrix.go }}
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew install \
|
||||
pkg-config \
|
||||
opus \
|
||||
libvpx \
|
||||
x264
|
||||
- name: go vet
|
||||
run: go vet ./...
|
||||
- name: go build
|
||||
run: go build ./...
|
||||
- name: go build without CGO
|
||||
run: go build . pkg/...
|
||||
env:
|
||||
CGO_ENABLED: 0
|
||||
- name: go test
|
||||
run: go test ./... -v -race
|
||||
- name: go test without CGO
|
||||
run: go test . pkg/... -v
|
||||
env:
|
||||
CGO_ENABLED: 0
|
||||
|
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019 Pion
|
||||
Copyright (c) 2019-2020 Pion
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@@ -8,7 +8,7 @@ Go implementation of the [MediaDevices](https://developer.mozilla.org/en-US/docs
|
||||
|
||||
| Interface | Linux | Mac | Windows |
|
||||
| :--------: | :---: | :-: | :-----: |
|
||||
| Camera | ✔️ | ✖️ | ✔️ |
|
||||
| Camera | ✔️ | ✔️ | ✔️ |
|
||||
| Microphone | ✔️ | ✖️ | ✔️ |
|
||||
| Screen | ✔️ | ✖️ | ✖️ |
|
||||
|
||||
@@ -17,15 +17,15 @@ Go implementation of the [MediaDevices](https://developer.mozilla.org/en-US/docs
|
||||
| OS | Library/Interface |
|
||||
| :-----: | :---------------------------------------------------------------------: |
|
||||
| Linux | [Video4Linux](https://en.wikipedia.org/wiki/Video4Linux) |
|
||||
| Mac | N/A |
|
||||
| Mac | [AVFoundation](https://developer.apple.com/av-foundation/) |
|
||||
| Windows | [DirectShow](https://docs.microsoft.com/en-us/windows/win32/directshow) |
|
||||
|
||||
| Pixel Format | Linux | Mac | Windows |
|
||||
| :---------------------------------------------------: | :---: | :-: | :-----: |
|
||||
| [YUY2](https://www.fourcc.org/pixel-format/yuv-yuy2/) | ✔️ | ✖️ | ✔️ |
|
||||
| [UYVY](https://www.fourcc.org/pixel-format/yuv-uyvy/) | ✔️ | ✖️ | ✖️ |
|
||||
| [UYVY](https://www.fourcc.org/pixel-format/yuv-uyvy/) | ✔️ | ✔️ | ✖️ |
|
||||
| [I420](https://www.fourcc.org/pixel-format/yuv-i420/) | ✔️ | ✖️ | ✖️ |
|
||||
| [NV21](https://www.fourcc.org/pixel-format/yuv-nv21/) | ✔️ | ✖️ | ✖️ |
|
||||
| [NV21](https://www.fourcc.org/pixel-format/yuv-nv21/) | ✔️ | ✔️ | ✖️ |
|
||||
| [MJPEG](https://www.fourcc.org/mjpg/) | ✔️ | ✖️ | ✖️ |
|
||||
|
||||
### Microphone
|
||||
|
@@ -11,6 +11,7 @@ import (
|
||||
_ "github.com/pion/mediadevices/pkg/driver/camera" // This is required to register camera adapter
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
"github.com/pion/mediadevices/pkg/io/video"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
"github.com/pion/webrtc/v2"
|
||||
)
|
||||
|
||||
@@ -66,10 +67,10 @@ func main() {
|
||||
|
||||
s, err := md.GetUserMedia(mediadevices.MediaStreamConstraints{
|
||||
Video: func(c *mediadevices.MediaTrackConstraints) {
|
||||
c.FrameFormat = frame.FormatI420 // most of the encoder accepts I420
|
||||
c.FrameFormat = prop.FrameFormatExact(frame.FormatI420) // most of the encoder accepts I420
|
||||
c.Enabled = true
|
||||
c.Width = 640
|
||||
c.Height = 480
|
||||
c.Width = prop.Int(640)
|
||||
c.Height = prop.Int(480)
|
||||
c.VideoTransform = markFacesTransformer
|
||||
c.VideoEncoderBuilders = []codec.VideoEncoderBuilder{&vp8Params}
|
||||
},
|
||||
|
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/pion/mediadevices/pkg/codec/vpx" // This is required to use VP8/VP9 video encoder
|
||||
_ "github.com/pion/mediadevices/pkg/driver/camera" // This is required to register camera adapter
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
"github.com/pion/rtp"
|
||||
"github.com/pion/webrtc/v2"
|
||||
"github.com/pion/webrtc/v2/pkg/media"
|
||||
@@ -48,10 +49,10 @@ func main() {
|
||||
|
||||
_, err = md.GetUserMedia(mediadevices.MediaStreamConstraints{
|
||||
Video: func(c *mediadevices.MediaTrackConstraints) {
|
||||
c.FrameFormat = frame.FormatYUY2
|
||||
c.FrameFormat = prop.FrameFormat(frame.FormatYUY2)
|
||||
c.Enabled = true
|
||||
c.Width = 640
|
||||
c.Height = 480
|
||||
c.Width = prop.Int(640)
|
||||
c.Height = prop.Int(480)
|
||||
c.VideoEncoderBuilders = []codec.VideoEncoderBuilder{&vp8Params}
|
||||
},
|
||||
})
|
||||
|
@@ -7,6 +7,7 @@ import (
|
||||
"github.com/pion/mediadevices/examples/internal/signal"
|
||||
"github.com/pion/mediadevices/pkg/codec"
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
"github.com/pion/webrtc/v2"
|
||||
|
||||
// This is required to use opus audio encoder
|
||||
@@ -80,10 +81,10 @@ func main() {
|
||||
c.AudioEncoderBuilders = []codec.AudioEncoderBuilder{&opusParams}
|
||||
},
|
||||
Video: func(c *mediadevices.MediaTrackConstraints) {
|
||||
c.FrameFormat = frame.FormatYUY2
|
||||
c.FrameFormat = prop.FrameFormat(frame.FormatYUY2)
|
||||
c.Enabled = true
|
||||
c.Width = 640
|
||||
c.Height = 480
|
||||
c.Width = prop.Int(640)
|
||||
c.Height = prop.Int(480)
|
||||
c.VideoEncoderBuilders = []codec.VideoEncoderBuilder{&vp8Params}
|
||||
},
|
||||
})
|
||||
|
9
go.mod
9
go.mod
@@ -4,11 +4,10 @@ go 1.13
|
||||
|
||||
require (
|
||||
github.com/blackjack/webcam v0.0.0-20200313125108-10ed912a8539
|
||||
github.com/faiface/beep v1.0.2
|
||||
github.com/jfreymuth/pulse v0.0.0-20200424182717-3b0820ad352f
|
||||
github.com/jfreymuth/pulse v0.0.0-20200817093420-a82ccdb5e8aa
|
||||
github.com/lherman-cs/opus v0.0.0-20200223204610-6a4b98199ea4
|
||||
github.com/pion/webrtc/v2 v2.2.8
|
||||
github.com/pion/webrtc/v2 v2.2.24
|
||||
github.com/satori/go.uuid v1.2.0
|
||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8
|
||||
golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3
|
||||
golang.org/x/image v0.0.0-20200801110659-972c09e46d76
|
||||
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a
|
||||
)
|
||||
|
122
go.sum
122
go.sum
@@ -5,32 +5,18 @@ github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wX
|
||||
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/faiface/beep v1.0.2 h1:UB5DiRNmA4erfUYnHbgU4UB6DlBOrsdEFRtcc8sCkdQ=
|
||||
github.com/faiface/beep v1.0.2/go.mod h1:1yLb5yRdHMsovYYWVqYLioXkVuziCSITW1oarTeduQM=
|
||||
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
|
||||
github.com/gdamore/tcell v1.1.1/go.mod h1:K1udHkiR3cOtlpKG5tZPD5XxrF7v2y7lDq7Whcj+xkQ=
|
||||
github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
|
||||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c h1:16eHWuMGvCjSfgRJKqIzapE78onvvTbdi1rMkU00lZw=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gopherjs/gopherwasm v0.1.1/go.mod h1:kx4n9a+MzHH0BJJhvlsQ65hqLFXDO/m256AsaDPQ+/4=
|
||||
github.com/gopherjs/gopherwasm v1.0.0 h1:32nge/RlujS1Im4HNCJPp0NbBOAeBXFuT1KonUuLl+Y=
|
||||
github.com/gopherjs/gopherwasm v1.0.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
|
||||
github.com/hajimehoshi/go-mp3 v0.1.1/go.mod h1:4i+c5pDNKDrxl1iu9iG90/+fhP37lio6gNhjCx9WBJw=
|
||||
github.com/hajimehoshi/oto v0.1.1/go.mod h1:hUiLWeBQnbDu4pZsAhOnGqMI1ZGibS6e2qhQdfpwz04=
|
||||
github.com/hajimehoshi/oto v0.3.1 h1:cpf/uIv4Q0oc5uf9loQn7PIehv+mZerh+0KKma6gzMk=
|
||||
github.com/hajimehoshi/oto v0.3.1/go.mod h1:e9eTLBB9iZto045HLbzfHJIc+jP3xaKrjZTghvb6fdM=
|
||||
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
|
||||
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/jfreymuth/oggvorbis v1.0.0/go.mod h1:abe6F9QRjuU9l+2jek3gj46lu40N4qlYxh2grqkLEDM=
|
||||
github.com/jfreymuth/pulse v0.0.0-20200424182717-3b0820ad352f h1:XyMNiJ5vCUTlgl4R/pfw11rzt1sbdzNLbZCk/bb3LfU=
|
||||
github.com/jfreymuth/pulse v0.0.0-20200424182717-3b0820ad352f/go.mod h1:cpYspI6YljhkUf1WLXLLDmeaaPFc3CnGLjDZf9dZ4no=
|
||||
github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0=
|
||||
github.com/jfreymuth/pulse v0.0.0-20200817093420-a82ccdb5e8aa h1:qUZIj5+D3UDgfshNe8Cz/9maOxe8ddt43qwQH9vEEC8=
|
||||
github.com/jfreymuth/pulse v0.0.0-20200817093420-a82ccdb5e8aa/go.mod h1:cpYspI6YljhkUf1WLXLLDmeaaPFc3CnGLjDZf9dZ4no=
|
||||
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
@@ -40,53 +26,55 @@ github.com/lherman-cs/opus v0.0.0-20200223204610-6a4b98199ea4 h1:2ydMA2KbxRkYmIw
|
||||
github.com/lherman-cs/opus v0.0.0-20200223204610-6a4b98199ea4/go.mod h1:v9KQvlDYMuvlwniumBVMlrB0VHQvyTgxNvaXjPmTmps=
|
||||
github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9 h1:tbuodUh2vuhOVZAdW3NEUvosFHUMJwUNl7jk/VSEiwc=
|
||||
github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9/go.mod h1:PpMmPfPKO9nKJ/psF49ESTAGQSdfXxlg1otPbEB2nOw=
|
||||
github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4=
|
||||
github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA=
|
||||
github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
|
||||
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
|
||||
github.com/mewkiz/flac v1.0.5/go.mod h1:EHZNU32dMF6alpurYyKHDLYpW1lYpBZ5WrXi/VuNIGs=
|
||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
|
||||
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
|
||||
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/pion/datachannel v1.4.16 h1:dvuDC0IBMUDQvwO+gRu0Dv+W5j7rrgNpCmtheb6iYnc=
|
||||
github.com/pion/datachannel v1.4.16/go.mod h1:gRGhxZv7X2/30Qxes4WEXtimKBXcwj/3WsDtBlHnvJY=
|
||||
github.com/pion/dtls/v2 v2.0.0 h1:Fk+MBhLZ/U1bImzAhmzwbO/pP2rKhtTw8iA934H3ybE=
|
||||
github.com/pion/dtls/v2 v2.0.0/go.mod h1:VkY5VL2wtsQQOG60xQ4lkV5pdn0wwBBTzCfRJqXhp3A=
|
||||
github.com/pion/ice v0.7.14 h1:lin/tzVc562t0Qk62/JlfOMX/RWuUSq/YyXakH2HTTQ=
|
||||
github.com/pion/ice v0.7.14/go.mod h1:/Lz6jAUhsvXed7kNJImXtvVSgjtcdGKoZAZIYb9WEm0=
|
||||
github.com/pion/datachannel v1.4.20 h1:+uYUrxbhGuEt+9En81Necda5ul8M2h7mMsvGWkYZ/yI=
|
||||
github.com/pion/datachannel v1.4.20/go.mod h1:hsjWYdTW5fMmtM4hVIxUNYqViRPv2A6ixzkQFd82wSc=
|
||||
github.com/pion/dtls/v2 v2.0.1 h1:ddE7+V0faYRbyh4uPsRZ2vLdRrjVZn+wmCfI7jlBfaA=
|
||||
github.com/pion/dtls/v2 v2.0.1/go.mod h1:uMQkz2W0cSqY00xav7WByQ4Hb+18xeQh2oH2fRezr5U=
|
||||
github.com/pion/dtls/v2 v2.0.2 h1:FHCHTiM182Y8e15aFTiORroiATUI16ryHiQh8AIOJ1E=
|
||||
github.com/pion/dtls/v2 v2.0.2/go.mod h1:27PEO3MDdaCfo21heT59/vsdmZc0zMt9wQPcSlLu/1I=
|
||||
github.com/pion/ice v0.7.18 h1:KbAWlzWRUdX9SmehBh3gYpIFsirjhSQsCw6K2MjYMK0=
|
||||
github.com/pion/ice v0.7.18/go.mod h1:+Bvnm3nYC6Nnp7VV6glUkuOfToB/AtMRZpOU8ihuf4c=
|
||||
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 v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY=
|
||||
github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0=
|
||||
github.com/pion/quic v0.1.1 h1:D951FV+TOqI9A0rTF7tHx0Loooqz+nyzjEyj8o3PuMA=
|
||||
github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k=
|
||||
github.com/pion/rtcp v1.2.1 h1:S3yG4KpYAiSmBVqKAfgRa5JdwBNj4zK3RLUa8JYdhak=
|
||||
github.com/pion/rtcp v1.2.1/go.mod h1:a5dj2d6BKIKHl43EnAOIrCczcjESrtPuMgfmL6/K6QM=
|
||||
github.com/pion/rtp v1.3.2 h1:Yfzf1mU4Zmg7XWHitzYe2i+l+c68iO+wshzIUW44p1c=
|
||||
github.com/pion/rtp v1.3.2/go.mod h1:q9wPnA96pu2urCcW/sK/RiDn597bhGoAQQ+y2fDwHuY=
|
||||
github.com/pion/rtp v1.4.0 h1:EkeHEXKuJhZoRUxtL2Ie80vVg9gBH+poT9UoL8M14nw=
|
||||
github.com/pion/rtp v1.4.0/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE=
|
||||
github.com/pion/sctp v1.7.6 h1:8qZTdJtbKfAns/Hv5L0PAj8FyXcsKhMH1pKUCGisQg4=
|
||||
github.com/pion/sctp v1.7.6/go.mod h1:ichkYQ5tlgCQwEwvgfdcAolqx1nHbYCxo4D7zK/K0X8=
|
||||
github.com/pion/sdp/v2 v2.3.7 h1:WUZHI3pfiYCaE8UGUYcabk863LCK+Bq3AklV5O0oInQ=
|
||||
github.com/pion/sdp/v2 v2.3.7/go.mod h1:+ZZf35r1+zbaWYiZLfPutWfx58DAWcGb2QsS3D/s9M8=
|
||||
github.com/pion/srtp v1.3.1 h1:WNDLN41ST0P6cXRpzx97JJW//vChAEo1+Etdqo+UMnM=
|
||||
github.com/pion/srtp v1.3.1/go.mod h1:nxEytDDGTN+eNKJ1l5gzOCWQFuksgijorsSlgEjc40Y=
|
||||
github.com/pion/stun v0.3.3 h1:brYuPl9bN9w/VM7OdNzRSLoqsnwlyNvD9MVeJrHjDQw=
|
||||
github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M=
|
||||
github.com/pion/randutil v0.0.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
|
||||
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.3 h1:2wrhKnqgSz91Q5nzYTO07mQXztYPtxL8a0XOss4rJqA=
|
||||
github.com/pion/rtcp v1.2.3/go.mod h1:zGhIv0RPRF0Z1Wiij22pUt5W/c9fevqSzT4jje/oK7I=
|
||||
github.com/pion/rtp v1.6.0 h1:4Ssnl/T5W2LzxHj9ssYpGVEQh3YYhQFNVmSWO88MMwk=
|
||||
github.com/pion/rtp v1.6.0/go.mod h1:QgfogHsMBVE/RFNno467U/KBqfUywEH+HK+0rtnwsdI=
|
||||
github.com/pion/sctp v1.7.9 h1:n+A37cTMU08xL3Oodkz39XjtPReQliKyk01q96mGB5M=
|
||||
github.com/pion/sctp v1.7.9/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0=
|
||||
github.com/pion/sdp/v2 v2.4.0 h1:luUtaETR5x2KNNpvEMv/r4Y+/kzImzbz4Lm1z8eQNQI=
|
||||
github.com/pion/sdp/v2 v2.4.0/go.mod h1:L2LxrOpSTJbAns244vfPChbciR/ReU1KWfG04OpkR7E=
|
||||
github.com/pion/srtp v1.5.1 h1:9Q3jAfslYZBt+C69SI/ZcONJh9049JUHZWYRRf5KEKw=
|
||||
github.com/pion/srtp v1.5.1/go.mod h1:B+QgX5xPeQTNc1CJStJPHzOlHK66ViMDWTT0HZTCkcA=
|
||||
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
|
||||
github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
|
||||
github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE=
|
||||
github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk=
|
||||
github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8=
|
||||
github.com/pion/transport v0.10.0 h1:9M12BSneJm6ggGhJyWpDveFOstJsTiQjkLf4M44rm80=
|
||||
github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE=
|
||||
github.com/pion/turn/v2 v2.0.3 h1:SJUUIbcPoehlyZgMyIUbBBDhI03sBx32x3JuSIBKBWA=
|
||||
github.com/pion/turn/v2 v2.0.3/go.mod h1:kl1hmT3NxcLynpXVnwJgObL8C9NaCyPTeqI2DcCpSZs=
|
||||
github.com/pion/webrtc/v2 v2.2.8 h1:vCSPnXmERhJTNfkPztkEQb8YKI1jrtGSK9e7/aZ4jOc=
|
||||
github.com/pion/webrtc/v2 v2.2.8/go.mod h1:Zl5bY5AGfc9gW0U20VSGHUKbiDcfuRDEmsb7cte8cwk=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pion/transport v0.10.1 h1:2W+yJT+0mOQ160ThZYUx5Zp2skzshiNgxrNE9GUfhJM=
|
||||
github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A=
|
||||
github.com/pion/turn/v2 v2.0.4 h1:oDguhEv2L/4rxwbL9clGLgtzQPjtuZwCdoM7Te8vQVk=
|
||||
github.com/pion/turn/v2 v2.0.4/go.mod h1:1812p4DcGVbYVBTiraUmP50XoKye++AMkbfp+N27mog=
|
||||
github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI=
|
||||
github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths=
|
||||
github.com/pion/webrtc/v2 v2.2.24 h1:l7q/iO96tMTElxuE2XGdNhCzklGcd9aVZ00XufASp0g=
|
||||
github.com/pion/webrtc/v2 v2.2.24/go.mod h1:U/m+nvG1t8gInf8PwiDyJEDcd7qfl+jmGQXqTX2zGvo=
|
||||
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=
|
||||
@@ -100,41 +88,43 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
|
||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM=
|
||||
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/exp v0.0.0-20180710024300-14dda7b62fcd h1:nLIcFw7GiqKXUS7HiChg6OAYWgASB2H97dZKd1GhDSs=
|
||||
golang.org/x/exp v0.0.0-20180710024300-14dda7b62fcd/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
|
||||
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
|
||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
|
||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/mobile v0.0.0-20180806140643-507816974b79 h1:t2JRgCWkY7Qaa1J2jal+wqC9OjbyHCHwIA9rVlRUSMo=
|
||||
golang.org/x/mobile v0.0.0-20180806140643-507816974b79/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
|
||||
golang.org/x/crypto v0.0.0-20200602180216-279210d13fed h1:g4KENRiCMEx58Q7/ecwfT0N2o8z35Fnbsjig/Alf2T4=
|
||||
golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
|
||||
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/image v0.0.0-20200801110659-972c09e46d76 h1:U7GPaoQyQmX+CBRWXKrvRzWTbd+slqeSh8uARsIyhAw=
|
||||
golang.org/x/image v0.0.0-20200801110659-972c09e46d76/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
|
||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U=
|
||||
golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
|
||||
golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
|
||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
|
||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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-20181228144115-9a3f9b0469bb/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-20190228124157-a34e9553db1e/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-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w=
|
||||
golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
|
||||
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a h1:i47hUS795cOydZI4AwJQCKXOr4BvxzvikwDoDtHhP2Y=
|
||||
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
@@ -145,3 +135,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
|
||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
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=
|
||||
|
@@ -11,12 +11,15 @@ import (
|
||||
func MeasureBitRate(r io.Reader, dur time.Duration) (float64, error) {
|
||||
var n, totalBytes int
|
||||
var err error
|
||||
|
||||
buf := make([]byte, 1024)
|
||||
start := time.Now()
|
||||
now := start
|
||||
end := now.Add(dur)
|
||||
for now.Before(end) {
|
||||
for {
|
||||
n, err = r.Read(buf)
|
||||
now = time.Now()
|
||||
|
||||
if err != nil {
|
||||
if e, ok := err.(*mio.InsufficientBufferError); ok {
|
||||
buf = make([]byte, 2*e.RequiredSize)
|
||||
@@ -24,6 +27,7 @@ func MeasureBitRate(r io.Reader, dur time.Duration) (float64, error) {
|
||||
}
|
||||
|
||||
if err == io.EOF {
|
||||
dur = now.Sub(start)
|
||||
totalBytes += n
|
||||
break
|
||||
}
|
||||
@@ -31,11 +35,12 @@ func MeasureBitRate(r io.Reader, dur time.Duration) (float64, error) {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
totalBytes += n
|
||||
now = time.Now()
|
||||
if now.After(end) {
|
||||
break
|
||||
}
|
||||
totalBytes += n // count bytes if the data arrived within the period
|
||||
}
|
||||
|
||||
elapsed := time.Now().Sub(start).Seconds()
|
||||
avg := float64(totalBytes*8) / elapsed
|
||||
avg := float64(totalBytes*8) / dur.Seconds()
|
||||
return avg, nil
|
||||
}
|
||||
|
@@ -9,18 +9,25 @@ import (
|
||||
|
||||
func TestMeasureBitRateStatic(t *testing.T) {
|
||||
r, w := io.Pipe()
|
||||
dur := time.Second * 5
|
||||
dataSize := 1000
|
||||
var precision float64 = 8 // 1 byte
|
||||
const (
|
||||
dataSize = 1000
|
||||
dur = 5 * time.Second
|
||||
packetInterval = time.Second
|
||||
precision = 8.0 // 1 byte
|
||||
)
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(1)
|
||||
done := make(chan struct{})
|
||||
|
||||
go func() {
|
||||
data := make([]byte, dataSize)
|
||||
ticker := time.NewTicker(packetInterval)
|
||||
|
||||
// Wait half interval
|
||||
time.Sleep(packetInterval / 2)
|
||||
|
||||
// Make sure that this goroutine is synchronized with main goroutine
|
||||
wg.Done()
|
||||
ticker := time.NewTicker(time.Second)
|
||||
|
||||
for {
|
||||
select {
|
||||
@@ -48,30 +55,34 @@ func TestMeasureBitRateStatic(t *testing.T) {
|
||||
|
||||
func TestMeasureBitRateDynamic(t *testing.T) {
|
||||
r, w := io.Pipe()
|
||||
dur := time.Second * 5
|
||||
dataSize := 1000
|
||||
var precision float64 = 8 // 1 byte
|
||||
const (
|
||||
dataSize = 1000
|
||||
dur = 5 * time.Second
|
||||
packetInterval = time.Millisecond * 250
|
||||
precision = 8.0 // 1 byte
|
||||
)
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(1)
|
||||
done := make(chan struct{})
|
||||
|
||||
go func() {
|
||||
data := make([]byte, dataSize)
|
||||
wg.Done()
|
||||
ticker := time.NewTicker(time.Millisecond * 500)
|
||||
var count int
|
||||
ticker := time.NewTicker(packetInterval)
|
||||
|
||||
// Wait half interval
|
||||
time.Sleep(packetInterval / 2)
|
||||
|
||||
wg.Done()
|
||||
|
||||
var count int
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
w.Write(data)
|
||||
count++
|
||||
// Wait until 4 slow ticks, which is also equal to 2 seconds
|
||||
if count == 4 {
|
||||
ticker.Stop()
|
||||
// Speed up the tick by 2 times for the rest
|
||||
ticker = time.NewTicker(time.Millisecond * 250)
|
||||
// 4 x 500ms ticks and 250ms ticks
|
||||
if count%2 == 1 || count >= 8 {
|
||||
w.Write(data)
|
||||
}
|
||||
count++
|
||||
case <-done:
|
||||
w.Close()
|
||||
return
|
||||
|
@@ -3,6 +3,7 @@ package mediadevices
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strings"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/driver"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
@@ -200,7 +201,11 @@ func selectBestDriver(filter driver.FilterFn, constraints MediaTrackConstraints)
|
||||
for d, props := range driverProperties {
|
||||
priority := float64(d.Info().Priority)
|
||||
for _, p := range props {
|
||||
fitnessDist := constraints.Media.FitnessDistance(p) - priority
|
||||
fitnessDist, ok := constraints.MediaConstraints.FitnessDistance(p)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
fitnessDist -= priority
|
||||
if fitnessDist < minFitnessDist {
|
||||
minFitnessDist = fitnessDist
|
||||
bestDriver = d
|
||||
@@ -210,22 +215,35 @@ func selectBestDriver(filter driver.FilterFn, constraints MediaTrackConstraints)
|
||||
}
|
||||
|
||||
if bestDriver == nil {
|
||||
return nil, MediaTrackConstraints{}, errNotFound
|
||||
var foundProperties []string
|
||||
for _, props := range driverProperties {
|
||||
for _, p := range props {
|
||||
foundProperties = append(foundProperties, fmt.Sprint(&p))
|
||||
}
|
||||
}
|
||||
|
||||
err := fmt.Errorf(`%w:
|
||||
============ Found Properties ============
|
||||
|
||||
%s
|
||||
|
||||
=============== Constraints ==============
|
||||
|
||||
%s
|
||||
`, errNotFound, strings.Join(foundProperties, "\n\n"), &constraints)
|
||||
return nil, MediaTrackConstraints{}, err
|
||||
}
|
||||
|
||||
constraints.Merge(bestProp)
|
||||
constraints.selectedMedia = prop.Media{}
|
||||
constraints.selectedMedia.MergeConstraints(constraints.MediaConstraints)
|
||||
constraints.selectedMedia.Merge(bestProp)
|
||||
return bestDriver, constraints, nil
|
||||
}
|
||||
|
||||
func (m *mediaDevices) selectAudio(constraints MediaTrackConstraints) (Tracker, error) {
|
||||
typeFilter := driver.FilterAudioRecorder()
|
||||
filter := typeFilter
|
||||
if constraints.DeviceID != "" {
|
||||
idFilter := driver.FilterID(constraints.DeviceID)
|
||||
filter = driver.FilterAnd(typeFilter, idFilter)
|
||||
}
|
||||
|
||||
d, c, err := selectBestDriver(filter, constraints)
|
||||
d, c, err := selectBestDriver(typeFilter, constraints)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -236,10 +254,6 @@ func (m *mediaDevices) selectVideo(constraints MediaTrackConstraints) (Tracker,
|
||||
typeFilter := driver.FilterVideoRecorder()
|
||||
notScreenFilter := driver.FilterNot(driver.FilterDeviceType(driver.Screen))
|
||||
filter := driver.FilterAnd(typeFilter, notScreenFilter)
|
||||
if constraints.DeviceID != "" {
|
||||
idFilter := driver.FilterID(constraints.DeviceID)
|
||||
filter = driver.FilterAnd(typeFilter, notScreenFilter, idFilter)
|
||||
}
|
||||
|
||||
d, c, err := selectBestDriver(filter, constraints)
|
||||
if err != nil {
|
||||
@@ -253,10 +267,6 @@ func (m *mediaDevices) selectScreen(constraints MediaTrackConstraints) (Tracker,
|
||||
typeFilter := driver.FilterVideoRecorder()
|
||||
screenFilter := driver.FilterDeviceType(driver.Screen)
|
||||
filter := driver.FilterAnd(typeFilter, screenFilter)
|
||||
if constraints.DeviceID != "" {
|
||||
idFilter := driver.FilterID(constraints.DeviceID)
|
||||
filter = driver.FilterAnd(typeFilter, screenFilter, idFilter)
|
||||
}
|
||||
|
||||
d, c, err := selectBestDriver(filter, constraints)
|
||||
if err != nil {
|
||||
|
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/pion/webrtc/v2/pkg/media"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/codec"
|
||||
"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/io/audio"
|
||||
@@ -32,11 +33,11 @@ func TestGetUserMedia(t *testing.T) {
|
||||
}
|
||||
md := NewMediaDevicesFromCodecs(
|
||||
map[webrtc.RTPCodecType][]*webrtc.RTPCodec{
|
||||
webrtc.RTPCodecTypeVideo: []*webrtc.RTPCodec{
|
||||
&webrtc.RTPCodec{Type: webrtc.RTPCodecTypeVideo, Name: "MockVideo", PayloadType: 1},
|
||||
webrtc.RTPCodecTypeVideo: {
|
||||
{Type: webrtc.RTPCodecTypeVideo, Name: "MockVideo", PayloadType: 1},
|
||||
},
|
||||
webrtc.RTPCodecTypeAudio: []*webrtc.RTPCodec{
|
||||
&webrtc.RTPCodec{Type: webrtc.RTPCodecTypeAudio, Name: "MockAudio", PayloadType: 2},
|
||||
webrtc.RTPCodecTypeAudio: {
|
||||
{Type: webrtc.RTPCodecTypeAudio, Name: "MockAudio", PayloadType: 2},
|
||||
},
|
||||
},
|
||||
WithTrackGenerator(
|
||||
@@ -50,8 +51,8 @@ func TestGetUserMedia(t *testing.T) {
|
||||
constraints := MediaStreamConstraints{
|
||||
Video: func(c *MediaTrackConstraints) {
|
||||
c.Enabled = true
|
||||
c.Width = 640
|
||||
c.Height = 480
|
||||
c.Width = prop.Int(640)
|
||||
c.Height = prop.Int(480)
|
||||
params := videoParams
|
||||
c.VideoEncoderBuilders = []codec.VideoEncoderBuilder{¶ms}
|
||||
},
|
||||
@@ -64,8 +65,8 @@ func TestGetUserMedia(t *testing.T) {
|
||||
constraintsWrong := MediaStreamConstraints{
|
||||
Video: func(c *MediaTrackConstraints) {
|
||||
c.Enabled = true
|
||||
c.Width = 640
|
||||
c.Height = 480
|
||||
c.Width = prop.Int(640)
|
||||
c.Height = prop.Int(480)
|
||||
params := videoParams
|
||||
params.BitRate = 0
|
||||
c.VideoEncoderBuilders = []codec.VideoEncoderBuilder{¶ms}
|
||||
@@ -122,6 +123,9 @@ func TestGetUserMedia(t *testing.T) {
|
||||
})
|
||||
}
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
for _, track := range tracks {
|
||||
track.Stop()
|
||||
}
|
||||
}
|
||||
|
||||
type mockTrack struct {
|
||||
@@ -217,3 +221,56 @@ func (m *mockAudioCodec) Read(b []byte) (int, error) {
|
||||
return len(b), nil
|
||||
}
|
||||
func (m *mockAudioCodec) Close() error { return nil }
|
||||
|
||||
func TestSelectBestDriverConstraintsResultIsSetProperly(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")
|
||||
}
|
||||
defer driver.Close()
|
||||
|
||||
if len(driver.Properties()) == 0 {
|
||||
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
|
||||
|
||||
wantConstraints := MediaTrackConstraints{
|
||||
MediaConstraints: prop.MediaConstraints{
|
||||
VideoConstraints: prop.VideoConstraints{
|
||||
// By reducing the width from the driver by a tiny amount, this property should be chosen.
|
||||
// At the same time, we'll be able to find out if the return constraints will be properly set
|
||||
// to the best constraints.
|
||||
Width: prop.Int(expectedProp.Width - 1),
|
||||
Height: prop.Int(expectedProp.Width),
|
||||
FrameFormat: prop.FrameFormat(expectedProp.FrameFormat),
|
||||
FrameRate: prop.Float(30.0),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
@@ -14,7 +14,7 @@ type MediaStreamConstraints struct {
|
||||
|
||||
// MediaTrackConstraints represents https://w3c.github.io/mediacapture-main/#dom-mediatrackconstraints
|
||||
type MediaTrackConstraints struct {
|
||||
prop.Media
|
||||
prop.MediaConstraints
|
||||
Enabled bool
|
||||
// VideoEncoderBuilders are codec builders that are used for encoding the video
|
||||
// and later being used for sending the appropriate RTP payload type.
|
||||
@@ -34,6 +34,8 @@ type MediaTrackConstraints struct {
|
||||
// AudioTransform will be used to transform the audio that's coming from the driver.
|
||||
// So, basically it'll look like following: driver -> AudioTransform -> code
|
||||
AudioTransform audio.TransformFunc
|
||||
|
||||
selectedMedia prop.Media
|
||||
}
|
||||
|
||||
type MediaOption func(*MediaTrackConstraints)
|
||||
|
25
pkg/avfoundation/.gitignore
vendored
Normal file
25
pkg/avfoundation/.gitignore
vendored
Normal file
@@ -0,0 +1,25 @@
|
||||
#User settings
|
||||
xcuserdata/
|
||||
|
||||
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
|
||||
*.xcscmblueprint
|
||||
*.xccheckout
|
||||
|
||||
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
|
||||
build/
|
||||
DerivedData/
|
||||
*.moved-aside
|
||||
*.pbxuser
|
||||
!default.pbxuser
|
||||
*.mode1v3
|
||||
!default.mode1v3
|
||||
*.mode2v3
|
||||
!default.mode2v3
|
||||
*.perspectivev3
|
||||
!default.perspectivev3
|
||||
|
||||
## Gcc Patch
|
||||
/*.gcno
|
||||
.DS_STORE
|
||||
|
||||
Build/
|
294
pkg/avfoundation/AVFoundationBind.xcodeproj/project.pbxproj
Normal file
294
pkg/avfoundation/AVFoundationBind.xcodeproj/project.pbxproj
Normal file
@@ -0,0 +1,294 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 50;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
F0143CC12479F78E00EC29C9 /* AVFoundationBind.h in Headers */ = {isa = PBXBuildFile; fileRef = F0143CC02479F78E00EC29C9 /* AVFoundationBind.h */; };
|
||||
F0143CC32479F78E00EC29C9 /* AVFoundationBind.m in Sources */ = {isa = PBXBuildFile; fileRef = F0143CC22479F78E00EC29C9 /* AVFoundationBind.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
F0143CBD2479F78E00EC29C9 /* libAVFoundationBind.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAVFoundationBind.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
F0143CC02479F78E00EC29C9 /* AVFoundationBind.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AVFoundationBind.h; sourceTree = "<group>"; };
|
||||
F0143CC22479F78E00EC29C9 /* AVFoundationBind.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AVFoundationBind.m; sourceTree = "<group>"; };
|
||||
F0FDDA0B247E15D900A3429D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
F0143CBB2479F78E00EC29C9 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
F0143CB42479F78E00EC29C9 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F0143CBF2479F78E00EC29C9 /* AVFoundationBind */,
|
||||
F0143CBE2479F78E00EC29C9 /* Products */,
|
||||
F0FDDA0A247E15D900A3429D /* Frameworks */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F0143CBE2479F78E00EC29C9 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F0143CBD2479F78E00EC29C9 /* libAVFoundationBind.a */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F0143CBF2479F78E00EC29C9 /* AVFoundationBind */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F0143CC02479F78E00EC29C9 /* AVFoundationBind.h */,
|
||||
F0143CC22479F78E00EC29C9 /* AVFoundationBind.m */,
|
||||
);
|
||||
path = AVFoundationBind;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F0FDDA0A247E15D900A3429D /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F0FDDA0B247E15D900A3429D /* AVFoundation.framework */,
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXHeadersBuildPhase section */
|
||||
F0143CB92479F78E00EC29C9 /* Headers */ = {
|
||||
isa = PBXHeadersBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
F0143CC12479F78E00EC29C9 /* AVFoundationBind.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXHeadersBuildPhase section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
F0143CBC2479F78E00EC29C9 /* AVFoundationBind */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = F0143CC62479F78E00EC29C9 /* Build configuration list for PBXNativeTarget "AVFoundationBind" */;
|
||||
buildPhases = (
|
||||
F0143CB92479F78E00EC29C9 /* Headers */,
|
||||
F0143CBA2479F78E00EC29C9 /* Sources */,
|
||||
F0143CBB2479F78E00EC29C9 /* Frameworks */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = AVFoundationBind;
|
||||
productName = AVFoundationBind;
|
||||
productReference = F0143CBD2479F78E00EC29C9 /* libAVFoundationBind.a */;
|
||||
productType = "com.apple.product-type.library.static";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
F0143CB52479F78E00EC29C9 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 1150;
|
||||
ORGANIZATIONNAME = "Herman, Lukas";
|
||||
TargetAttributes = {
|
||||
F0143CBC2479F78E00EC29C9 = {
|
||||
CreatedOnToolsVersion = 11.5;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = F0143CB82479F78E00EC29C9 /* Build configuration list for PBXProject "AVFoundationBind" */;
|
||||
compatibilityVersion = "Xcode 9.3";
|
||||
developmentRegion = en;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
);
|
||||
mainGroup = F0143CB42479F78E00EC29C9;
|
||||
productRefGroup = F0143CBE2479F78E00EC29C9 /* Products */;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
F0143CBC2479F78E00EC29C9 /* AVFoundationBind */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
F0143CBA2479F78E00EC29C9 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
F0143CC32479F78E00EC29C9 /* AVFoundationBind.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
F0143CC42479F78E00EC29C9 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
F0143CC52479F78E00EC29C9 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MTL_FAST_MATH = YES;
|
||||
SDKROOT = macosx;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
F0143CC72479F78E00EC29C9 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
EXECUTABLE_PREFIX = lib;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SKIP_INSTALL = YES;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
F0143CC82479F78E00EC29C9 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
EXECUTABLE_PREFIX = lib;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SKIP_INSTALL = YES;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
F0143CB82479F78E00EC29C9 /* Build configuration list for PBXProject "AVFoundationBind" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
F0143CC42479F78E00EC29C9 /* Debug */,
|
||||
F0143CC52479F78E00EC29C9 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
F0143CC62479F78E00EC29C9 /* Build configuration list for PBXNativeTarget "AVFoundationBind" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
F0143CC72479F78E00EC29C9 /* Debug */,
|
||||
F0143CC82479F78E00EC29C9 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = F0143CB52479F78E00EC29C9 /* Project object */;
|
||||
}
|
7
pkg/avfoundation/AVFoundationBind.xcodeproj/project.xcworkspace/contents.xcworkspacedata
generated
Normal file
7
pkg/avfoundation/AVFoundationBind.xcodeproj/project.xcworkspace/contents.xcworkspacedata
generated
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:AVFoundationBind.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>IDEDidComputeMac32BitWarning</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>PreviewsEnabled</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
@@ -0,0 +1,67 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1150"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "F0143CBC2479F78E00EC29C9"
|
||||
BuildableName = "libAVFoundationBind.a"
|
||||
BlueprintName = "AVFoundationBind"
|
||||
ReferencedContainer = "container:AVFoundationBind.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Release"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "F0143CBC2479F78E00EC29C9"
|
||||
BuildableName = "libAVFoundationBind.a"
|
||||
BlueprintName = "AVFoundationBind"
|
||||
ReferencedContainer = "container:AVFoundationBind.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
78
pkg/avfoundation/AVFoundationBind/AVFoundationBind.h
Normal file
78
pkg/avfoundation/AVFoundationBind/AVFoundationBind.h
Normal file
@@ -0,0 +1,78 @@
|
||||
// MIT License
|
||||
//
|
||||
// Copyright (c) 2019-2020 Pion
|
||||
//
|
||||
// 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.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#define MAX_DEVICES 8
|
||||
#define MAX_PROPERTIES 64
|
||||
#define MAX_DEVICE_UID_CHARS 64
|
||||
|
||||
typedef const char* STATUS;
|
||||
static STATUS STATUS_OK = (STATUS) NULL;
|
||||
static STATUS STATUS_NULL_ARG = (STATUS) "One of the arguments was null";
|
||||
static STATUS STATUS_DEVICE_INIT_FAILED = (STATUS) "Failed to init device";
|
||||
static STATUS STATUS_UNSUPPORTED_FRAME_FORMAT = (STATUS) "Unsupported frame format";
|
||||
static STATUS STATUS_UNSUPPORTED_MEDIA_TYPE = (STATUS) "Unsupported media type";
|
||||
static STATUS STATUS_FAILED_TO_ACQUIRE_LOCK = (STATUS) "Failed to acquire a lock";
|
||||
static STATUS STATUS_UNSUPPORTED_FORMAT = (STATUS) "Unsupported device format";
|
||||
|
||||
typedef enum AVBindMediaType {
|
||||
AVBindMediaTypeVideo,
|
||||
AVBindMediaTypeAudio,
|
||||
} AVBindMediaType;
|
||||
|
||||
typedef enum AVBindFrameFormat {
|
||||
AVBindFrameFormatI420,
|
||||
AVBindFrameFormatNV21,
|
||||
AVBindFrameFormatYUY2,
|
||||
AVBindFrameFormatUYVY,
|
||||
} AVBindFrameFormat;
|
||||
|
||||
typedef void (*AVBindDataCallback)(void *userData, void *buf, int len);
|
||||
|
||||
typedef struct AVBindMediaProperty {
|
||||
// video property
|
||||
int width, height;
|
||||
AVBindFrameFormat frameFormat;
|
||||
|
||||
// audio property
|
||||
|
||||
} AVBindMediaProperty, *PAVBindMediaProperty;
|
||||
|
||||
typedef struct AVBindSession AVBindSession, *PAVBindSession;
|
||||
|
||||
typedef struct {
|
||||
char uid[MAX_DEVICE_UID_CHARS + 1];
|
||||
} AVBindDevice, *PAVBindDevice;
|
||||
|
||||
// AVBindDevices returns a list of AVBindDevices. The result array is pointing to a static
|
||||
// memory. The caller is expected to not hold on to the address for a long time and make a copy.
|
||||
// Everytime this function gets called, the array will be overwritten and the memory will be reused.
|
||||
STATUS AVBindDevices(AVBindMediaType, PAVBindDevice*, int*);
|
||||
|
||||
STATUS AVBindSessionInit(AVBindDevice, PAVBindSession*);
|
||||
STATUS AVBindSessionFree(PAVBindSession*);
|
||||
STATUS AVBindSessionOpen(PAVBindSession, AVBindMediaProperty, AVBindDataCallback, void*);
|
||||
STATUS AVBindSessionClose(PAVBindSession);
|
||||
STATUS AVBindSessionProperties(PAVBindSession, PAVBindMediaProperty*, int*);
|
350
pkg/avfoundation/AVFoundationBind/AVFoundationBind.m
Normal file
350
pkg/avfoundation/AVFoundationBind/AVFoundationBind.m
Normal file
@@ -0,0 +1,350 @@
|
||||
// MIT License
|
||||
//
|
||||
// Copyright (c) 2019-2020 Pion
|
||||
//
|
||||
// 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.
|
||||
|
||||
// Naming Convention (let "name" as an actual variable name):
|
||||
// - mName: "name" is a member of an Objective C object
|
||||
// - pName: "name" is a C pointer
|
||||
// - refName: "name" is an Objective C object reference
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <AVFoundation/AVFoundation.h>
|
||||
#import "AVFoundationBind.h"
|
||||
#include <string.h>
|
||||
|
||||
#define CHK(condition, status) \
|
||||
do { \
|
||||
if(!(condition)) { \
|
||||
retStatus = status; \
|
||||
goto cleanup; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
#define CHK_STATUS(status) \
|
||||
do { \
|
||||
if(status != STATUS_OK) { \
|
||||
retStatus = status; \
|
||||
goto cleanup; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
@interface VideoDataDelegate : NSObject<AVCaptureVideoDataOutputSampleBufferDelegate>
|
||||
|
||||
@property (readonly) AVBindDataCallback mCallback;
|
||||
@property (readonly) void *mPUserData;
|
||||
|
||||
- (void)captureOutput:(AVCaptureOutput *)captureOutput
|
||||
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
|
||||
fromConnection:(AVCaptureConnection *)connection;
|
||||
|
||||
@end
|
||||
|
||||
@implementation VideoDataDelegate
|
||||
|
||||
- (id) init: (AVBindDataCallback) callback
|
||||
withUserData: (void*) pUserData {
|
||||
self = [super init];
|
||||
_mCallback = callback;
|
||||
_mPUserData = pUserData;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)captureOutput:(AVCaptureOutput *)captureOutput
|
||||
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
|
||||
fromConnection:(AVCaptureConnection *)connection {
|
||||
if (CMSampleBufferGetNumSamples(sampleBuffer) != 1 ||
|
||||
!CMSampleBufferIsValid(sampleBuffer) ||
|
||||
!CMSampleBufferDataIsReady(sampleBuffer)) {
|
||||
return;
|
||||
}
|
||||
|
||||
CVImageBufferRef imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
|
||||
if (imageBuffer == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
imageBuffer = CVBufferRetain(imageBuffer);
|
||||
CVReturn ret =
|
||||
CVPixelBufferLockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly);
|
||||
if (ret != kCVReturnSuccess) {
|
||||
return;
|
||||
}
|
||||
|
||||
size_t heightY = CVPixelBufferGetHeightOfPlane(imageBuffer, 0);
|
||||
size_t bytesPerRowY = CVPixelBufferGetBytesPerRowOfPlane(imageBuffer, 0);
|
||||
|
||||
size_t heightUV = CVPixelBufferGetHeightOfPlane(imageBuffer, 1);
|
||||
size_t bytesPerRowUV = CVPixelBufferGetBytesPerRowOfPlane(imageBuffer, 1);
|
||||
|
||||
int len = (int)((heightY * bytesPerRowY) + (2 * heightUV * bytesPerRowUV));
|
||||
void *buf = CVPixelBufferGetBaseAddressOfPlane(imageBuffer, 0);
|
||||
_mCallback(_mPUserData, buf, len);
|
||||
|
||||
CVPixelBufferUnlockBaseAddress(imageBuffer, 0);
|
||||
CVBufferRelease(imageBuffer);
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@interface AudioDataDelegate : NSObject<AVCaptureAudioDataOutputSampleBufferDelegate>
|
||||
|
||||
@property (readonly) AVBindDataCallback mCallback;
|
||||
|
||||
- (void)captureOutput:(AVCaptureOutput *)captureOutput
|
||||
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
|
||||
fromConnection:(AVCaptureConnection *)connection;
|
||||
|
||||
@end
|
||||
|
||||
@implementation AudioDataDelegate
|
||||
|
||||
- (id) init: (AVBindDataCallback) callback {
|
||||
self = [super init];
|
||||
_mCallback = callback;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)captureOutput:(AVCaptureOutput *)captureOutput
|
||||
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
|
||||
fromConnection:(AVCaptureConnection *)connection {
|
||||
// TODO
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
STATUS frameFormatToFourCC(AVBindFrameFormat format, FourCharCode *pFourCC) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
switch (format) {
|
||||
case AVBindFrameFormatNV21:
|
||||
*pFourCC = kCVPixelFormatType_420YpCbCr8BiPlanarFullRange;
|
||||
break;
|
||||
case AVBindFrameFormatUYVY:
|
||||
*pFourCC = kCVPixelFormatType_422YpCbCr8;
|
||||
break;
|
||||
// TODO: Add the rest of frame formats
|
||||
default:
|
||||
retStatus = STATUS_UNSUPPORTED_FRAME_FORMAT;
|
||||
}
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
STATUS frameFormatFromFourCC(FourCharCode fourCC, AVBindFrameFormat *pFormat) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
switch (fourCC) {
|
||||
case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
|
||||
*pFormat = AVBindFrameFormatNV21;
|
||||
break;
|
||||
case kCVPixelFormatType_422YpCbCr8:
|
||||
*pFormat = AVBindFrameFormatUYVY;
|
||||
break;
|
||||
// TODO: Add the rest of frame formats
|
||||
default:
|
||||
retStatus = STATUS_UNSUPPORTED_FRAME_FORMAT;
|
||||
}
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
|
||||
STATUS AVBindDevices(AVBindMediaType mediaType, PAVBindDevice *ppDevices, int *pLen) {
|
||||
static AVBindDevice devices[MAX_DEVICES];
|
||||
STATUS retStatus = STATUS_OK;
|
||||
NSAutoreleasePool *refPool = [[NSAutoreleasePool alloc] init];
|
||||
CHK(mediaType == AVBindMediaTypeVideo || mediaType == AVBindMediaTypeAudio, STATUS_UNSUPPORTED_MEDIA_TYPE);
|
||||
CHK(ppDevices != NULL && pLen != NULL, STATUS_NULL_ARG);
|
||||
|
||||
PAVBindDevice pDevice;
|
||||
AVMediaType _mediaType = mediaType == AVBindMediaTypeVideo ? AVMediaTypeVideo : AVMediaTypeAudio;
|
||||
NSArray *refAllTypes = @[
|
||||
AVCaptureDeviceTypeBuiltInWideAngleCamera,
|
||||
AVCaptureDeviceTypeBuiltInMicrophone,
|
||||
AVCaptureDeviceTypeExternalUnknown
|
||||
];
|
||||
AVCaptureDeviceDiscoverySession *refSession = [AVCaptureDeviceDiscoverySession
|
||||
discoverySessionWithDeviceTypes: refAllTypes
|
||||
mediaType: _mediaType
|
||||
position: AVCaptureDevicePositionUnspecified];
|
||||
|
||||
int i = 0;
|
||||
for (AVCaptureDevice *refDevice in refSession.devices) {
|
||||
if (i >= MAX_DEVICES) {
|
||||
break;
|
||||
}
|
||||
|
||||
pDevice = devices + i;
|
||||
strncpy(pDevice->uid, refDevice.uniqueID.UTF8String, MAX_DEVICE_UID_CHARS);
|
||||
pDevice->uid[MAX_DEVICE_UID_CHARS] = '\0';
|
||||
i++;
|
||||
}
|
||||
|
||||
*ppDevices = devices;
|
||||
*pLen = i;
|
||||
|
||||
cleanup:
|
||||
[refPool drain];
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
struct AVBindSession {
|
||||
AVBindDevice device;
|
||||
AVCaptureSession *refCaptureSession;
|
||||
AVBindMediaProperty properties[MAX_PROPERTIES];
|
||||
};
|
||||
|
||||
|
||||
STATUS AVBindSessionInit(AVBindDevice device, PAVBindSession *ppSessionResult) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
CHK(ppSessionResult != NULL, STATUS_NULL_ARG);
|
||||
PAVBindSession pSession = malloc(sizeof(AVBindSession));
|
||||
pSession->device = device;
|
||||
pSession->refCaptureSession = NULL;
|
||||
*ppSessionResult = pSession;
|
||||
|
||||
cleanup:
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
STATUS AVBindSessionFree(PAVBindSession *ppSession) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
CHK(ppSession != NULL, STATUS_NULL_ARG);
|
||||
PAVBindSession pSession = *ppSession;
|
||||
if (pSession->refCaptureSession != NULL) {
|
||||
[pSession->refCaptureSession release];
|
||||
pSession->refCaptureSession = NULL;
|
||||
}
|
||||
free(pSession);
|
||||
*ppSession = NULL;
|
||||
|
||||
cleanup:
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
STATUS AVBindSessionOpen(PAVBindSession pSession,
|
||||
AVBindMediaProperty property,
|
||||
AVBindDataCallback dataCallback,
|
||||
void *pUserData) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
NSAutoreleasePool *refPool = [[NSAutoreleasePool alloc] init];
|
||||
CHK(pSession != NULL && dataCallback != NULL, STATUS_NULL_ARG);
|
||||
|
||||
AVCaptureDeviceInput *refInput;
|
||||
NSError *refErr = NULL;
|
||||
NSString *refUID = [NSString stringWithUTF8String: pSession->device.uid];
|
||||
AVCaptureDevice *refDevice = [AVCaptureDevice deviceWithUniqueID: refUID];
|
||||
|
||||
refInput = [[AVCaptureDeviceInput alloc] initWithDevice: refDevice error: &refErr];
|
||||
CHK(refErr == NULL, STATUS_DEVICE_INIT_FAILED);
|
||||
|
||||
AVCaptureSession *refCaptureSession = [[AVCaptureSession alloc] init];
|
||||
refCaptureSession.sessionPreset = AVCaptureSessionPresetMedium;
|
||||
[refCaptureSession addInput: refInput];
|
||||
|
||||
if ([refDevice hasMediaType: AVMediaTypeVideo]) {
|
||||
VideoDataDelegate *pDelegate = [[VideoDataDelegate alloc]
|
||||
init: dataCallback
|
||||
withUserData: pUserData];
|
||||
|
||||
AVCaptureVideoDataOutput *pOutput = [[AVCaptureVideoDataOutput alloc] init];
|
||||
FourCharCode fourCC;
|
||||
CHK_STATUS(frameFormatToFourCC(property.frameFormat, &fourCC));
|
||||
|
||||
pOutput.videoSettings = @{
|
||||
(id)kCVPixelBufferWidthKey: @(property.width),
|
||||
(id)kCVPixelBufferHeightKey: @(property.height),
|
||||
(id)kCVPixelBufferPixelFormatTypeKey: @(fourCC),
|
||||
};
|
||||
pOutput.alwaysDiscardsLateVideoFrames = YES;
|
||||
dispatch_queue_t queue =
|
||||
dispatch_queue_create("captureQueue", DISPATCH_QUEUE_SERIAL);
|
||||
[pOutput setSampleBufferDelegate:pDelegate queue:queue];
|
||||
[refCaptureSession addOutput: pOutput];
|
||||
} else {
|
||||
// TODO: implement audio pipeline
|
||||
}
|
||||
|
||||
pSession->refCaptureSession = [refCaptureSession retain];
|
||||
[refCaptureSession startRunning];
|
||||
|
||||
cleanup:
|
||||
[refPool drain];
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
|
||||
STATUS AVBindSessionClose(PAVBindSession pSession) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
CHK(pSession != NULL, STATUS_NULL_ARG);
|
||||
CHK(pSession->refCaptureSession != NULL, STATUS_OK);
|
||||
|
||||
[pSession->refCaptureSession stopRunning];
|
||||
[pSession->refCaptureSession release];
|
||||
pSession->refCaptureSession = NULL;
|
||||
|
||||
cleanup:
|
||||
return retStatus;
|
||||
}
|
||||
|
||||
STATUS AVBindSessionProperties(PAVBindSession pSession, PAVBindMediaProperty *ppProperties, int *pLen) {
|
||||
STATUS retStatus = STATUS_OK;
|
||||
NSAutoreleasePool *refPool = [[NSAutoreleasePool alloc] init];
|
||||
CHK(pSession != NULL && ppProperties != NULL && pLen != NULL, STATUS_NULL_ARG);
|
||||
|
||||
NSString *refDeviceUID = [NSString stringWithUTF8String: pSession->device.uid];
|
||||
AVCaptureDevice *refDevice = [AVCaptureDevice deviceWithUniqueID: refDeviceUID];
|
||||
FourCharCode fourCC;
|
||||
CMVideoFormatDescriptionRef videoFormat;
|
||||
CMVideoDimensions videoDimensions;
|
||||
|
||||
memset(pSession->properties, 0, sizeof(pSession->properties));
|
||||
PAVBindMediaProperty pProperty = pSession->properties;
|
||||
int len = 0;
|
||||
for (AVCaptureDeviceFormat *refFormat in refDevice.formats) {
|
||||
// TODO: Probably gives a warn to the user
|
||||
if (len >= MAX_PROPERTIES) {
|
||||
break;
|
||||
}
|
||||
|
||||
if ([refFormat.mediaType isEqual:AVMediaTypeVideo]) {
|
||||
fourCC = CMFormatDescriptionGetMediaSubType(refFormat.formatDescription);
|
||||
if (frameFormatFromFourCC(fourCC, &pProperty->frameFormat) != STATUS_OK) {
|
||||
continue;
|
||||
}
|
||||
|
||||
videoFormat = (CMVideoFormatDescriptionRef) refFormat.formatDescription;
|
||||
videoDimensions = CMVideoFormatDescriptionGetDimensions(videoFormat);
|
||||
pProperty->height = videoDimensions.height;
|
||||
pProperty->width = videoDimensions.width;
|
||||
} else {
|
||||
// TODO: Get audio properties
|
||||
}
|
||||
|
||||
pProperty++;
|
||||
len++;
|
||||
}
|
||||
|
||||
*ppProperties = pSession->properties;
|
||||
*pLen = len;
|
||||
|
||||
cleanup:
|
||||
|
||||
[refPool drain];
|
||||
return retStatus;
|
||||
}
|
56
pkg/avfoundation/avfoundation_callback_darwin.go
Normal file
56
pkg/avfoundation/avfoundation_callback_darwin.go
Normal file
@@ -0,0 +1,56 @@
|
||||
package avfoundation
|
||||
|
||||
// extern void onData(void*, void*, int);
|
||||
import "C"
|
||||
import (
|
||||
"sync"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
var mu sync.Mutex
|
||||
var nextID handleID
|
||||
|
||||
type dataCb func(data []byte)
|
||||
|
||||
var handles = make(map[handleID]dataCb)
|
||||
|
||||
type handleID int
|
||||
|
||||
//export onData
|
||||
func onData(userData unsafe.Pointer, buf unsafe.Pointer, length C.int) {
|
||||
data := C.GoBytes(buf, length)
|
||||
|
||||
handleNum := (*C.int)(userData)
|
||||
cb, ok := lookup(handleID(*handleNum))
|
||||
if ok {
|
||||
cb(data)
|
||||
}
|
||||
}
|
||||
|
||||
func register(fn dataCb) handleID {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
nextID++
|
||||
for handles[nextID] != nil {
|
||||
nextID++
|
||||
}
|
||||
handles[nextID] = fn
|
||||
|
||||
return nextID
|
||||
}
|
||||
|
||||
func lookup(i handleID) (cb dataCb, ok bool) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
cb, ok = handles[i]
|
||||
return
|
||||
}
|
||||
|
||||
func unregister(i handleID) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
delete(handles, i)
|
||||
}
|
217
pkg/avfoundation/avfoundation_darwin.go
Normal file
217
pkg/avfoundation/avfoundation_darwin.go
Normal file
@@ -0,0 +1,217 @@
|
||||
// Package avfoundation provides AVFoundation binding for Go
|
||||
package avfoundation
|
||||
|
||||
// #cgo CFLAGS: -x objective-c
|
||||
// #cgo LDFLAGS: -framework AVFoundation -framework Foundation -framework CoreMedia -framework CoreVideo
|
||||
// #include "AVFoundationBind/AVFoundationBind.h"
|
||||
// #include "AVFoundationBind/AVFoundationBind.m"
|
||||
// extern void onData(void*, void*, int);
|
||||
// void onDataBridge(void *userData, void *buf, int len) {
|
||||
// onData(userData, buf, len);
|
||||
// }
|
||||
import "C"
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"unsafe"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
)
|
||||
|
||||
type MediaType C.AVBindMediaType
|
||||
|
||||
const (
|
||||
Video = MediaType(C.AVBindMediaTypeVideo)
|
||||
Audio = MediaType(C.AVBindMediaTypeAudio)
|
||||
)
|
||||
|
||||
// Device represents a metadata that later can be used to retrieve back the
|
||||
// underlying device given by AVFoundation
|
||||
type Device struct {
|
||||
// UID is a unique identifier for a device
|
||||
UID string
|
||||
cDevice C.AVBindDevice
|
||||
}
|
||||
|
||||
func frameFormatToAVBind(f frame.Format) (C.AVBindFrameFormat, bool) {
|
||||
switch f {
|
||||
case frame.FormatI420:
|
||||
return C.AVBindFrameFormatI420, true
|
||||
case frame.FormatNV21:
|
||||
return C.AVBindFrameFormatNV21, true
|
||||
case frame.FormatYUY2:
|
||||
return C.AVBindFrameFormatYUY2, true
|
||||
case frame.FormatUYVY:
|
||||
return C.AVBindFrameFormatUYVY, true
|
||||
default:
|
||||
return 0, false
|
||||
}
|
||||
}
|
||||
|
||||
func frameFormatFromAVBind(f C.AVBindFrameFormat) (frame.Format, bool) {
|
||||
switch f {
|
||||
case C.AVBindFrameFormatI420:
|
||||
return frame.FormatI420, true
|
||||
case C.AVBindFrameFormatNV21:
|
||||
return frame.FormatNV21, true
|
||||
case C.AVBindFrameFormatYUY2:
|
||||
return frame.FormatYUY2, true
|
||||
case C.AVBindFrameFormatUYVY:
|
||||
return frame.FormatUYVY, true
|
||||
default:
|
||||
return "", false
|
||||
}
|
||||
}
|
||||
|
||||
// Devices uses AVFoundation to query a list of devices based on the media type
|
||||
func Devices(mediaType MediaType) ([]Device, error) {
|
||||
var cDevicesPtr C.PAVBindDevice
|
||||
var cDevicesLen C.int
|
||||
|
||||
status := C.AVBindDevices(C.AVBindMediaType(mediaType), &cDevicesPtr, &cDevicesLen)
|
||||
if status != nil {
|
||||
return nil, fmt.Errorf("%s", C.GoString(status))
|
||||
}
|
||||
|
||||
// https://github.com/golang/go/wiki/cgo#turning-c-arrays-into-go-slices
|
||||
cDevices := (*[1 << 28]C.AVBindDevice)(unsafe.Pointer(cDevicesPtr))[:cDevicesLen:cDevicesLen]
|
||||
devices := make([]Device, cDevicesLen)
|
||||
|
||||
for i := range devices {
|
||||
devices[i].UID = C.GoString(&cDevices[i].uid[0])
|
||||
devices[i].cDevice = cDevices[i]
|
||||
}
|
||||
|
||||
return devices, nil
|
||||
}
|
||||
|
||||
// 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
|
||||
id handleID
|
||||
onClose func()
|
||||
}
|
||||
|
||||
func newReadCloser(onClose func()) *ReadCloser {
|
||||
var rc ReadCloser
|
||||
rc.dataChan = make(chan []byte, 1)
|
||||
rc.onClose = onClose
|
||||
rc.id = register(rc.dataCb)
|
||||
return &rc
|
||||
}
|
||||
|
||||
func (rc *ReadCloser) dataCb(data []byte) {
|
||||
// TODO: add a policy for slow reader
|
||||
rc.dataChan <- data
|
||||
}
|
||||
|
||||
// Read reads raw data, the format is determined by the media type and property:
|
||||
// - For video, each call will return a frame.
|
||||
// - For audio, each call will return a chunk which its size configured by Latency
|
||||
func (rc *ReadCloser) Read() ([]byte, error) {
|
||||
data, ok := <-rc.dataChan
|
||||
if !ok {
|
||||
return nil, io.EOF
|
||||
}
|
||||
return data, nil
|
||||
}
|
||||
|
||||
// Close closes the capturing session, and no data will flow anymore
|
||||
func (rc *ReadCloser) Close() {
|
||||
if rc.onClose != nil {
|
||||
rc.onClose()
|
||||
}
|
||||
close(rc.dataChan)
|
||||
unregister(rc.id)
|
||||
}
|
||||
|
||||
// Session represents a capturing session.
|
||||
type Session struct {
|
||||
device Device
|
||||
cSession C.PAVBindSession
|
||||
}
|
||||
|
||||
// NewSession creates a new capturing session
|
||||
func NewSession(device Device) (*Session, error) {
|
||||
var session Session
|
||||
|
||||
status := C.AVBindSessionInit(device.cDevice, &session.cSession)
|
||||
if status != nil {
|
||||
return nil, fmt.Errorf("%s", C.GoString(status))
|
||||
}
|
||||
|
||||
session.device = device
|
||||
return &session, nil
|
||||
}
|
||||
|
||||
// Close stops capturing session and frees up resources
|
||||
func (session *Session) Close() error {
|
||||
if session.cSession == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
status := C.AVBindSessionFree(&session.cSession)
|
||||
if status != nil {
|
||||
return fmt.Errorf("%s", C.GoString(status))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Open start capturing session. As soon as it returns successfully, the data will start
|
||||
// flowing. The raw data can be retrieved by using ReadCloser's Read method.
|
||||
func (session *Session) Open(property prop.Media) (*ReadCloser, error) {
|
||||
frameFormat, ok := frameFormatToAVBind(property.FrameFormat)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("Unsupported frame format")
|
||||
}
|
||||
|
||||
cProperty := C.AVBindMediaProperty{
|
||||
width: C.int(property.Width),
|
||||
height: C.int(property.Height),
|
||||
frameFormat: frameFormat,
|
||||
}
|
||||
|
||||
rc := newReadCloser(func() {
|
||||
C.AVBindSessionClose(session.cSession)
|
||||
})
|
||||
status := C.AVBindSessionOpen(
|
||||
session.cSession,
|
||||
cProperty,
|
||||
C.AVBindDataCallback(unsafe.Pointer(C.onDataBridge)),
|
||||
unsafe.Pointer(&rc.id),
|
||||
)
|
||||
if status != nil {
|
||||
return nil, fmt.Errorf("%s", C.GoString(status))
|
||||
}
|
||||
return rc, nil
|
||||
}
|
||||
|
||||
// Properties queries a list of properties that device supports
|
||||
func (session *Session) Properties() []prop.Media {
|
||||
var cPropertiesPtr C.PAVBindMediaProperty
|
||||
var cPropertiesLen C.int
|
||||
|
||||
status := C.AVBindSessionProperties(session.cSession, &cPropertiesPtr, &cPropertiesLen)
|
||||
if status != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// https://github.com/golang/go/wiki/cgo#turning-c-arrays-into-go-slices
|
||||
cProperties := (*[1 << 28]C.AVBindMediaProperty)(unsafe.Pointer(cPropertiesPtr))[:cPropertiesLen:cPropertiesLen]
|
||||
var properties []prop.Media
|
||||
for _, cProperty := range cProperties {
|
||||
frameFormat, ok := frameFormatFromAVBind(cProperty.frameFormat)
|
||||
if ok {
|
||||
properties = append(properties, prop.Media{
|
||||
Video: prop.Video{
|
||||
Width: int(cProperty.width),
|
||||
Height: int(cProperty.height),
|
||||
FrameFormat: frameFormat,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
return properties
|
||||
}
|
@@ -1,6 +1,7 @@
|
||||
package opus
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"math"
|
||||
|
||||
@@ -9,11 +10,12 @@ import (
|
||||
"github.com/pion/mediadevices/pkg/io/audio"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
"github.com/pion/mediadevices/pkg/wave/mixer"
|
||||
)
|
||||
|
||||
type encoder struct {
|
||||
engine *opus.Encoder
|
||||
inBuff *wave.Float32Interleaved
|
||||
inBuff wave.Audio
|
||||
reader audio.Reader
|
||||
}
|
||||
|
||||
@@ -32,6 +34,10 @@ func newEncoder(r audio.Reader, p prop.Media, params Params) (codec.ReadCloser,
|
||||
params.BitRate = 32000
|
||||
}
|
||||
|
||||
if params.ChannelMixer == nil {
|
||||
params.ChannelMixer = &mixer.MonoMixer{}
|
||||
}
|
||||
|
||||
// Select the nearest supported latency
|
||||
var targetLatency float64
|
||||
// TODO: use p.Latency.Milliseconds() after Go 1.12 EOL
|
||||
@@ -47,8 +53,7 @@ func newEncoder(r audio.Reader, p prop.Media, params Params) (codec.ReadCloser,
|
||||
targetLatency = latency
|
||||
}
|
||||
|
||||
// Since audio.Reader only supports stereo mode, channels is always 2
|
||||
channels := 2
|
||||
channels := p.ChannelCount
|
||||
|
||||
engine, err := opus.NewEncoder(p.SampleRate, channels, opus.AppVoIP)
|
||||
if err != nil {
|
||||
@@ -58,47 +63,37 @@ func newEncoder(r audio.Reader, p prop.Media, params Params) (codec.ReadCloser,
|
||||
return nil, err
|
||||
}
|
||||
|
||||
inBuffSize := int(targetLatency * float64(p.SampleRate) / 1000)
|
||||
inBuff := wave.NewFloat32Interleaved(
|
||||
wave.ChunkInfo{Channels: channels, Len: inBuffSize},
|
||||
)
|
||||
inBuff.Data = inBuff.Data[:0]
|
||||
e := encoder{engine, inBuff, r}
|
||||
rMix := audio.NewChannelMixer(channels, params.ChannelMixer)
|
||||
rBuf := audio.NewBuffer(int(targetLatency * float64(p.SampleRate) / 1000))
|
||||
e := encoder{
|
||||
engine: engine,
|
||||
reader: rMix(rBuf(r)),
|
||||
}
|
||||
return &e, nil
|
||||
}
|
||||
|
||||
func (e *encoder) Read(p []byte) (n int, err error) {
|
||||
// While the buffer is not full, keep reading so that we meet the latency requirement
|
||||
nLatency := e.inBuff.ChunkInfo().Len * e.inBuff.ChunkInfo().Channels
|
||||
for len(e.inBuff.Data) < nLatency {
|
||||
buff, err := e.reader.Read()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
// TODO: convert audio format
|
||||
b, ok := buff.(*wave.Float32Interleaved)
|
||||
if !ok {
|
||||
panic("unsupported audio format")
|
||||
}
|
||||
switch {
|
||||
case b.Size.Channels == 1 && e.inBuff.ChunkInfo().Channels != 1:
|
||||
for _, d := range b.Data {
|
||||
for ch := 0; ch < e.inBuff.ChunkInfo().Channels; ch++ {
|
||||
e.inBuff.Data = append(e.inBuff.Data, d)
|
||||
}
|
||||
}
|
||||
case b.Size.Channels == e.inBuff.ChunkInfo().Channels:
|
||||
e.inBuff.Data = append(e.inBuff.Data, b.Data...)
|
||||
}
|
||||
}
|
||||
|
||||
n, err = e.engine.EncodeFloat32(e.inBuff.Data[:nLatency], p)
|
||||
func (e *encoder) Read(p []byte) (int, error) {
|
||||
buff, err := e.reader.Read()
|
||||
if err != nil {
|
||||
return n, err
|
||||
return 0, err
|
||||
}
|
||||
e.inBuff.Data = e.inBuff.Data[nLatency:]
|
||||
|
||||
return n, nil
|
||||
switch b := buff.(type) {
|
||||
case *wave.Int16Interleaved:
|
||||
n, err := e.engine.Encode(b.Data, p)
|
||||
if err != nil {
|
||||
return n, err
|
||||
}
|
||||
return n, nil
|
||||
case *wave.Float32Interleaved:
|
||||
n, err := e.engine.EncodeFloat32(b.Data, p)
|
||||
if err != nil {
|
||||
return n, err
|
||||
}
|
||||
return n, nil
|
||||
default:
|
||||
return 0, errors.New("unknown type of audio buffer")
|
||||
}
|
||||
}
|
||||
|
||||
func (e *encoder) SetBitRate(b int) error {
|
||||
|
@@ -4,12 +4,15 @@ import (
|
||||
"github.com/pion/mediadevices/pkg/codec"
|
||||
"github.com/pion/mediadevices/pkg/io/audio"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
"github.com/pion/mediadevices/pkg/wave/mixer"
|
||||
"github.com/pion/webrtc/v2"
|
||||
)
|
||||
|
||||
// Params stores opus specific encoding parameters.
|
||||
type Params struct {
|
||||
codec.BaseParams
|
||||
// ChannelMixer is a mixer to be used if number of given and expected channels differ.
|
||||
ChannelMixer mixer.ChannelMixer
|
||||
}
|
||||
|
||||
// NewParams returns default opus codec specific parameters.
|
||||
|
71
pkg/driver/camera/camera_darwin.go
Normal file
71
pkg/driver/camera/camera_darwin.go
Normal file
@@ -0,0 +1,71 @@
|
||||
package camera
|
||||
|
||||
import (
|
||||
"image"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/avfoundation"
|
||||
"github.com/pion/mediadevices/pkg/driver"
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
"github.com/pion/mediadevices/pkg/io/video"
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
)
|
||||
|
||||
type camera struct {
|
||||
device avfoundation.Device
|
||||
session *avfoundation.Session
|
||||
}
|
||||
|
||||
func init() {
|
||||
devices, err := avfoundation.Devices(avfoundation.Video)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
for _, device := range devices {
|
||||
cam := newCamera(device)
|
||||
driver.GetManager().Register(cam, driver.Info{
|
||||
Label: device.UID,
|
||||
DeviceType: driver.Camera,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func newCamera(device avfoundation.Device) *camera {
|
||||
return &camera{
|
||||
device: device,
|
||||
}
|
||||
}
|
||||
|
||||
func (cam *camera) Open() error {
|
||||
var err error
|
||||
cam.session, err = avfoundation.NewSession(cam.device)
|
||||
return err
|
||||
}
|
||||
|
||||
func (cam *camera) Close() error {
|
||||
return cam.session.Close()
|
||||
}
|
||||
|
||||
func (cam *camera) VideoRecord(property prop.Media) (video.Reader, error) {
|
||||
decoder, err := frame.NewDecoder(property.FrameFormat)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rc, err := cam.session.Open(property)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
r := video.ReaderFunc(func() (image.Image, error) {
|
||||
frame, err := rc.Read()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return decoder.Decode(frame, property.Width, property.Height)
|
||||
})
|
||||
return r, nil
|
||||
}
|
||||
|
||||
func (cam *camera) Properties() []prop.Media {
|
||||
return cam.session.Properties()
|
||||
}
|
@@ -57,10 +57,11 @@ func init() {
|
||||
|
||||
func newCamera(path string) *camera {
|
||||
formats := map[webcam.PixelFormat]frame.Format{
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_YUYV): frame.FormatYUYV,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_UYVY): frame.FormatUYVY,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_NV12): frame.FormatNV21,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_MJPEG): frame.FormatMJPEG,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_YUV420): frame.FormatI420,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_YUYV): frame.FormatYUYV,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_UYVY): frame.FormatUYVY,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_NV12): frame.FormatNV21,
|
||||
webcam.PixelFormat(C.V4L2_PIX_FMT_MJPEG): frame.FormatMJPEG,
|
||||
}
|
||||
|
||||
reversedFormats := make(map[frame.Format]webcam.PixelFormat)
|
||||
|
@@ -14,7 +14,7 @@ import (
|
||||
type microphone struct {
|
||||
c *pulse.Client
|
||||
id string
|
||||
samplesChan chan<- []float32
|
||||
samplesChan chan<- []int16
|
||||
}
|
||||
|
||||
func init() {
|
||||
@@ -85,14 +85,14 @@ func (m *microphone) AudioRecord(p prop.Media) (audio.Reader, error) {
|
||||
pulse.RecordSource(src),
|
||||
)
|
||||
|
||||
samplesChan := make(chan []float32, 1)
|
||||
samplesChan := make(chan []int16, 1)
|
||||
|
||||
handler := func(b []float32) (int, error) {
|
||||
handler := func(b []int16) (int, error) {
|
||||
samplesChan <- b
|
||||
return len(b), nil
|
||||
}
|
||||
|
||||
stream, err := m.c.NewRecord(pulse.Float32Writer(handler), options...)
|
||||
stream, err := m.c.NewRecord(pulse.Int16Writer(handler), options...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -104,7 +104,7 @@ func (m *microphone) AudioRecord(p prop.Media) (audio.Reader, error) {
|
||||
return nil, io.EOF
|
||||
}
|
||||
|
||||
a := wave.NewFloat32Interleaved(
|
||||
a := wave.NewInt16Interleaved(
|
||||
wave.ChunkInfo{
|
||||
Channels: p.ChannelCount,
|
||||
Len: len(buff) / p.ChannelCount,
|
||||
|
@@ -214,7 +214,7 @@ func (m *microphone) AudioRecord(p prop.Media) (audio.Reader, error) {
|
||||
}
|
||||
}
|
||||
|
||||
a := wave.NewFloat32Interleaved(
|
||||
a := wave.NewInt16Interleaved(
|
||||
wave.ChunkInfo{
|
||||
Channels: p.ChannelCount,
|
||||
Len: (int(b.waveHdr.dwBytesRecorded) / 2) / p.ChannelCount,
|
||||
@@ -224,7 +224,7 @@ func (m *microphone) AudioRecord(p prop.Media) (audio.Reader, error) {
|
||||
j := 0
|
||||
for i := 0; i < a.Size.Len; i++ {
|
||||
for ch := 0; ch < a.Size.Channels; ch++ {
|
||||
a.SetFloat32(i, ch, wave.Float32Sample(float32(b.data[j])/0x8000))
|
||||
a.SetInt16(i, ch, wave.Int16Sample(b.data[j]))
|
||||
j++
|
||||
}
|
||||
}
|
||||
|
@@ -71,7 +71,11 @@ func (w *adapterWrapper) Properties() []prop.Media {
|
||||
return nil
|
||||
}
|
||||
|
||||
return w.Adapter.Properties()
|
||||
p := w.Adapter.Properties()
|
||||
for i := range p {
|
||||
p[i].DeviceID = w.id
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
func (w *adapterWrapper) VideoRecord(p prop.Media) (r video.Reader, err error) {
|
||||
|
@@ -3,8 +3,6 @@ package frame
|
||||
type Format string
|
||||
|
||||
const (
|
||||
// YUV Formats
|
||||
|
||||
// FormatI420 https://www.fourcc.org/pixel-format/yuv-i420/
|
||||
FormatI420 Format = "I420"
|
||||
// FormatI444 is a YUV format without sub-sampling
|
||||
@@ -16,18 +14,11 @@ const (
|
||||
// FormatUYVY https://www.fourcc.org/pixel-format/yuv-uyvy/
|
||||
FormatUYVY = "UYVY"
|
||||
|
||||
// RGB Formats
|
||||
|
||||
// FormatRGBA https://www.fourcc.org/pixel-format/rgb-rgba/
|
||||
FormatRGBA Format = "RGBA"
|
||||
|
||||
// Compressed Formats
|
||||
|
||||
// FormatMJPEG https://www.fourcc.org/mjpg/
|
||||
FormatMJPEG = "MJPEG"
|
||||
)
|
||||
|
||||
// YUV aliases
|
||||
|
||||
// FormatYUYV is an alias of FormatYUY2
|
||||
const FormatYUYV = FormatYUY2
|
||||
|
@@ -5,7 +5,7 @@ import (
|
||||
)
|
||||
|
||||
func NewDecoder(f Format) (Decoder, error) {
|
||||
var decoder DecoderFunc
|
||||
var decoder decoderFunc
|
||||
|
||||
switch f {
|
||||
case FormatI420:
|
||||
|
@@ -7,8 +7,8 @@ type Decoder interface {
|
||||
}
|
||||
|
||||
// DecoderFunc is a proxy type for Decoder
|
||||
type DecoderFunc func(frame []byte, width, height int) (image.Image, error)
|
||||
type decoderFunc func(frame []byte, width, height int) (image.Image, error)
|
||||
|
||||
func (f DecoderFunc) Decode(frame []byte, width, height int) (image.Image, error) {
|
||||
func (f decoderFunc) Decode(frame []byte, width, height int) (image.Image, error) {
|
||||
return f(frame, width, height)
|
||||
}
|
||||
|
@@ -1,89 +0,0 @@
|
||||
package audio
|
||||
|
||||
import (
|
||||
"io"
|
||||
|
||||
"github.com/faiface/beep"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
)
|
||||
|
||||
type beepStreamer struct {
|
||||
err error
|
||||
r Reader
|
||||
}
|
||||
|
||||
func ToBeep(r Reader) beep.Streamer {
|
||||
if r == nil {
|
||||
panic("FromReader requires a non-nil Reader")
|
||||
}
|
||||
|
||||
return &beepStreamer{r: r}
|
||||
}
|
||||
|
||||
func (b *beepStreamer) Stream(samples [][2]float64) (int, bool) {
|
||||
// Since there was an error, the stream has to be drained
|
||||
if b.err != nil {
|
||||
return 0, false
|
||||
}
|
||||
|
||||
d, err := b.r.Read()
|
||||
if err != nil {
|
||||
b.err = err
|
||||
if err != io.EOF {
|
||||
return 0, false
|
||||
}
|
||||
}
|
||||
|
||||
n := d.ChunkInfo().Len
|
||||
for i := 0; i < n; i++ {
|
||||
samples[i][0] = float64(wave.Float32SampleFormat.Convert(d.At(i, 0)).(wave.Float32Sample))
|
||||
samples[i][1] = float64(wave.Float32SampleFormat.Convert(d.At(i, 1)).(wave.Float32Sample))
|
||||
}
|
||||
|
||||
return n, true
|
||||
}
|
||||
|
||||
func (b *beepStreamer) Err() error {
|
||||
return b.err
|
||||
}
|
||||
|
||||
type beepReader struct {
|
||||
s beep.Streamer
|
||||
buff [][2]float64
|
||||
size int
|
||||
}
|
||||
|
||||
func FromBeep(s beep.Streamer) Reader {
|
||||
if s == nil {
|
||||
panic("FromStreamer requires a non-nil beep.Streamer")
|
||||
}
|
||||
|
||||
return &beepReader{
|
||||
s: s,
|
||||
buff: make([][2]float64, 1024), // TODO: configure chunk size
|
||||
}
|
||||
}
|
||||
|
||||
func (r *beepReader) Read() (wave.Audio, error) {
|
||||
out := wave.NewFloat32Interleaved(
|
||||
wave.ChunkInfo{Len: len(r.buff), Channels: 2, SamplingRate: 48000},
|
||||
)
|
||||
|
||||
n, ok := r.s.Stream(r.buff)
|
||||
if !ok {
|
||||
err := r.s.Err()
|
||||
if err == nil {
|
||||
err = io.EOF
|
||||
}
|
||||
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for i := 0; i < n; i++ {
|
||||
out.SetFloat32(i, 0, wave.Float32Sample(r.buff[i][0]))
|
||||
out.SetFloat32(i, 1, wave.Float32Sample(r.buff[i][1]))
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
89
pkg/io/audio/buffer.go
Normal file
89
pkg/io/audio/buffer.go
Normal file
@@ -0,0 +1,89 @@
|
||||
package audio
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
)
|
||||
|
||||
var errUnsupported = errors.New("unsupported audio format")
|
||||
|
||||
// NewBuffer creates audio transform to buffer signal to have exact nSample samples.
|
||||
func NewBuffer(nSamples int) TransformFunc {
|
||||
var inBuff wave.Audio
|
||||
|
||||
return func(r Reader) Reader {
|
||||
return ReaderFunc(func() (wave.Audio, error) {
|
||||
for {
|
||||
if inBuff != nil && inBuff.ChunkInfo().Len >= nSamples {
|
||||
break
|
||||
}
|
||||
|
||||
buff, err := r.Read()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
switch b := buff.(type) {
|
||||
case *wave.Float32Interleaved:
|
||||
ib, ok := inBuff.(*wave.Float32Interleaved)
|
||||
if !ok || ib.Size.Channels != b.Size.Channels {
|
||||
ib = wave.NewFloat32Interleaved(
|
||||
wave.ChunkInfo{
|
||||
SamplingRate: b.Size.SamplingRate,
|
||||
Channels: b.Size.Channels,
|
||||
Len: nSamples,
|
||||
},
|
||||
)
|
||||
ib.Data = ib.Data[:0]
|
||||
ib.Size.Len = 0
|
||||
inBuff = ib
|
||||
}
|
||||
ib.Data = append(ib.Data, b.Data...)
|
||||
ib.Size.Len += b.Size.Len
|
||||
|
||||
case *wave.Int16Interleaved:
|
||||
ib, ok := inBuff.(*wave.Int16Interleaved)
|
||||
if !ok || ib.Size.Channels != b.Size.Channels {
|
||||
ib = wave.NewInt16Interleaved(
|
||||
wave.ChunkInfo{
|
||||
SamplingRate: b.Size.SamplingRate,
|
||||
Channels: b.Size.Channels,
|
||||
Len: nSamples,
|
||||
},
|
||||
)
|
||||
ib.Data = ib.Data[:0]
|
||||
ib.Size.Len = 0
|
||||
inBuff = ib
|
||||
}
|
||||
ib.Data = append(ib.Data, b.Data...)
|
||||
ib.Size.Len += b.Size.Len
|
||||
|
||||
default:
|
||||
return nil, errUnsupported
|
||||
}
|
||||
}
|
||||
switch ib := inBuff.(type) {
|
||||
case *wave.Int16Interleaved:
|
||||
ibCopy := *ib
|
||||
ibCopy.Size.Len = nSamples
|
||||
n := nSamples * ib.Size.Channels
|
||||
ibCopy.Data = make([]int16, n)
|
||||
copy(ibCopy.Data, ib.Data)
|
||||
ib.Data = ib.Data[n:]
|
||||
ib.Size.Len -= nSamples
|
||||
return &ibCopy, nil
|
||||
|
||||
case *wave.Float32Interleaved:
|
||||
ibCopy := *ib
|
||||
ibCopy.Size.Len = nSamples
|
||||
n := nSamples * ib.Size.Channels
|
||||
ibCopy.Data = make([]float32, n)
|
||||
copy(ibCopy.Data, ib.Data)
|
||||
ib.Data = ib.Data[n:]
|
||||
ib.Size.Len -= nSamples
|
||||
return &ibCopy, nil
|
||||
}
|
||||
return nil, errUnsupported
|
||||
})
|
||||
}
|
||||
}
|
72
pkg/io/audio/buffer_test.go
Normal file
72
pkg/io/audio/buffer_test.go
Normal file
@@ -0,0 +1,72 @@
|
||||
package audio
|
||||
|
||||
import (
|
||||
"io"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
)
|
||||
|
||||
func TestBuffer(t *testing.T) {
|
||||
input := []wave.Audio{
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 1, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{1, 2},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{3, 4, 5, 6, 7, 8},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 2, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{9, 10, 11, 12},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 7, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26},
|
||||
},
|
||||
}
|
||||
expected := []wave.Audio{
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{1, 2, 3, 4, 5, 6},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{7, 8, 9, 10, 11, 12},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{13, 14, 15, 16, 17, 18},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{19, 20, 21, 22, 23, 24},
|
||||
},
|
||||
}
|
||||
|
||||
trans := NewBuffer(3)
|
||||
|
||||
var iSent int
|
||||
r := trans(ReaderFunc(func() (wave.Audio, error) {
|
||||
if iSent < len(input) {
|
||||
iSent++
|
||||
return input[iSent-1], nil
|
||||
}
|
||||
return nil, io.EOF
|
||||
}))
|
||||
|
||||
for i := 0; ; i++ {
|
||||
a, err := r.Read()
|
||||
if err != nil {
|
||||
if err == io.EOF && i >= len(expected) {
|
||||
break
|
||||
}
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !reflect.DeepEqual(expected[i], a) {
|
||||
t.Errorf("Expected wave[%d]: %v, got: %v", i, expected[i], a)
|
||||
}
|
||||
}
|
||||
}
|
40
pkg/io/audio/mixer.go
Normal file
40
pkg/io/audio/mixer.go
Normal file
@@ -0,0 +1,40 @@
|
||||
package audio
|
||||
|
||||
import (
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
"github.com/pion/mediadevices/pkg/wave/mixer"
|
||||
)
|
||||
|
||||
// NewChannelMixer creates audio transform to mix audio channels.
|
||||
func NewChannelMixer(channels int, mixer mixer.ChannelMixer) TransformFunc {
|
||||
return func(r Reader) Reader {
|
||||
return ReaderFunc(func() (wave.Audio, error) {
|
||||
buff, err := r.Read()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ci := buff.ChunkInfo()
|
||||
if ci.Channels == channels {
|
||||
return buff, nil
|
||||
}
|
||||
|
||||
ci.Channels = channels
|
||||
|
||||
var mixed wave.Audio
|
||||
switch buff.(type) {
|
||||
case *wave.Int16Interleaved:
|
||||
mixed = wave.NewInt16Interleaved(ci)
|
||||
case *wave.Int16NonInterleaved:
|
||||
mixed = wave.NewInt16NonInterleaved(ci)
|
||||
case *wave.Float32Interleaved:
|
||||
mixed = wave.NewFloat32Interleaved(ci)
|
||||
case *wave.Float32NonInterleaved:
|
||||
mixed = wave.NewFloat32NonInterleaved(ci)
|
||||
}
|
||||
if err := mixer.Mix(mixed, buff); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return mixed, nil
|
||||
})
|
||||
}
|
||||
}
|
57
pkg/io/audio/mixer_test.go
Normal file
57
pkg/io/audio/mixer_test.go
Normal file
@@ -0,0 +1,57 @@
|
||||
package audio
|
||||
|
||||
import (
|
||||
"io"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
"github.com/pion/mediadevices/pkg/wave/mixer"
|
||||
)
|
||||
|
||||
func TestMixer(t *testing.T) {
|
||||
input := []wave.Audio{
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 1, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{1, 3},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 2, SamplingRate: 1234},
|
||||
Data: []int16{2, 4, 3, 5, 4, 6},
|
||||
},
|
||||
}
|
||||
expected := []wave.Audio{
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 1, Channels: 1, SamplingRate: 1234},
|
||||
Data: []int16{2},
|
||||
},
|
||||
&wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{Len: 3, Channels: 1, SamplingRate: 1234},
|
||||
Data: []int16{3, 4, 5},
|
||||
},
|
||||
}
|
||||
|
||||
trans := NewChannelMixer(1, &mixer.MonoMixer{})
|
||||
|
||||
var iSent int
|
||||
r := trans(ReaderFunc(func() (wave.Audio, error) {
|
||||
if iSent < len(input) {
|
||||
iSent++
|
||||
return input[iSent-1], nil
|
||||
}
|
||||
return nil, io.EOF
|
||||
}))
|
||||
|
||||
for i := 0; ; i++ {
|
||||
a, err := r.Read()
|
||||
if err != nil {
|
||||
if err == io.EOF && i >= len(expected) {
|
||||
break
|
||||
}
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !reflect.DeepEqual(expected[i], a) {
|
||||
t.Errorf("Expected wave[%d]: %v, got: %v", i, expected[i], a)
|
||||
}
|
||||
}
|
||||
}
|
136
pkg/io/broadcast.go
Normal file
136
pkg/io/broadcast.go
Normal file
@@ -0,0 +1,136 @@
|
||||
package io
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
maskReading = 1 << 63
|
||||
broadcasterRingSize = 32
|
||||
// TODO: If the data source has fps greater than 30, they'll see some
|
||||
// fps fluctuation. But, 30 fps should be enough for general cases.
|
||||
broadcasterRingPollDuration = time.Millisecond * 33
|
||||
)
|
||||
|
||||
var errEmptySource = fmt.Errorf("Source can't be nil")
|
||||
|
||||
type broadcasterData struct {
|
||||
data interface{}
|
||||
count uint32
|
||||
err error
|
||||
}
|
||||
|
||||
type broadcasterRing struct {
|
||||
buffer []atomic.Value
|
||||
// reading (1 bit) + reserved (31 bits) + data count (32 bits)
|
||||
state uint64
|
||||
}
|
||||
|
||||
func newBroadcasterRing() *broadcasterRing {
|
||||
return &broadcasterRing{buffer: make([]atomic.Value, broadcasterRingSize)}
|
||||
}
|
||||
|
||||
func (ring *broadcasterRing) index(count uint32) int {
|
||||
return int(count) % len(ring.buffer)
|
||||
}
|
||||
|
||||
func (ring *broadcasterRing) acquire(count uint32) func(*broadcasterData) {
|
||||
// Reader has reached the latest data, should read from the source.
|
||||
// Only allow 1 reader to read from the source. When there are more than 1 readers,
|
||||
// the other readers will need to share the same data that the first reader gets from
|
||||
// the source.
|
||||
state := uint64(count)
|
||||
if atomic.CompareAndSwapUint64(&ring.state, state, state|maskReading) {
|
||||
return func(data *broadcasterData) {
|
||||
i := ring.index(count)
|
||||
ring.buffer[i].Store(data)
|
||||
atomic.StoreUint64(&ring.state, uint64(count+1))
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ring *broadcasterRing) get(count uint32) *broadcasterData {
|
||||
for {
|
||||
reading := uint64(count) | maskReading
|
||||
// TODO: since it's lockless, it spends a lot of resources in the scheduling.
|
||||
for atomic.LoadUint64(&ring.state) == reading {
|
||||
// Yield current goroutine to let other goroutines to run instead
|
||||
time.Sleep(broadcasterRingPollDuration)
|
||||
}
|
||||
|
||||
i := ring.index(count)
|
||||
data := ring.buffer[i].Load().(*broadcasterData)
|
||||
if data.count == count {
|
||||
return data
|
||||
}
|
||||
|
||||
count++
|
||||
}
|
||||
}
|
||||
|
||||
func (ring *broadcasterRing) lastCount() uint32 {
|
||||
// ring.state always keeps track the next count, so we need to subtract it by 1 to get the
|
||||
// last count
|
||||
return uint32(atomic.LoadUint64(&ring.state)) - 1
|
||||
}
|
||||
|
||||
// Broadcaster is a generic pull-based broadcaster. Broadcaster is unique in a sense that
|
||||
// readers can come and go at anytime, and readers don't need to close or notify broadcaster.
|
||||
type Broadcaster struct {
|
||||
source atomic.Value
|
||||
buffer *broadcasterRing
|
||||
}
|
||||
|
||||
// NewNewBroadcaster creates a new broadcaster.
|
||||
func NewBroadcaster(source Reader) *Broadcaster {
|
||||
var broadcaster Broadcaster
|
||||
broadcaster.buffer = newBroadcasterRing()
|
||||
broadcaster.ReplaceSource(source)
|
||||
|
||||
return &broadcaster
|
||||
}
|
||||
|
||||
// NewReader creates a new reader. Each reader will retrieve the same data from the source.
|
||||
// copyFn is used to copy the data from the source to individual readers. Broadcaster uses a small ring
|
||||
// buffer, this means that slow readers might miss some data if they're really late and the data is no longer
|
||||
// in the ring buffer.
|
||||
func (broadcaster *Broadcaster) NewReader(copyFn func(interface{}) interface{}) Reader {
|
||||
currentCount := broadcaster.buffer.lastCount()
|
||||
|
||||
return ReaderFunc(func() (data interface{}, err error) {
|
||||
currentCount++
|
||||
if push := broadcaster.buffer.acquire(currentCount); push != nil {
|
||||
data, err = broadcaster.source.Load().(Reader).Read()
|
||||
push(&broadcasterData{
|
||||
data: data,
|
||||
err: err,
|
||||
count: currentCount,
|
||||
})
|
||||
} else {
|
||||
ringData := broadcaster.buffer.get(currentCount)
|
||||
data, err, currentCount = ringData.data, ringData.err, ringData.count
|
||||
}
|
||||
|
||||
data = copyFn(data)
|
||||
return
|
||||
})
|
||||
}
|
||||
|
||||
// ReplaceSource replaces the underlying source. This operation is thread safe.
|
||||
func (broadcaster *Broadcaster) ReplaceSource(source Reader) error {
|
||||
if source == nil {
|
||||
return errEmptySource
|
||||
}
|
||||
|
||||
broadcaster.source.Store(source)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ReplaceSource retrieves the underlying source. This operation is thread safe.
|
||||
func (broadcaster *Broadcaster) Source() Reader {
|
||||
return broadcaster.source.Load().(Reader)
|
||||
}
|
@@ -4,7 +4,7 @@ package io
|
||||
// InsufficientBufferError.
|
||||
func Copy(dst, src []byte) (n int, err error) {
|
||||
if len(dst) < len(src) {
|
||||
return 0, &InsufficientBufferError{len(dst)}
|
||||
return 0, &InsufficientBufferError{len(src)}
|
||||
}
|
||||
|
||||
return copy(dst, src), nil
|
||||
|
45
pkg/io/io_test.go
Normal file
45
pkg/io/io_test.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package io
|
||||
|
||||
import (
|
||||
"log"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestCopy(t *testing.T) {
|
||||
var dst []byte
|
||||
src := make([]byte, 4)
|
||||
|
||||
n, err := Copy(dst, src)
|
||||
if err == nil {
|
||||
t.Fatal("expected err to be non-nill")
|
||||
}
|
||||
|
||||
if n != 0 {
|
||||
t.Fatalf("expected n to be 0, but got %d", n)
|
||||
}
|
||||
|
||||
e, ok := err.(*InsufficientBufferError)
|
||||
if !ok {
|
||||
t.Fatalf("expected error to be InsufficientBufferError")
|
||||
}
|
||||
|
||||
if e.RequiredSize != len(src) {
|
||||
t.Fatalf("expected required size to be %d, but got %d", len(src), e.RequiredSize)
|
||||
}
|
||||
|
||||
dst = make([]byte, 2*e.RequiredSize)
|
||||
n, err = Copy(dst, src)
|
||||
if err != nil {
|
||||
t.Fatalf("expected to not get an error after expanding the buffer")
|
||||
}
|
||||
|
||||
if n != len(src) {
|
||||
t.Fatalf("expected n to be %d, but got %d", len(src), n)
|
||||
}
|
||||
|
||||
for i := 0; i < len(src); i++ {
|
||||
if src[i] != dst[i] {
|
||||
log.Fatalf("expected value at %d to be %d, but got %d", i, src[i], dst[i])
|
||||
}
|
||||
}
|
||||
}
|
14
pkg/io/reader.go
Normal file
14
pkg/io/reader.go
Normal file
@@ -0,0 +1,14 @@
|
||||
package io
|
||||
|
||||
// Reader is a generic data reader. In the future, interface{} should be replaced by a generic type
|
||||
// to provide strong type.
|
||||
type Reader interface {
|
||||
Read() (interface{}, error)
|
||||
}
|
||||
|
||||
// ReaderFunc is a proxy type for Reader
|
||||
type ReaderFunc func() (interface{}, error)
|
||||
|
||||
func (f ReaderFunc) Read() (interface{}, error) {
|
||||
return f()
|
||||
}
|
65
pkg/io/video/broadcast.go
Normal file
65
pkg/io/video/broadcast.go
Normal file
@@ -0,0 +1,65 @@
|
||||
package video
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/io"
|
||||
)
|
||||
|
||||
var errEmptySource = fmt.Errorf("Source can't be nil")
|
||||
|
||||
// Broadcaster is a specialized video broadcaster.
|
||||
type Broadcaster struct {
|
||||
ioBroadcaster *io.Broadcaster
|
||||
}
|
||||
|
||||
// NewNewBroadcaster creates a new broadcaster.
|
||||
func NewBroadcaster(source Reader) *Broadcaster {
|
||||
broadcaster := io.NewBroadcaster(io.ReaderFunc(func() (interface{}, error) {
|
||||
return source.Read()
|
||||
}))
|
||||
|
||||
return &Broadcaster{broadcaster}
|
||||
}
|
||||
|
||||
// NewReader creates a new reader. Each reader will retrieve the same data from the source.
|
||||
// copyFn is used to copy the data from the source to individual readers. Broadcaster uses a small ring
|
||||
// buffer, this means that slow readers might miss some data if they're really late and the data is no longer
|
||||
// in the ring buffer.
|
||||
func (broadcaster *Broadcaster) NewReader(copyFrame bool) Reader {
|
||||
copyFn := func(src interface{}) interface{} { return src }
|
||||
|
||||
if copyFrame {
|
||||
buffer := NewFrameBuffer(0)
|
||||
copyFn = func(src interface{}) interface{} {
|
||||
realSrc, _ := src.(image.Image)
|
||||
buffer.StoreCopy(realSrc)
|
||||
return buffer.Load()
|
||||
}
|
||||
}
|
||||
|
||||
reader := broadcaster.ioBroadcaster.NewReader(copyFn)
|
||||
return ReaderFunc(func() (image.Image, error) {
|
||||
data, err := reader.Read()
|
||||
img, _ := data.(image.Image)
|
||||
return img, err
|
||||
})
|
||||
}
|
||||
|
||||
// ReplaceSource replaces the underlying source. This operation is thread safe.
|
||||
func (broadcaster *Broadcaster) ReplaceSource(source Reader) error {
|
||||
return broadcaster.ioBroadcaster.ReplaceSource(io.ReaderFunc(func() (interface{}, error) {
|
||||
return source.Read()
|
||||
}))
|
||||
}
|
||||
|
||||
// ReplaceSource retrieves the underlying source. This operation is thread safe.
|
||||
func (broadcaster *Broadcaster) Source() Reader {
|
||||
source := broadcaster.ioBroadcaster.Source()
|
||||
return ReaderFunc(func() (image.Image, error) {
|
||||
data, err := source.Read()
|
||||
img, _ := data.(image.Image)
|
||||
return img, err
|
||||
})
|
||||
}
|
187
pkg/io/video/broadcast_test.go
Normal file
187
pkg/io/video/broadcast_test.go
Normal file
@@ -0,0 +1,187 @@
|
||||
package video
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"runtime"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func BenchmarkBroadcast(b *testing.B) {
|
||||
var src Reader
|
||||
img := image.NewRGBA(image.Rect(0, 0, 1920, 1080))
|
||||
interval := time.NewTicker(time.Millisecond * 33) // 30 fps
|
||||
defer interval.Stop()
|
||||
src = ReaderFunc(func() (image.Image, error) {
|
||||
<-interval.C
|
||||
return img, nil
|
||||
})
|
||||
|
||||
for n := 1; n <= 4096; n *= 16 {
|
||||
n := n
|
||||
|
||||
b.Run(fmt.Sprintf("Readers-%d", n), func(b *testing.B) {
|
||||
b.SetParallelism(n)
|
||||
broadcaster := NewBroadcaster(src)
|
||||
b.RunParallel(func(pb *testing.PB) {
|
||||
reader := broadcaster.NewReader(false)
|
||||
for pb.Next() {
|
||||
reader.Read()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestBroadcast(t *testing.T) {
|
||||
// https://github.com/pion/mediadevices/issues/198
|
||||
if runtime.GOOS == "darwin" {
|
||||
t.Skip("Skipping because Darwin CI is not reliable for timing related tests.")
|
||||
}
|
||||
frames := make([]image.Image, 5*30) // 5 seconds worth of frames
|
||||
resolution := image.Rect(0, 0, 1920, 1080)
|
||||
for i := range frames {
|
||||
rgba := image.NewRGBA(resolution)
|
||||
rgba.Pix[0] = uint8(i >> 24)
|
||||
rgba.Pix[1] = uint8(i >> 16)
|
||||
rgba.Pix[2] = uint8(i >> 8)
|
||||
rgba.Pix[3] = uint8(i)
|
||||
frames[i] = rgba
|
||||
}
|
||||
|
||||
routinePauseConds := []struct {
|
||||
src bool
|
||||
dst bool
|
||||
expectedFPS float64
|
||||
expectedDrop float64
|
||||
}{
|
||||
{
|
||||
src: false,
|
||||
dst: false,
|
||||
expectedFPS: 30,
|
||||
},
|
||||
{
|
||||
src: true,
|
||||
dst: false,
|
||||
expectedFPS: 20,
|
||||
expectedDrop: 10,
|
||||
},
|
||||
{
|
||||
src: false,
|
||||
dst: true,
|
||||
expectedFPS: 20,
|
||||
expectedDrop: 10,
|
||||
},
|
||||
}
|
||||
|
||||
for _, pauseCond := range routinePauseConds {
|
||||
pauseCond := pauseCond
|
||||
t.Run(fmt.Sprintf("SrcPause-%v/DstPause-%v", pauseCond.src, pauseCond.dst), func(t *testing.T) {
|
||||
for n := 1; n <= 256; n *= 16 {
|
||||
n := n
|
||||
|
||||
t.Run(fmt.Sprintf("Readers-%d", n), func(t *testing.T) {
|
||||
var src Reader
|
||||
interval := time.NewTicker(time.Millisecond * 33) // 30 fps
|
||||
defer interval.Stop()
|
||||
frameCount := 0
|
||||
frameSent := 0
|
||||
lastSend := time.Now()
|
||||
src = ReaderFunc(func() (image.Image, error) {
|
||||
if pauseCond.src && frameSent == 30 {
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
<-interval.C
|
||||
|
||||
now := time.Now()
|
||||
if interval := now.Sub(lastSend); interval > time.Millisecond*33*3/2 {
|
||||
// Source reader should drop frames to catch up the latest frame.
|
||||
drop := int(interval/(time.Millisecond*33)) - 1
|
||||
frameCount += drop
|
||||
t.Logf("Skipped %d frames", drop)
|
||||
}
|
||||
lastSend = now
|
||||
frame := frames[frameCount]
|
||||
frameCount++
|
||||
frameSent++
|
||||
return frame, nil
|
||||
})
|
||||
broadcaster := NewBroadcaster(src)
|
||||
var done uint32
|
||||
duration := time.Second * 3
|
||||
fpsChan := make(chan []float64)
|
||||
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(n)
|
||||
for i := 0; i < n; i++ {
|
||||
go func() {
|
||||
reader := broadcaster.NewReader(false)
|
||||
count := 0
|
||||
lastFrameCount := -1
|
||||
droppedFrames := 0
|
||||
wg.Done()
|
||||
wg.Wait()
|
||||
for atomic.LoadUint32(&done) == 0 {
|
||||
if pauseCond.dst && count == 30 {
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
frame, err := reader.Read()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
rgba := frame.(*image.RGBA)
|
||||
var frameCount int
|
||||
frameCount |= int(rgba.Pix[0]) << 24
|
||||
frameCount |= int(rgba.Pix[1]) << 16
|
||||
frameCount |= int(rgba.Pix[2]) << 8
|
||||
frameCount |= int(rgba.Pix[3])
|
||||
|
||||
droppedFrames += (frameCount - lastFrameCount - 1)
|
||||
lastFrameCount = frameCount
|
||||
count++
|
||||
}
|
||||
|
||||
fps := float64(count) / duration.Seconds()
|
||||
if fps < pauseCond.expectedFPS-2 || fps > pauseCond.expectedFPS+2 {
|
||||
t.Fatal("Unexpected average FPS")
|
||||
}
|
||||
|
||||
droppedFramesPerSecond := float64(droppedFrames) / duration.Seconds()
|
||||
if droppedFramesPerSecond < pauseCond.expectedDrop-2 || droppedFramesPerSecond > pauseCond.expectedDrop+2 {
|
||||
t.Fatal("Unexpected drop count")
|
||||
}
|
||||
|
||||
fpsChan <- []float64{fps, droppedFramesPerSecond, float64(lastFrameCount)}
|
||||
}()
|
||||
}
|
||||
|
||||
time.Sleep(duration)
|
||||
atomic.StoreUint32(&done, 1)
|
||||
|
||||
var fpsAvg float64
|
||||
var droppedFramesPerSecondAvg float64
|
||||
var lastFrameCountAvg float64
|
||||
var count int
|
||||
for metric := range fpsChan {
|
||||
fps, droppedFramesPerSecond, lastFrameCount := metric[0], metric[1], metric[2]
|
||||
fpsAvg += fps
|
||||
droppedFramesPerSecondAvg += droppedFramesPerSecond
|
||||
lastFrameCountAvg += lastFrameCount
|
||||
count++
|
||||
if count == n {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
t.Log("Average FPS :", fpsAvg/float64(n))
|
||||
t.Log("Average dropped frames per second:", droppedFramesPerSecondAvg/float64(n))
|
||||
t.Log("Last frame count (src) :", frameCount)
|
||||
t.Log("Average last frame count (dst) :", lastFrameCountAvg/float64(n))
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
58
pkg/io/video/detect.go
Normal file
58
pkg/io/video/detect.go
Normal file
@@ -0,0 +1,58 @@
|
||||
package video
|
||||
|
||||
import (
|
||||
"image"
|
||||
"time"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
)
|
||||
|
||||
// DetectChanges will detect frame and video property changes. For video property detection,
|
||||
// since it's time related, interval will be used to determine the sample rate.
|
||||
func DetectChanges(interval time.Duration, onChange func(prop.Media)) TransformFunc {
|
||||
return func(r Reader) Reader {
|
||||
var currentProp prop.Media
|
||||
var lastTaken time.Time
|
||||
var frames uint
|
||||
return ReaderFunc(func() (image.Image, error) {
|
||||
var dirty bool
|
||||
|
||||
img, err := r.Read()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
bounds := img.Bounds()
|
||||
if currentProp.Width != bounds.Dx() {
|
||||
currentProp.Width = bounds.Dx()
|
||||
dirty = true
|
||||
}
|
||||
|
||||
if currentProp.Height != bounds.Dy() {
|
||||
currentProp.Height = bounds.Dy()
|
||||
dirty = true
|
||||
}
|
||||
|
||||
// TODO: maybe detect frame format? It probably doesn't make sense since some
|
||||
// formats only are about memory layout, e.g. YUV2 vs NV12.
|
||||
|
||||
now := time.Now()
|
||||
elapsed := now.Sub(lastTaken)
|
||||
if elapsed >= interval {
|
||||
fps := float32(float64(frames) / elapsed.Seconds())
|
||||
// TODO: maybe add some epsilon so that small changes will not mark as dirty
|
||||
currentProp.FrameRate = fps
|
||||
frames = 0
|
||||
lastTaken = now
|
||||
dirty = true
|
||||
}
|
||||
|
||||
if dirty {
|
||||
onChange(currentProp)
|
||||
}
|
||||
|
||||
frames++
|
||||
return img, nil
|
||||
})
|
||||
}
|
||||
}
|
158
pkg/io/video/detect_test.go
Normal file
158
pkg/io/video/detect_test.go
Normal file
@@ -0,0 +1,158 @@
|
||||
package video
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"runtime"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/prop"
|
||||
)
|
||||
|
||||
func BenchmarkDetectChanges(b *testing.B) {
|
||||
var src Reader
|
||||
src = ReaderFunc(func() (image.Image, error) {
|
||||
return image.NewRGBA(image.Rect(0, 0, 1920, 1080)), nil
|
||||
})
|
||||
|
||||
b.Run("WithoutDetectChanges", func(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
src.Read()
|
||||
}
|
||||
})
|
||||
|
||||
ns := []int{1, 8, 64, 256}
|
||||
for _, n := range ns {
|
||||
n := n
|
||||
src := src
|
||||
b.Run(fmt.Sprintf("WithDetectChanges%d", n), func(b *testing.B) {
|
||||
for i := 0; i < n; i++ {
|
||||
src = DetectChanges(time.Microsecond, func(p prop.Media) {})(src)
|
||||
}
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
src.Read()
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestDetectChanges(t *testing.T) {
|
||||
buildSource := func(p prop.Media) (Reader, func(prop.Media)) {
|
||||
return ReaderFunc(func() (image.Image, error) {
|
||||
return image.NewRGBA(image.Rect(0, 0, p.Width, p.Height)), nil
|
||||
}), func(newProp prop.Media) {
|
||||
p = newProp
|
||||
}
|
||||
}
|
||||
|
||||
assertEq := func(t *testing.T, actual prop.Media, expected prop.Media, output image.Image, assertFrameRate bool) {
|
||||
if actual.Height != expected.Height {
|
||||
t.Fatalf("expected height from to be %d but got %d", expected.Height, actual.Height)
|
||||
}
|
||||
|
||||
if actual.Width != expected.Width {
|
||||
t.Fatalf("expected width from to be %d but got %d", expected.Width, actual.Width)
|
||||
}
|
||||
|
||||
if assertFrameRate {
|
||||
diff := actual.FrameRate - expected.FrameRate
|
||||
// TODO: reduce this eps. Darwin CI keeps failing if we use a lower value
|
||||
var eps float32 = 1.5
|
||||
if diff < -eps || diff > eps {
|
||||
t.Fatalf("expected frame rate to be %f (+-%f) but got %f", expected.FrameRate, eps, actual.FrameRate)
|
||||
}
|
||||
}
|
||||
|
||||
if output.Bounds().Dy() != expected.Height {
|
||||
t.Fatalf("expected output height from to be %d but got %d", expected.Height, output.Bounds().Dy())
|
||||
}
|
||||
|
||||
if output.Bounds().Dx() != expected.Width {
|
||||
t.Fatalf("expected output width from to be %d but got %d", expected.Width, output.Bounds().Dx())
|
||||
}
|
||||
}
|
||||
|
||||
t.Run("OnChangeCalledBeforeFirstFrame", func(t *testing.T) {
|
||||
var detectBeforeFirstFrame bool
|
||||
var expected prop.Media
|
||||
var actual prop.Media
|
||||
expected.Width = 1920
|
||||
expected.Height = 1080
|
||||
src, _ := buildSource(expected)
|
||||
src = DetectChanges(time.Second, func(p prop.Media) {
|
||||
actual = p
|
||||
detectBeforeFirstFrame = true
|
||||
})(src)
|
||||
|
||||
frame, err := src.Read()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !detectBeforeFirstFrame {
|
||||
t.Fatal("on change callback should have called before first frame")
|
||||
}
|
||||
|
||||
assertEq(t, actual, expected, frame, false)
|
||||
})
|
||||
|
||||
t.Run("DetectChangesOnEveryUpdate", func(t *testing.T) {
|
||||
var expected prop.Media
|
||||
var actual prop.Media
|
||||
expected.Width = 1920
|
||||
expected.Height = 1080
|
||||
src, update := buildSource(expected)
|
||||
src = DetectChanges(time.Second, func(p prop.Media) {
|
||||
actual = p
|
||||
})(src)
|
||||
|
||||
for width := 1920; width < 4000; width += 100 {
|
||||
for height := 1080; height < 2000; height += 100 {
|
||||
expected.Width = width
|
||||
expected.Height = height
|
||||
update(expected)
|
||||
frame, err := src.Read()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assertEq(t, actual, expected, frame, false)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("FrameRateAccuracy", func(t *testing.T) {
|
||||
// https://github.com/pion/mediadevices/issues/198
|
||||
if runtime.GOOS == "darwin" {
|
||||
t.Skip("Skipping because Darwin CI is not reliable for timing related tests.")
|
||||
}
|
||||
|
||||
var expected prop.Media
|
||||
var actual prop.Media
|
||||
var count int
|
||||
expected.Width = 1920
|
||||
expected.Height = 1080
|
||||
expected.FrameRate = 30
|
||||
src, _ := buildSource(expected)
|
||||
src = Throttle(expected.FrameRate)(src)
|
||||
src = DetectChanges(time.Second*5, func(p prop.Media) {
|
||||
actual = p
|
||||
count++
|
||||
})(src)
|
||||
|
||||
for count < 3 {
|
||||
frame, err := src.Read()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
checkFrameRate := false
|
||||
if actual.FrameRate != 0.0 {
|
||||
checkFrameRate = true
|
||||
}
|
||||
assertEq(t, actual, expected, frame, checkFrameRate)
|
||||
}
|
||||
})
|
||||
}
|
214
pkg/io/video/framebuffer.go
Normal file
214
pkg/io/video/framebuffer.go
Normal file
@@ -0,0 +1,214 @@
|
||||
package video
|
||||
|
||||
import (
|
||||
"image"
|
||||
)
|
||||
|
||||
// FrameBuffer is a buffer that can store any image format.
|
||||
type FrameBuffer struct {
|
||||
buffer []uint8
|
||||
tmp image.Image
|
||||
}
|
||||
|
||||
// NewFrameBuffer creates a new FrameBuffer instance and initialize internal buffer
|
||||
// with initialSize
|
||||
func NewFrameBuffer(initialSize int) *FrameBuffer {
|
||||
return &FrameBuffer{
|
||||
buffer: make([]uint8, initialSize),
|
||||
}
|
||||
}
|
||||
|
||||
func (buff *FrameBuffer) storeInOrder(srcs ...[]uint8) {
|
||||
var neededSize int
|
||||
|
||||
for _, src := range srcs {
|
||||
neededSize += len(src)
|
||||
}
|
||||
|
||||
if len(buff.buffer) < neededSize {
|
||||
if cap(buff.buffer) >= neededSize {
|
||||
buff.buffer = buff.buffer[:neededSize]
|
||||
} else {
|
||||
buff.buffer = make([]uint8, neededSize)
|
||||
}
|
||||
}
|
||||
|
||||
var currentLen int
|
||||
for _, src := range srcs {
|
||||
copy(buff.buffer[currentLen:], src)
|
||||
currentLen += len(src)
|
||||
}
|
||||
}
|
||||
|
||||
// Load loads the current owned image
|
||||
func (buff *FrameBuffer) Load() image.Image {
|
||||
return buff.tmp
|
||||
}
|
||||
|
||||
// StoreCopy makes a copy of src and store its copy. StoreCopy will reuse as much memory as it can
|
||||
// from the previous copies. For example, if StoreCopy is given an image that has the same resolution
|
||||
// and format from the previous call, StoreCopy will not allocate extra memory and only copy the content
|
||||
// from src to the previous buffer.
|
||||
func (buff *FrameBuffer) StoreCopy(src image.Image) {
|
||||
switch src := src.(type) {
|
||||
case *image.Alpha:
|
||||
clone, ok := buff.tmp.(*image.Alpha)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.Alpha16:
|
||||
clone, ok := buff.tmp.(*image.Alpha16)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.CMYK:
|
||||
clone, ok := buff.tmp.(*image.CMYK)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.Gray:
|
||||
clone, ok := buff.tmp.(*image.Gray)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.Gray16:
|
||||
clone, ok := buff.tmp.(*image.Gray16)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.NRGBA:
|
||||
clone, ok := buff.tmp.(*image.NRGBA)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.NRGBA64:
|
||||
clone, ok := buff.tmp.(*image.NRGBA64)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.RGBA:
|
||||
clone, ok := buff.tmp.(*image.RGBA)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.RGBA64:
|
||||
clone, ok := buff.tmp.(*image.RGBA64)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
buff.storeInOrder(src.Pix)
|
||||
clone.Pix = buff.buffer[:len(src.Pix)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.NYCbCrA:
|
||||
clone, ok := buff.tmp.(*image.NYCbCrA)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
var currentLen int
|
||||
buff.storeInOrder(src.Y, src.Cb, src.Cr, src.A)
|
||||
clone.Y = buff.buffer[currentLen : currentLen+len(src.Y) : currentLen+len(src.Y)]
|
||||
currentLen += len(src.Y)
|
||||
clone.Cb = buff.buffer[currentLen : currentLen+len(src.Cb) : currentLen+len(src.Cb)]
|
||||
currentLen += len(src.Cb)
|
||||
clone.Cr = buff.buffer[currentLen : currentLen+len(src.Cr) : currentLen+len(src.Cr)]
|
||||
currentLen += len(src.Cr)
|
||||
clone.A = buff.buffer[currentLen : currentLen+len(src.A) : currentLen+len(src.A)]
|
||||
|
||||
buff.tmp = clone
|
||||
case *image.YCbCr:
|
||||
clone, ok := buff.tmp.(*image.YCbCr)
|
||||
if ok {
|
||||
*clone = *src
|
||||
} else {
|
||||
copied := *src
|
||||
clone = &copied
|
||||
}
|
||||
|
||||
var currentLen int
|
||||
buff.storeInOrder(src.Y, src.Cb, src.Cr)
|
||||
clone.Y = buff.buffer[currentLen : currentLen+len(src.Y) : currentLen+len(src.Y)]
|
||||
currentLen += len(src.Y)
|
||||
clone.Cb = buff.buffer[currentLen : currentLen+len(src.Cb) : currentLen+len(src.Cb)]
|
||||
currentLen += len(src.Cb)
|
||||
clone.Cr = buff.buffer[currentLen : currentLen+len(src.Cr) : currentLen+len(src.Cr)]
|
||||
|
||||
buff.tmp = clone
|
||||
default:
|
||||
var converted image.RGBA
|
||||
imageToRGBA(&converted, src)
|
||||
buff.StoreCopy(&converted)
|
||||
}
|
||||
}
|
195
pkg/io/video/framebuffer_test.go
Normal file
195
pkg/io/video/framebuffer_test.go
Normal file
@@ -0,0 +1,195 @@
|
||||
package video
|
||||
|
||||
import (
|
||||
"image"
|
||||
"math/rand"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func randomize(arr []uint8) {
|
||||
for i := range arr {
|
||||
arr[i] = uint8(rand.Uint32())
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkFrameBufferCopyOptimized(b *testing.B) {
|
||||
frameBuffer := NewFrameBuffer(0)
|
||||
resolution := image.Rect(0, 0, 1920, 1080)
|
||||
src := image.NewYCbCr(resolution, image.YCbCrSubsampleRatio420)
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
frameBuffer.StoreCopy(src)
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkFrameBufferCopyNaive(b *testing.B) {
|
||||
resolution := image.Rect(0, 0, 1920, 1080)
|
||||
src := image.NewYCbCr(resolution, image.YCbCrSubsampleRatio420)
|
||||
var dst image.Image
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
clone := *src
|
||||
clone.Cb = make([]uint8, len(src.Cb))
|
||||
clone.Cr = make([]uint8, len(src.Cr))
|
||||
clone.Y = make([]uint8, len(src.Y))
|
||||
|
||||
copy(clone.Cb, src.Cb)
|
||||
copy(clone.Cr, src.Cr)
|
||||
copy(clone.Y, src.Y)
|
||||
dst = &clone
|
||||
_ = dst
|
||||
}
|
||||
}
|
||||
|
||||
func TestFrameBufferStoreCopyAndLoad(t *testing.T) {
|
||||
resolution := image.Rect(0, 0, 16, 8)
|
||||
rgbaLike := image.NewRGBA64(resolution)
|
||||
randomize(rgbaLike.Pix)
|
||||
testCases := map[string]struct {
|
||||
New func() image.Image
|
||||
Update func(image.Image)
|
||||
}{
|
||||
"Alpha": {
|
||||
New: func() image.Image {
|
||||
return (*image.Alpha)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.Alpha)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"Alpha16": {
|
||||
New: func() image.Image {
|
||||
return (*image.Alpha16)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.Alpha16)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"CMYK": {
|
||||
New: func() image.Image {
|
||||
return (*image.CMYK)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.CMYK)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"Gray": {
|
||||
New: func() image.Image {
|
||||
return (*image.Gray)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.Gray)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"Gray16": {
|
||||
New: func() image.Image {
|
||||
return (*image.Gray16)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.Gray16)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"NRGBA": {
|
||||
New: func() image.Image {
|
||||
return (*image.NRGBA)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.NRGBA)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"NRGBA64": {
|
||||
New: func() image.Image {
|
||||
return (*image.NRGBA64)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.NRGBA64)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"RGBA": {
|
||||
New: func() image.Image {
|
||||
return (*image.RGBA)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.RGBA)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"RGBA64": {
|
||||
New: func() image.Image {
|
||||
return (*image.RGBA64)(rgbaLike)
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.RGBA64)
|
||||
randomize(img.Pix)
|
||||
},
|
||||
},
|
||||
"NYCbCrA": {
|
||||
New: func() image.Image {
|
||||
img := image.NewNYCbCrA(resolution, image.YCbCrSubsampleRatio420)
|
||||
randomize(img.Y)
|
||||
randomize(img.Cb)
|
||||
randomize(img.Cr)
|
||||
randomize(img.A)
|
||||
img.CStride = 10
|
||||
img.YStride = 5
|
||||
return img
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.NYCbCrA)
|
||||
randomize(img.Y)
|
||||
randomize(img.Cb)
|
||||
randomize(img.Cr)
|
||||
randomize(img.A)
|
||||
img.CStride = 3
|
||||
img.YStride = 2
|
||||
},
|
||||
},
|
||||
"YCbCr": {
|
||||
New: func() image.Image {
|
||||
img := image.NewYCbCr(resolution, image.YCbCrSubsampleRatio420)
|
||||
randomize(img.Y)
|
||||
randomize(img.Cb)
|
||||
randomize(img.Cr)
|
||||
img.CStride = 10
|
||||
img.YStride = 5
|
||||
return img
|
||||
},
|
||||
Update: func(src image.Image) {
|
||||
img := src.(*image.YCbCr)
|
||||
randomize(img.Y)
|
||||
randomize(img.Cb)
|
||||
randomize(img.Cr)
|
||||
img.CStride = 3
|
||||
img.YStride = 2
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
frameBuffer := NewFrameBuffer(0)
|
||||
|
||||
for name, testCase := range testCases {
|
||||
// Since the test also wants to make sure that Copier can convert from 1 type to another,
|
||||
// t.Run is not ideal since it'll run the tests separately
|
||||
t.Log("Testing", name)
|
||||
|
||||
src := testCase.New()
|
||||
frameBuffer.StoreCopy(src)
|
||||
if !reflect.DeepEqual(frameBuffer.Load(), src) {
|
||||
t.Fatal("Expected the copied image to be identical with the source")
|
||||
}
|
||||
|
||||
testCase.Update(src)
|
||||
frameBuffer.StoreCopy(src)
|
||||
if !reflect.DeepEqual(frameBuffer.Load(), src) {
|
||||
t.Fatal("Expected the copied image to be identical with the source after an update in source")
|
||||
}
|
||||
}
|
||||
}
|
@@ -2,32 +2,37 @@ package video
|
||||
|
||||
import (
|
||||
"image"
|
||||
"runtime"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestThrottle(t *testing.T) {
|
||||
// https://github.com/pion/mediadevices/issues/198
|
||||
if runtime.GOOS == "darwin" {
|
||||
t.Skip("Skipping because Darwin CI is not reliable for timing related tests.")
|
||||
}
|
||||
img := image.NewRGBA(image.Rect(0, 0, 640, 480))
|
||||
|
||||
ticker := time.NewTicker(time.Millisecond)
|
||||
ticker := time.NewTicker(20 * time.Millisecond)
|
||||
defer ticker.Stop()
|
||||
|
||||
var cntPush int
|
||||
trans := Throttle(100)
|
||||
trans := Throttle(50)
|
||||
r := trans(ReaderFunc(func() (image.Image, error) {
|
||||
<-ticker.C
|
||||
cntPush++
|
||||
return img, nil
|
||||
}))
|
||||
|
||||
for i := 0; i < 50; i++ {
|
||||
for i := 0; i < 20; i++ {
|
||||
_, err := r.Read()
|
||||
if err != nil {
|
||||
t.Fatalf("Unexpected error: %v", err)
|
||||
}
|
||||
}
|
||||
cntExpected := 500
|
||||
if cntPush < cntExpected*9/10 || cntExpected*11/10 < cntPush {
|
||||
cntExpected := 20
|
||||
if cntPush < cntExpected*8/10 || cntExpected*12/10 < cntPush {
|
||||
t.Fatalf("Number of pushed images is expected to be %d, but pushed %d", cntExpected, cntPush)
|
||||
}
|
||||
t.Log(cntPush)
|
||||
|
37
pkg/prop/bool.go
Normal file
37
pkg/prop/bool.go
Normal file
@@ -0,0 +1,37 @@
|
||||
package prop
|
||||
|
||||
import "fmt"
|
||||
|
||||
// BoolConstraint is an interface to represent bool value constraint.
|
||||
type BoolConstraint interface {
|
||||
Compare(bool) (float64, bool)
|
||||
Value() bool
|
||||
}
|
||||
|
||||
// BoolExact specifies exact bool value.
|
||||
type BoolExact bool
|
||||
|
||||
// Compare implements BoolConstraint.
|
||||
func (b BoolExact) Compare(o bool) (float64, bool) {
|
||||
if bool(b) == o {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements BoolConstraint.
|
||||
func (b BoolExact) Value() bool { return bool(b) }
|
||||
|
||||
// String implements Stringify
|
||||
func (b BoolExact) String() string {
|
||||
return fmt.Sprintf("%t (exact)", b)
|
||||
}
|
||||
|
||||
// Bool specifies ideal bool value.
|
||||
type Bool BoolExact
|
||||
|
||||
// Compare implements BoolConstraint.
|
||||
func (b Bool) Compare(o bool) (float64, bool) {
|
||||
dist, _ := BoolExact(b).Compare(o)
|
||||
return dist, true
|
||||
}
|
125
pkg/prop/duration.go
Normal file
125
pkg/prop/duration.go
Normal file
@@ -0,0 +1,125 @@
|
||||
package prop
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// DurationConstraint is an interface to represent time.Duration constraint.
|
||||
type DurationConstraint interface {
|
||||
Compare(time.Duration) (float64, bool)
|
||||
Value() (time.Duration, bool)
|
||||
}
|
||||
|
||||
// Duration specifies ideal duration value.
|
||||
// Any value may be selected, but closest value takes priority.
|
||||
type Duration time.Duration
|
||||
|
||||
// Compare implements DurationConstraint.
|
||||
func (d Duration) Compare(a time.Duration) (float64, bool) {
|
||||
return math.Abs(float64(a-time.Duration(d))) / math.Max(math.Abs(float64(a)), math.Abs(float64(d))), true
|
||||
}
|
||||
|
||||
// Value implements DurationConstraint.
|
||||
func (d Duration) Value() (time.Duration, bool) { return time.Duration(d), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (d Duration) String() string {
|
||||
return fmt.Sprintf("%v (ideal)", time.Duration(d))
|
||||
}
|
||||
|
||||
// DurationExact specifies exact duration value.
|
||||
type DurationExact time.Duration
|
||||
|
||||
// Compare implements DurationConstraint.
|
||||
func (d DurationExact) Compare(a time.Duration) (float64, bool) {
|
||||
if time.Duration(d) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements DurationConstraint.
|
||||
func (d DurationExact) Value() (time.Duration, bool) { return time.Duration(d), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (d DurationExact) String() string {
|
||||
return fmt.Sprintf("%v (exact)", time.Duration(d))
|
||||
}
|
||||
|
||||
// DurationOneOf specifies list of expected duration values.
|
||||
type DurationOneOf []time.Duration
|
||||
|
||||
// Compare implements DurationConstraint.
|
||||
func (d DurationOneOf) Compare(a time.Duration) (float64, bool) {
|
||||
for _, ii := range d {
|
||||
if ii == a {
|
||||
return 0.0, true
|
||||
}
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements DurationConstraint.
|
||||
func (DurationOneOf) Value() (time.Duration, bool) { return 0, false }
|
||||
|
||||
// String implements Stringify
|
||||
func (d DurationOneOf) String() string {
|
||||
var opts []string
|
||||
for _, v := range d {
|
||||
opts = append(opts, fmt.Sprint(v))
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s (one of values)", strings.Join(opts, ","))
|
||||
}
|
||||
|
||||
// DurationRanged specifies range of expected duration value.
|
||||
// If Ideal is non-zero, closest value to Ideal takes priority.
|
||||
type DurationRanged struct {
|
||||
Min time.Duration
|
||||
Max time.Duration
|
||||
Ideal time.Duration
|
||||
}
|
||||
|
||||
// Compare implements DurationConstraint.
|
||||
func (d DurationRanged) Compare(a time.Duration) (float64, bool) {
|
||||
if d.Min != 0 && d.Min > a {
|
||||
// Out of range
|
||||
return 1.0, false
|
||||
}
|
||||
if d.Max != 0 && d.Max < a {
|
||||
// Out of range
|
||||
return 1.0, false
|
||||
}
|
||||
if d.Ideal == 0 {
|
||||
// If the value is in the range and Ideal is not specified,
|
||||
// any value is evenly acceptable.
|
||||
return 0.0, true
|
||||
}
|
||||
switch {
|
||||
case a == d.Ideal:
|
||||
return 0.0, true
|
||||
case a < d.Ideal:
|
||||
if d.Min == 0 {
|
||||
// If Min is not specified, smaller values than Ideal are even.
|
||||
return 0.0, true
|
||||
}
|
||||
return float64(d.Ideal-a) / float64(d.Ideal-d.Min), true
|
||||
default:
|
||||
if d.Max == 0 {
|
||||
// If Max is not specified, larger values than Ideal are even.
|
||||
return 0.0, true
|
||||
}
|
||||
return float64(a-d.Ideal) / float64(d.Max-d.Ideal), true
|
||||
}
|
||||
}
|
||||
|
||||
// Value implements DurationConstraint.
|
||||
func (DurationRanged) Value() (time.Duration, bool) { return 0, false }
|
||||
|
||||
// String implements Stringify
|
||||
func (d DurationRanged) String() string {
|
||||
return fmt.Sprintf("%s - %s (range), %s (ideal)", d.Min, d.Max, d.Ideal)
|
||||
}
|
124
pkg/prop/float.go
Normal file
124
pkg/prop/float.go
Normal file
@@ -0,0 +1,124 @@
|
||||
package prop
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// FloatConstraint is an interface to represent float value constraint.
|
||||
type FloatConstraint interface {
|
||||
Compare(float32) (float64, bool)
|
||||
Value() (float32, bool)
|
||||
}
|
||||
|
||||
// Float specifies ideal float value.
|
||||
// Any value may be selected, but closest value takes priority.
|
||||
type Float float32
|
||||
|
||||
// Compare implements FloatConstraint.
|
||||
func (f Float) Compare(a float32) (float64, bool) {
|
||||
return math.Abs(float64(a-float32(f))) / math.Max(math.Abs(float64(a)), math.Abs(float64(f))), true
|
||||
}
|
||||
|
||||
// Value implements FloatConstraint.
|
||||
func (f Float) Value() (float32, bool) { return float32(f), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (f Float) String() string {
|
||||
return fmt.Sprintf("%.2f (ideal)", f)
|
||||
}
|
||||
|
||||
// FloatExact specifies exact float value.
|
||||
type FloatExact float32
|
||||
|
||||
// Compare implements FloatConstraint.
|
||||
func (f FloatExact) Compare(a float32) (float64, bool) {
|
||||
if float32(f) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements FloatConstraint.
|
||||
func (f FloatExact) Value() (float32, bool) { return float32(f), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (f FloatExact) String() string {
|
||||
return fmt.Sprintf("%.2f (exact)", f)
|
||||
}
|
||||
|
||||
// FloatOneOf specifies list of expected float values.
|
||||
type FloatOneOf []float32
|
||||
|
||||
// Compare implements FloatConstraint.
|
||||
func (f FloatOneOf) Compare(a float32) (float64, bool) {
|
||||
for _, ff := range f {
|
||||
if ff == a {
|
||||
return 0.0, true
|
||||
}
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements FloatConstraint.
|
||||
func (FloatOneOf) Value() (float32, bool) { return 0, false }
|
||||
|
||||
// String implements Stringify
|
||||
func (f FloatOneOf) String() string {
|
||||
var opts []string
|
||||
for _, v := range f {
|
||||
opts = append(opts, fmt.Sprintf("%.2f", v))
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s (one of values)", strings.Join(opts, ","))
|
||||
}
|
||||
|
||||
// FloatRanged specifies range of expected float value.
|
||||
// If Ideal is non-zero, closest value to Ideal takes priority.
|
||||
type FloatRanged struct {
|
||||
Min float32
|
||||
Max float32
|
||||
Ideal float32
|
||||
}
|
||||
|
||||
// Compare implements FloatConstraint.
|
||||
func (f FloatRanged) Compare(a float32) (float64, bool) {
|
||||
if f.Min != 0 && f.Min > a {
|
||||
// Out of range
|
||||
return 1.0, false
|
||||
}
|
||||
if f.Max != 0 && f.Max < a {
|
||||
// Out of range
|
||||
return 1.0, false
|
||||
}
|
||||
if f.Ideal == 0 {
|
||||
// If the value is in the range and Ideal is not specified,
|
||||
// any value is evenly acceptable.
|
||||
return 0.0, true
|
||||
}
|
||||
switch {
|
||||
case a == f.Ideal:
|
||||
return 0.0, true
|
||||
case a < f.Ideal:
|
||||
if f.Min == 0 {
|
||||
// If Min is not specified, smaller values than Ideal are even.
|
||||
return 0.0, true
|
||||
}
|
||||
return float64(f.Ideal-a) / float64(f.Ideal-f.Min), true
|
||||
default:
|
||||
if f.Max == 0 {
|
||||
// If Max is not specified, larger values than Ideal are even.
|
||||
return 0.0, true
|
||||
}
|
||||
return float64(a-f.Ideal) / float64(f.Max-f.Ideal), true
|
||||
}
|
||||
}
|
||||
|
||||
// Value implements FloatConstraint.
|
||||
func (FloatRanged) Value() (float32, bool) { return 0, false }
|
||||
|
||||
// String implements Stringify
|
||||
func (f FloatRanged) String() string {
|
||||
return fmt.Sprintf("%.2f - %.2f (range), %.2f (ideal)", f.Min, f.Max, f.Ideal)
|
||||
}
|
78
pkg/prop/format.go
Normal file
78
pkg/prop/format.go
Normal file
@@ -0,0 +1,78 @@
|
||||
package prop
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// FrameFormatConstraint is an interface to represent frame format constraint.
|
||||
type FrameFormatConstraint interface {
|
||||
Compare(frame.Format) (float64, bool)
|
||||
Value() (frame.Format, bool)
|
||||
}
|
||||
|
||||
// FrameFormat specifies expected frame format.
|
||||
// Any value may be selected, but matched value takes priority.
|
||||
type FrameFormat frame.Format
|
||||
|
||||
// Compare implements FrameFormatConstraint.
|
||||
func (f FrameFormat) Compare(a frame.Format) (float64, bool) {
|
||||
if frame.Format(f) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, true
|
||||
}
|
||||
|
||||
// Value implements FrameFormatConstraint.
|
||||
func (f FrameFormat) Value() (frame.Format, bool) { return frame.Format(f), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (f FrameFormat) String() string {
|
||||
return fmt.Sprintf("%s (ideal)", frame.Format(f))
|
||||
}
|
||||
|
||||
// FrameFormatExact specifies exact frame format.
|
||||
type FrameFormatExact frame.Format
|
||||
|
||||
// Compare implements FrameFormatConstraint.
|
||||
func (f FrameFormatExact) Compare(a frame.Format) (float64, bool) {
|
||||
if frame.Format(f) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements FrameFormatConstraint.
|
||||
func (f FrameFormatExact) Value() (frame.Format, bool) { return frame.Format(f), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (f FrameFormatExact) String() string {
|
||||
return fmt.Sprintf("%s (exact)", frame.Format(f))
|
||||
}
|
||||
|
||||
// FrameFormatOneOf specifies list of expected frame format.
|
||||
type FrameFormatOneOf []frame.Format
|
||||
|
||||
// Compare implements FrameFormatConstraint.
|
||||
func (f FrameFormatOneOf) Compare(a frame.Format) (float64, bool) {
|
||||
for _, ff := range f {
|
||||
if ff == a {
|
||||
return 0.0, true
|
||||
}
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements FrameFormatConstraint.
|
||||
func (FrameFormatOneOf) Value() (frame.Format, bool) { return "", false }
|
||||
|
||||
// String implements Stringify
|
||||
func (f FrameFormatOneOf) String() string {
|
||||
var opts []string
|
||||
for _, v := range f {
|
||||
opts = append(opts, fmt.Sprint(v))
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s (one of values)", strings.Join(opts, ","))
|
||||
}
|
124
pkg/prop/int.go
Normal file
124
pkg/prop/int.go
Normal file
@@ -0,0 +1,124 @@
|
||||
package prop
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// IntConstraint is an interface to represent integer value constraint.
|
||||
type IntConstraint interface {
|
||||
Compare(int) (float64, bool)
|
||||
Value() (int, bool)
|
||||
}
|
||||
|
||||
// Int specifies ideal int value.
|
||||
// Any value may be selected, but closest value takes priority.
|
||||
type Int int
|
||||
|
||||
// Compare implements IntConstraint.
|
||||
func (i Int) Compare(a int) (float64, bool) {
|
||||
return math.Abs(float64(a-int(i))) / math.Max(math.Abs(float64(a)), math.Abs(float64(i))), true
|
||||
}
|
||||
|
||||
// Value implements IntConstraint.
|
||||
func (i Int) Value() (int, bool) { return int(i), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (i Int) String() string {
|
||||
return fmt.Sprintf("%d (ideal)", i)
|
||||
}
|
||||
|
||||
// IntExact specifies exact int value.
|
||||
type IntExact int
|
||||
|
||||
// Compare implements IntConstraint.
|
||||
func (i IntExact) Compare(a int) (float64, bool) {
|
||||
if int(i) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// String implements Stringify
|
||||
func (i IntExact) String() string {
|
||||
return fmt.Sprintf("%d (exact)", i)
|
||||
}
|
||||
|
||||
// Value implements IntConstraint.
|
||||
func (i IntExact) Value() (int, bool) { return int(i), true }
|
||||
|
||||
// IntOneOf specifies list of expected float values.
|
||||
type IntOneOf []int
|
||||
|
||||
// Compare implements IntConstraint.
|
||||
func (i IntOneOf) Compare(a int) (float64, bool) {
|
||||
for _, ii := range i {
|
||||
if ii == a {
|
||||
return 0.0, true
|
||||
}
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements IntConstraint.
|
||||
func (IntOneOf) Value() (int, bool) { return 0, false }
|
||||
|
||||
// String implements Stringify
|
||||
func (i IntOneOf) String() string {
|
||||
var opts []string
|
||||
for _, v := range i {
|
||||
opts = append(opts, fmt.Sprint(v))
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s (one of values)", strings.Join(opts, ","))
|
||||
}
|
||||
|
||||
// IntRanged specifies range of expected int value.
|
||||
// If Ideal is non-zero, closest value to Ideal takes priority.
|
||||
type IntRanged struct {
|
||||
Min int
|
||||
Max int
|
||||
Ideal int
|
||||
}
|
||||
|
||||
// Compare implements IntConstraint.
|
||||
func (i IntRanged) Compare(a int) (float64, bool) {
|
||||
if i.Min != 0 && i.Min > a {
|
||||
// Out of range
|
||||
return 1.0, false
|
||||
}
|
||||
if i.Max != 0 && i.Max < a {
|
||||
// Out of range
|
||||
return 1.0, false
|
||||
}
|
||||
if i.Ideal == 0 {
|
||||
// If the value is in the range and Ideal is not specified,
|
||||
// any value is evenly acceptable.
|
||||
return 0.0, true
|
||||
}
|
||||
switch {
|
||||
case a == i.Ideal:
|
||||
return 0.0, true
|
||||
case a < i.Ideal:
|
||||
if i.Min == 0 {
|
||||
// If Min is not specified, smaller values than Ideal are even.
|
||||
return 0.0, true
|
||||
}
|
||||
return float64(i.Ideal-a) / float64(i.Ideal-i.Min), true
|
||||
default:
|
||||
if i.Max == 0 {
|
||||
// If Max is not specified, larger values than Ideal are even.
|
||||
return 0.0, true
|
||||
}
|
||||
return float64(a-i.Ideal) / float64(i.Max-i.Ideal), true
|
||||
}
|
||||
}
|
||||
|
||||
// Value implements IntConstraint.
|
||||
func (IntRanged) Value() (int, bool) { return 0, false }
|
||||
|
||||
// String implements Stringify
|
||||
func (i IntRanged) String() string {
|
||||
return fmt.Sprintf("%d - %d (range), %d (ideal)", i.Min, i.Max, i.Ideal)
|
||||
}
|
221
pkg/prop/prop.go
221
pkg/prop/prop.go
@@ -2,22 +2,65 @@ package prop
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
)
|
||||
|
||||
// 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
|
||||
VideoConstraints
|
||||
AudioConstraints
|
||||
}
|
||||
|
||||
func (m *MediaConstraints) String() string {
|
||||
return prettifyStruct(m)
|
||||
}
|
||||
|
||||
// Media stores single set of media propaties.
|
||||
type Media struct {
|
||||
DeviceID string
|
||||
Video
|
||||
Audio
|
||||
}
|
||||
|
||||
// Merge merges all the field values from o to p, except zero values.
|
||||
func (p *Media) Merge(o Media) {
|
||||
func (m *Media) String() string {
|
||||
return prettifyStruct(m)
|
||||
}
|
||||
|
||||
func prettifyStruct(i interface{}) string {
|
||||
var rows []string
|
||||
var addRows func(int, reflect.Value)
|
||||
addRows = func(level int, obj reflect.Value) {
|
||||
typeOf := obj.Type()
|
||||
for i := 0; i < obj.NumField(); i++ {
|
||||
field := typeOf.Field(i)
|
||||
value := obj.Field(i)
|
||||
|
||||
padding := strings.Repeat(" ", level)
|
||||
if value.Kind() == reflect.Struct {
|
||||
rows = append(rows, fmt.Sprintf("%s%v:", padding, field.Name))
|
||||
addRows(level+1, value)
|
||||
} else {
|
||||
rows = append(rows, fmt.Sprintf("%s%v: %v", padding, field.Name, value))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
addRows(0, reflect.ValueOf(i).Elem())
|
||||
return strings.Join(rows, "\n")
|
||||
}
|
||||
|
||||
// setterFn is a callback function to set value from fieldB to fieldA
|
||||
type setterFn func(fieldA, fieldB reflect.Value)
|
||||
|
||||
// merge merges all the field values from o to p, except zero values. It's guaranteed that setterFn will be called
|
||||
// when fieldA and fieldB are not struct.
|
||||
func (p *Media) merge(o interface{}, set setterFn) {
|
||||
rp := reflect.ValueOf(p).Elem()
|
||||
ro := reflect.ValueOf(o)
|
||||
|
||||
@@ -29,9 +72,9 @@ func (p *Media) Merge(o Media) {
|
||||
fieldA := a.Field(i)
|
||||
fieldB := b.Field(i)
|
||||
|
||||
// if a is a struct, b is also a struct. Then,
|
||||
// if b is a struct, a is also a struct. Then,
|
||||
// we recursively merge them
|
||||
if fieldA.Kind() == reflect.Struct {
|
||||
if fieldB.Kind() == reflect.Struct {
|
||||
merge(fieldA, fieldB)
|
||||
continue
|
||||
}
|
||||
@@ -43,70 +86,168 @@ func (p *Media) Merge(o Media) {
|
||||
continue
|
||||
}
|
||||
|
||||
fieldA.Set(fieldB)
|
||||
set(fieldA, fieldB)
|
||||
}
|
||||
}
|
||||
|
||||
merge(rp, ro)
|
||||
}
|
||||
|
||||
func (p *Media) FitnessDistance(o Media) float64 {
|
||||
func (p *Media) Merge(o Media) {
|
||||
p.merge(o, func(fieldA, fieldB reflect.Value) {
|
||||
fieldA.Set(fieldB)
|
||||
})
|
||||
}
|
||||
|
||||
func (p *Media) MergeConstraints(o MediaConstraints) {
|
||||
p.merge(o, func(fieldA, fieldB reflect.Value) {
|
||||
switch c := fieldB.Interface().(type) {
|
||||
case IntConstraint:
|
||||
if v, ok := c.Value(); ok {
|
||||
fieldA.Set(reflect.ValueOf(v))
|
||||
}
|
||||
case FloatConstraint:
|
||||
if v, ok := c.Value(); ok {
|
||||
fieldA.Set(reflect.ValueOf(v))
|
||||
}
|
||||
case DurationConstraint:
|
||||
if v, ok := c.Value(); ok {
|
||||
fieldA.Set(reflect.ValueOf(v))
|
||||
}
|
||||
case FrameFormatConstraint:
|
||||
if v, ok := c.Value(); ok {
|
||||
fieldA.Set(reflect.ValueOf(v))
|
||||
}
|
||||
case StringConstraint:
|
||||
if v, ok := c.Value(); ok {
|
||||
fieldA.Set(reflect.ValueOf(v))
|
||||
}
|
||||
case BoolConstraint:
|
||||
fieldA.Set(reflect.ValueOf(c.Value()))
|
||||
default:
|
||||
panic("unsupported property type")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// FitnessDistance calculates fitness of media property and media constraints.
|
||||
// If no media satisfies given constraints, second return value will be false.
|
||||
func (p *MediaConstraints) FitnessDistance(o Media) (float64, bool) {
|
||||
cmps := comparisons{}
|
||||
cmps.add(p.DeviceID, o.DeviceID)
|
||||
cmps.add(p.Width, o.Width)
|
||||
cmps.add(p.Height, o.Height)
|
||||
cmps.add(p.FrameFormat, o.FrameFormat)
|
||||
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()
|
||||
}
|
||||
|
||||
type comparisons map[string]string
|
||||
type comparisons []struct {
|
||||
desired, actual interface{}
|
||||
}
|
||||
|
||||
func (c comparisons) add(actual, ideal interface{}) {
|
||||
c[fmt.Sprint(actual)] = fmt.Sprint(ideal)
|
||||
func (c *comparisons) add(desired, actual interface{}) {
|
||||
if desired != nil {
|
||||
*c = append(*c,
|
||||
struct{ desired, actual interface{} }{
|
||||
desired, actual,
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// fitnessDistance is an implementation for https://w3c.github.io/mediacapture-main/#dfn-fitness-distance
|
||||
func (c comparisons) fitnessDistance() float64 {
|
||||
func (c *comparisons) fitnessDistance() (float64, bool) {
|
||||
var dist float64
|
||||
|
||||
for actual, ideal := range c {
|
||||
if actual == ideal {
|
||||
continue
|
||||
}
|
||||
|
||||
actualF, err1 := strconv.ParseFloat(actual, 64)
|
||||
idealF, err2 := strconv.ParseFloat(ideal, 64)
|
||||
|
||||
switch {
|
||||
// If both of the values are numeric, we need to normalize the values to get the distance
|
||||
case err1 == nil && err2 == nil:
|
||||
dist += math.Abs(actualF-idealF) / math.Max(math.Abs(actualF), math.Abs(idealF))
|
||||
// If both of the values are not numeric, the only comparison value is either 0 (matched) or 1 (not matched)
|
||||
case err1 != nil && err2 != nil:
|
||||
if actual != ideal {
|
||||
dist++
|
||||
for _, field := range *c {
|
||||
var d float64
|
||||
var ok bool
|
||||
switch c := field.desired.(type) {
|
||||
case IntConstraint:
|
||||
if actual, typeOK := field.actual.(int); typeOK {
|
||||
d, ok = c.Compare(actual)
|
||||
} else {
|
||||
panic("wrong type of actual value")
|
||||
}
|
||||
case FloatConstraint:
|
||||
if actual, typeOK := field.actual.(float32); typeOK {
|
||||
d, ok = c.Compare(actual)
|
||||
} else {
|
||||
panic("wrong type of actual value")
|
||||
}
|
||||
case DurationConstraint:
|
||||
if actual, typeOK := field.actual.(time.Duration); typeOK {
|
||||
d, ok = c.Compare(actual)
|
||||
} else {
|
||||
panic("wrong type of actual value")
|
||||
}
|
||||
case FrameFormatConstraint:
|
||||
if actual, typeOK := field.actual.(frame.Format); typeOK {
|
||||
d, ok = c.Compare(actual)
|
||||
} else {
|
||||
panic("wrong type of actual value")
|
||||
}
|
||||
case StringConstraint:
|
||||
if actual, typeOK := field.actual.(string); typeOK {
|
||||
d, ok = c.Compare(actual)
|
||||
} else {
|
||||
panic("wrong type of actual value")
|
||||
}
|
||||
case BoolConstraint:
|
||||
if actual, typeOK := field.actual.(bool); typeOK {
|
||||
d, ok = c.Compare(actual)
|
||||
} else {
|
||||
panic("wrong type of actual value")
|
||||
}
|
||||
// Comparing a numeric value with a non-numeric value is a an internal error, so panic.
|
||||
default:
|
||||
panic("fitnessDistance can't mix comparisons.")
|
||||
panic("unsupported constraint type")
|
||||
}
|
||||
dist += d
|
||||
if !ok {
|
||||
return 0, false
|
||||
}
|
||||
}
|
||||
|
||||
return dist
|
||||
return dist, true
|
||||
}
|
||||
|
||||
// Video represents a video's properties
|
||||
// VideoConstraints represents a video's constraints
|
||||
type VideoConstraints struct {
|
||||
Width, Height IntConstraint
|
||||
FrameRate FloatConstraint
|
||||
FrameFormat FrameFormatConstraint
|
||||
}
|
||||
|
||||
// Video represents a video's constraints
|
||||
type Video struct {
|
||||
Width, Height int
|
||||
FrameRate float32
|
||||
FrameFormat frame.Format
|
||||
}
|
||||
|
||||
// Audio represents an audio's properties
|
||||
type Audio struct {
|
||||
ChannelCount int
|
||||
Latency time.Duration
|
||||
SampleRate int
|
||||
SampleSize int
|
||||
// AudioConstraints represents an audio's constraints
|
||||
type AudioConstraints struct {
|
||||
ChannelCount IntConstraint
|
||||
Latency DurationConstraint
|
||||
SampleRate IntConstraint
|
||||
SampleSize IntConstraint
|
||||
IsBigEndian BoolConstraint
|
||||
IsFloat BoolConstraint
|
||||
IsInterleaved BoolConstraint
|
||||
}
|
||||
|
||||
// Audio represents an audio's constraints
|
||||
type Audio struct {
|
||||
ChannelCount int
|
||||
Latency time.Duration
|
||||
SampleRate int
|
||||
SampleSize int
|
||||
IsBigEndian bool
|
||||
IsFloat bool
|
||||
IsInterleaved bool
|
||||
}
|
||||
|
@@ -2,8 +2,174 @@ package prop
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/frame"
|
||||
)
|
||||
|
||||
func TestCompareMatch(t *testing.T) {
|
||||
testDataSet := map[string]struct {
|
||||
a MediaConstraints
|
||||
b Media
|
||||
match bool
|
||||
}{
|
||||
"DeviceIDExactUnmatch": {
|
||||
MediaConstraints{
|
||||
DeviceID: StringExact("abc"),
|
||||
},
|
||||
Media{
|
||||
DeviceID: "cde",
|
||||
},
|
||||
false,
|
||||
},
|
||||
"DeviceIDExactMatch": {
|
||||
MediaConstraints{
|
||||
DeviceID: StringExact("abc"),
|
||||
},
|
||||
Media{
|
||||
DeviceID: "abc",
|
||||
},
|
||||
true,
|
||||
},
|
||||
"IntIdealUnmatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
Width: Int(30),
|
||||
}},
|
||||
Media{Video: Video{
|
||||
Width: 50,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"IntIdealMatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
Width: Int(30),
|
||||
}},
|
||||
Media{Video: Video{
|
||||
Width: 30,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"IntExactUnmatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
Width: IntExact(30),
|
||||
}},
|
||||
Media{Video: Video{
|
||||
Width: 50,
|
||||
}},
|
||||
false,
|
||||
},
|
||||
"IntExactMatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
Width: IntExact(30),
|
||||
}},
|
||||
Media{Video: Video{
|
||||
Width: 30,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"IntRangeUnmatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
Width: IntRanged{Min: 30, Max: 40},
|
||||
}},
|
||||
Media{Video: Video{
|
||||
Width: 50,
|
||||
}},
|
||||
false,
|
||||
},
|
||||
"IntRangeMatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
Width: IntRanged{Min: 30, Max: 40},
|
||||
}},
|
||||
Media{Video: Video{
|
||||
Width: 35,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"FrameFormatOneOfUnmatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
FrameFormat: FrameFormatOneOf{frame.FormatYUYV, frame.FormatUYVY},
|
||||
}},
|
||||
Media{Video: Video{
|
||||
FrameFormat: frame.FormatYUYV,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"FrameFormatOneOfMatch": {
|
||||
MediaConstraints{VideoConstraints: VideoConstraints{
|
||||
FrameFormat: FrameFormatOneOf{frame.FormatYUYV, frame.FormatUYVY},
|
||||
}},
|
||||
Media{Video: Video{
|
||||
FrameFormat: frame.FormatMJPEG,
|
||||
}},
|
||||
false,
|
||||
},
|
||||
"DurationExactUnmatch": {
|
||||
MediaConstraints{AudioConstraints: AudioConstraints{
|
||||
Latency: DurationExact(time.Second),
|
||||
}},
|
||||
Media{Audio: Audio{
|
||||
Latency: time.Second + time.Millisecond,
|
||||
}},
|
||||
false,
|
||||
},
|
||||
"DurationExactMatch": {
|
||||
MediaConstraints{AudioConstraints: AudioConstraints{
|
||||
Latency: DurationExact(time.Second),
|
||||
}},
|
||||
Media{Audio: Audio{
|
||||
Latency: time.Second,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"DurationRangedUnmatch": {
|
||||
MediaConstraints{AudioConstraints: AudioConstraints{
|
||||
Latency: DurationRanged{Max: time.Second},
|
||||
}},
|
||||
Media{Audio: Audio{
|
||||
Latency: time.Second + time.Millisecond,
|
||||
}},
|
||||
false,
|
||||
},
|
||||
"DurationRangedMatch": {
|
||||
MediaConstraints{AudioConstraints: AudioConstraints{
|
||||
Latency: DurationRanged{Max: time.Second},
|
||||
}},
|
||||
Media{Audio: Audio{
|
||||
Latency: time.Millisecond,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
"BoolExactUnmatch": {
|
||||
MediaConstraints{AudioConstraints: AudioConstraints{
|
||||
IsFloat: BoolExact(true),
|
||||
}},
|
||||
Media{Audio: Audio{
|
||||
IsFloat: false,
|
||||
}},
|
||||
false,
|
||||
},
|
||||
"BoolExactMatch": {
|
||||
MediaConstraints{AudioConstraints: AudioConstraints{
|
||||
IsFloat: BoolExact(true),
|
||||
}},
|
||||
Media{Audio: Audio{
|
||||
IsFloat: true,
|
||||
}},
|
||||
true,
|
||||
},
|
||||
}
|
||||
|
||||
for name, testData := range testDataSet {
|
||||
testData := testData
|
||||
t.Run(name, func(t *testing.T) {
|
||||
_, match := testData.a.FitnessDistance(testData.b)
|
||||
if match != testData.match {
|
||||
t.Errorf("matching flag differs, expected: %v, got: %v", testData.match, match)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergeWithZero(t *testing.T) {
|
||||
a := Media{
|
||||
Video: Video{
|
||||
@@ -73,3 +239,130 @@ func TestMergeNested(t *testing.T) {
|
||||
t.Error("expected a.Width to be 100, but got 0")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergeConstraintsWithZero(t *testing.T) {
|
||||
a := Media{
|
||||
Video: Video{
|
||||
Width: 30,
|
||||
},
|
||||
}
|
||||
|
||||
b := MediaConstraints{
|
||||
VideoConstraints: VideoConstraints{
|
||||
Height: Int(100),
|
||||
},
|
||||
}
|
||||
|
||||
a.MergeConstraints(b)
|
||||
|
||||
if a.Width == 0 {
|
||||
t.Error("expected a.Width to be 30, but got 0")
|
||||
}
|
||||
|
||||
if a.Height == 0 {
|
||||
t.Error("expected a.Height to be 100, but got 0")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergeConstraintsWithSameField(t *testing.T) {
|
||||
a := Media{
|
||||
Video: Video{
|
||||
Width: 30,
|
||||
},
|
||||
}
|
||||
|
||||
b := MediaConstraints{
|
||||
VideoConstraints: VideoConstraints{
|
||||
Width: Int(100),
|
||||
},
|
||||
}
|
||||
|
||||
a.MergeConstraints(b)
|
||||
|
||||
if a.Width != 100 {
|
||||
t.Error("expected a.Width to be 100, but got 0")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergeConstraintsNested(t *testing.T) {
|
||||
type constraints struct {
|
||||
Media
|
||||
}
|
||||
|
||||
a := constraints{
|
||||
Media{
|
||||
Video: Video{
|
||||
Width: 30,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
b := MediaConstraints{
|
||||
VideoConstraints: VideoConstraints{
|
||||
Width: Int(100),
|
||||
},
|
||||
}
|
||||
|
||||
a.MergeConstraints(b)
|
||||
|
||||
if a.Width != 100 {
|
||||
t.Error("expected a.Width to be 100, but got 0")
|
||||
}
|
||||
}
|
||||
|
||||
func TestString(t *testing.T) {
|
||||
t.Run("IdealValues", func(t *testing.T) {
|
||||
t.Log("\n", &MediaConstraints{
|
||||
DeviceID: String("one"),
|
||||
VideoConstraints: VideoConstraints{
|
||||
Width: Int(1920),
|
||||
FrameRate: Float(30.0),
|
||||
FrameFormat: FrameFormat(frame.FormatI420),
|
||||
},
|
||||
AudioConstraints: AudioConstraints{
|
||||
Latency: Duration(time.Millisecond * 20),
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("ExactValues", func(t *testing.T) {
|
||||
t.Log("\n", &MediaConstraints{
|
||||
DeviceID: StringExact("one"),
|
||||
VideoConstraints: VideoConstraints{
|
||||
Width: IntExact(1920),
|
||||
FrameRate: FloatExact(30.0),
|
||||
FrameFormat: FrameFormatExact(frame.FormatI420),
|
||||
},
|
||||
AudioConstraints: AudioConstraints{
|
||||
Latency: DurationExact(time.Millisecond * 20),
|
||||
IsBigEndian: BoolExact(true),
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("OneOfValues", func(t *testing.T) {
|
||||
t.Log("\n", &MediaConstraints{
|
||||
DeviceID: StringOneOf{"one", "two"},
|
||||
VideoConstraints: VideoConstraints{
|
||||
Width: IntOneOf{1920, 1080},
|
||||
FrameRate: FloatOneOf{30.0, 60.1234},
|
||||
FrameFormat: FrameFormatOneOf{frame.FormatI420, frame.FormatI444},
|
||||
},
|
||||
AudioConstraints: AudioConstraints{
|
||||
Latency: DurationOneOf{time.Millisecond * 20, time.Millisecond * 40},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("RangedValues", func(t *testing.T) {
|
||||
t.Log("\n", &MediaConstraints{
|
||||
VideoConstraints: VideoConstraints{
|
||||
Width: &IntRanged{Min: 1080, Max: 1920, Ideal: 1500},
|
||||
FrameRate: &FloatRanged{Min: 30.123, Max: 60.12321312, Ideal: 45.12312312},
|
||||
},
|
||||
AudioConstraints: AudioConstraints{
|
||||
Latency: &DurationRanged{Min: time.Millisecond * 20, Max: time.Millisecond * 40, Ideal: time.Millisecond * 30},
|
||||
},
|
||||
})
|
||||
})
|
||||
}
|
||||
|
72
pkg/prop/string.go
Normal file
72
pkg/prop/string.go
Normal file
@@ -0,0 +1,72 @@
|
||||
package prop
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// StringConstraint is an interface to represent string constraint.
|
||||
type StringConstraint interface {
|
||||
Compare(string) (float64, bool)
|
||||
Value() (string, bool)
|
||||
}
|
||||
|
||||
// String specifies expected string.
|
||||
// Any value may be selected, but matched value takes priority.
|
||||
type String string
|
||||
|
||||
// Compare implements StringConstraint.
|
||||
func (f String) Compare(a string) (float64, bool) {
|
||||
if string(f) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, true
|
||||
}
|
||||
|
||||
// Value implements StringConstraint.
|
||||
func (f String) Value() (string, bool) { return string(f), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (f String) String() string {
|
||||
return fmt.Sprintf("%s (ideal)", string(f))
|
||||
}
|
||||
|
||||
// StringExact specifies exact string.
|
||||
type StringExact string
|
||||
|
||||
// Compare implements StringConstraint.
|
||||
func (f StringExact) Compare(a string) (float64, bool) {
|
||||
if string(f) == a {
|
||||
return 0.0, true
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements StringConstraint.
|
||||
func (f StringExact) Value() (string, bool) { return string(f), true }
|
||||
|
||||
// String implements Stringify
|
||||
func (f StringExact) String() string {
|
||||
return fmt.Sprintf("%s (exact)", string(f))
|
||||
}
|
||||
|
||||
// StringOneOf specifies list of expected string.
|
||||
type StringOneOf []string
|
||||
|
||||
// Compare implements StringConstraint.
|
||||
func (f StringOneOf) Compare(a string) (float64, bool) {
|
||||
for _, ff := range f {
|
||||
if ff == a {
|
||||
return 0.0, true
|
||||
}
|
||||
}
|
||||
return 1.0, false
|
||||
}
|
||||
|
||||
// Value implements StringConstraint.
|
||||
func (StringOneOf) Value() (string, bool) { return "", false }
|
||||
|
||||
// String implements Stringify
|
||||
func (f StringOneOf) String() string {
|
||||
return fmt.Sprintf("%s (one of values)", strings.Join([]string(f), ","))
|
||||
}
|
297
pkg/wave/decoder.go
Normal file
297
pkg/wave/decoder.go
Normal file
@@ -0,0 +1,297 @@
|
||||
package wave
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"math"
|
||||
"reflect"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
// Format represents how audio is formatted in memory
|
||||
type Format fmt.Stringer
|
||||
|
||||
type RawFormat struct {
|
||||
SampleSize int
|
||||
IsFloat bool
|
||||
Interleaved bool
|
||||
}
|
||||
|
||||
func (f *RawFormat) String() string {
|
||||
sampleSizeInBits := f.SampleSize * 8
|
||||
dataTypeStr := "Int"
|
||||
if f.IsFloat {
|
||||
dataTypeStr = "Float"
|
||||
}
|
||||
interleavedStr := "NonInterleaved"
|
||||
if f.Interleaved {
|
||||
interleavedStr = "Interleaved"
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s%d%s", dataTypeStr, sampleSizeInBits, interleavedStr)
|
||||
}
|
||||
|
||||
var hostEndian binary.ByteOrder
|
||||
var registeredDecoders = map[string]Decoder{}
|
||||
|
||||
func init() {
|
||||
switch v := *(*uint16)(unsafe.Pointer(&([]byte{0x12, 0x34}[0]))); v {
|
||||
case 0x1234:
|
||||
hostEndian = binary.BigEndian
|
||||
case 0x3412:
|
||||
hostEndian = binary.LittleEndian
|
||||
default:
|
||||
panic(fmt.Sprintf("failed to determine host endianness: %x", v))
|
||||
}
|
||||
|
||||
decoderBuilders := []DecoderBuilderFunc{
|
||||
newInt16InterleavedDecoder,
|
||||
newInt16NonInterleavedDecoder,
|
||||
newFloat32InterleavedDecoder,
|
||||
newFloat32NonInterleavedDecoder,
|
||||
}
|
||||
|
||||
for _, decoderBuilder := range decoderBuilders {
|
||||
err := RegisterDecoder(decoderBuilder)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Decoder decodes raw chunk to Audio
|
||||
type Decoder interface {
|
||||
// Decode decodes raw chunk in endian byte order
|
||||
Decode(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error)
|
||||
}
|
||||
|
||||
// DecoderFunc is a proxy type for Decoder
|
||||
type DecoderFunc func(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error)
|
||||
|
||||
func (f DecoderFunc) Decode(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error) {
|
||||
return f(endian, chunk, channels)
|
||||
}
|
||||
|
||||
// DecoderBuilder builds raw audio decoder
|
||||
type DecoderBuilder interface {
|
||||
// NewDecoder creates a new decoder for specified format
|
||||
NewDecoder() (Decoder, Format)
|
||||
}
|
||||
|
||||
// DecoderBuilderFunc is a proxy type for DecoderBuilder
|
||||
type DecoderBuilderFunc func() (Decoder, Format)
|
||||
|
||||
func (builderFunc DecoderBuilderFunc) NewDecoder() (Decoder, Format) {
|
||||
return builderFunc()
|
||||
}
|
||||
|
||||
func RegisterDecoder(builder DecoderBuilder) error {
|
||||
decoder, format := builder.NewDecoder()
|
||||
formatStr := format.String()
|
||||
if _, ok := registeredDecoders[formatStr]; ok {
|
||||
return fmt.Errorf("%v has already been registered", format)
|
||||
}
|
||||
|
||||
registeredDecoders[formatStr] = decoder
|
||||
return nil
|
||||
}
|
||||
|
||||
// NewDecoder creates a decoder to decode raw audio data in the given format
|
||||
func NewDecoder(format Format) (Decoder, error) {
|
||||
decoder, ok := registeredDecoders[format.String()]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("%s format is not supported", format)
|
||||
}
|
||||
|
||||
return decoder, nil
|
||||
}
|
||||
|
||||
func calculateChunkInfo(chunk []byte, channels int, sampleSize int) (ChunkInfo, error) {
|
||||
if channels <= 0 {
|
||||
return ChunkInfo{}, fmt.Errorf("channels has to be greater than 0")
|
||||
}
|
||||
|
||||
if sampleSize <= 0 {
|
||||
return ChunkInfo{}, fmt.Errorf("sample size has to be greater than 0")
|
||||
}
|
||||
|
||||
sampleLen := channels * sampleSize
|
||||
if len(chunk)%sampleLen != 0 {
|
||||
expectedLen := len(chunk) + (sampleLen - len(chunk)%sampleLen)
|
||||
return ChunkInfo{}, fmt.Errorf("expected chunk to have a length of %d, but got %d", expectedLen, len(chunk))
|
||||
}
|
||||
|
||||
return ChunkInfo{
|
||||
Channels: channels,
|
||||
Len: len(chunk) / (channels * sampleSize),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func newInt16InterleavedDecoder() (Decoder, Format) {
|
||||
format := &RawFormat{
|
||||
SampleSize: 2,
|
||||
IsFloat: false,
|
||||
Interleaved: true,
|
||||
}
|
||||
|
||||
decoder := DecoderFunc(func(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error) {
|
||||
sampleSize := format.SampleSize
|
||||
chunkInfo, err := calculateChunkInfo(chunk, channels, sampleSize)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
container := NewInt16Interleaved(chunkInfo)
|
||||
|
||||
if endian == hostEndian {
|
||||
n := len(chunk)
|
||||
h := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(&container.Data[0])), Len: n, Cap: n}
|
||||
dst := *(*[]byte)(unsafe.Pointer(&h))
|
||||
copy(dst, chunk)
|
||||
return container, nil
|
||||
}
|
||||
|
||||
sampleLen := sampleSize * channels
|
||||
var i int
|
||||
for offset := 0; offset+sampleLen <= len(chunk); offset += sampleLen {
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
flatOffset := offset + ch*sampleSize
|
||||
sample := endian.Uint16(chunk[flatOffset : flatOffset+sampleSize])
|
||||
container.SetInt16(i, ch, Int16Sample(sample))
|
||||
}
|
||||
i++
|
||||
}
|
||||
|
||||
return container, nil
|
||||
|
||||
})
|
||||
|
||||
return decoder, format
|
||||
}
|
||||
|
||||
func newInt16NonInterleavedDecoder() (Decoder, Format) {
|
||||
format := &RawFormat{
|
||||
SampleSize: 2,
|
||||
IsFloat: false,
|
||||
Interleaved: false,
|
||||
}
|
||||
|
||||
decoder := DecoderFunc(func(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error) {
|
||||
sampleSize := format.SampleSize
|
||||
chunkInfo, err := calculateChunkInfo(chunk, channels, sampleSize)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
container := NewInt16NonInterleaved(chunkInfo)
|
||||
chunkLen := len(chunk) / channels
|
||||
|
||||
if endian == hostEndian {
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
offset := ch * chunkLen
|
||||
h := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(&container.Data[ch][0])), Len: chunkLen, Cap: chunkLen}
|
||||
dst := *(*[]byte)(unsafe.Pointer(&h))
|
||||
copy(dst, chunk[offset:offset+chunkLen])
|
||||
}
|
||||
return container, nil
|
||||
}
|
||||
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
offset := ch * chunkLen
|
||||
for i := 0; i < chunkInfo.Len; i++ {
|
||||
flatOffset := offset + i*sampleSize
|
||||
sample := endian.Uint16(chunk[flatOffset : flatOffset+sampleSize])
|
||||
container.SetInt16(i, ch, Int16Sample(sample))
|
||||
}
|
||||
}
|
||||
|
||||
return container, nil
|
||||
})
|
||||
|
||||
return decoder, format
|
||||
}
|
||||
|
||||
func newFloat32InterleavedDecoder() (Decoder, Format) {
|
||||
format := &RawFormat{
|
||||
SampleSize: 4,
|
||||
IsFloat: true,
|
||||
Interleaved: true,
|
||||
}
|
||||
|
||||
decoder := DecoderFunc(func(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error) {
|
||||
sampleSize := format.SampleSize
|
||||
chunkInfo, err := calculateChunkInfo(chunk, channels, sampleSize)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
container := NewFloat32Interleaved(chunkInfo)
|
||||
|
||||
if endian == hostEndian {
|
||||
n := len(chunk)
|
||||
h := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(&container.Data[0])), Len: n, Cap: n}
|
||||
dst := *(*[]byte)(unsafe.Pointer(&h))
|
||||
copy(dst, chunk)
|
||||
return container, nil
|
||||
}
|
||||
|
||||
sampleLen := sampleSize * channels
|
||||
var i int
|
||||
for offset := 0; offset+sampleLen <= len(chunk); offset += sampleLen {
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
flatOffset := offset + ch*sampleSize
|
||||
sample := endian.Uint32(chunk[flatOffset : flatOffset+sampleSize])
|
||||
sampleF := math.Float32frombits(sample)
|
||||
container.SetFloat32(i, ch, Float32Sample(sampleF))
|
||||
}
|
||||
i++
|
||||
}
|
||||
|
||||
return container, nil
|
||||
})
|
||||
|
||||
return decoder, format
|
||||
}
|
||||
|
||||
func newFloat32NonInterleavedDecoder() (Decoder, Format) {
|
||||
format := &RawFormat{
|
||||
SampleSize: 4,
|
||||
IsFloat: true,
|
||||
Interleaved: false,
|
||||
}
|
||||
|
||||
decoder := DecoderFunc(func(endian binary.ByteOrder, chunk []byte, channels int) (Audio, error) {
|
||||
sampleSize := format.SampleSize
|
||||
chunkInfo, err := calculateChunkInfo(chunk, channels, sampleSize)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
container := NewFloat32NonInterleaved(chunkInfo)
|
||||
chunkLen := len(chunk) / channels
|
||||
|
||||
if endian == hostEndian {
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
offset := ch * chunkLen
|
||||
h := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(&container.Data[ch][0])), Len: chunkLen, Cap: chunkLen}
|
||||
dst := *(*[]byte)(unsafe.Pointer(&h))
|
||||
copy(dst, chunk[offset:offset+chunkLen])
|
||||
}
|
||||
return container, nil
|
||||
}
|
||||
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
offset := ch * chunkLen
|
||||
for i := 0; i < chunkInfo.Len; i++ {
|
||||
flatOffset := offset + i*sampleSize
|
||||
sample := endian.Uint32(chunk[flatOffset : flatOffset+sampleSize])
|
||||
sampleF := math.Float32frombits(sample)
|
||||
container.SetFloat32(i, ch, Float32Sample(sampleF))
|
||||
}
|
||||
}
|
||||
|
||||
return container, nil
|
||||
})
|
||||
|
||||
return decoder, format
|
||||
}
|
39
pkg/wave/decoder_bench_test.go
Normal file
39
pkg/wave/decoder_bench_test.go
Normal file
@@ -0,0 +1,39 @@
|
||||
package wave
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func BenchmarkDecoder(b *testing.B) {
|
||||
var nonHostEndian binary.ByteOrder
|
||||
if hostEndian == binary.BigEndian {
|
||||
nonHostEndian = binary.LittleEndian
|
||||
} else {
|
||||
nonHostEndian = binary.BigEndian
|
||||
}
|
||||
|
||||
for format, decoder := range registeredDecoders {
|
||||
format := format
|
||||
decoder := decoder
|
||||
|
||||
b.Run(fmt.Sprintf("%sHostEndian", format), func(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
_, err := decoder.Decode(hostEndian, make([]byte, 800), 2)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
b.Run(fmt.Sprintf("%sNonHostEndian", format), func(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
_, err := decoder.Decode(nonHostEndian, make([]byte, 800), 2)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
353
pkg/wave/decoder_test.go
Normal file
353
pkg/wave/decoder_test.go
Normal file
@@ -0,0 +1,353 @@
|
||||
package wave
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"math"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestCalculateChunkInfo(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
chunk []byte
|
||||
channels int
|
||||
sampleSize int
|
||||
expected ChunkInfo
|
||||
expectErr bool
|
||||
}{
|
||||
"InvalidChunkSize1": {
|
||||
chunk: make([]byte, 3),
|
||||
channels: 2,
|
||||
sampleSize: 2,
|
||||
expected: ChunkInfo{},
|
||||
expectErr: true,
|
||||
},
|
||||
"InvalidChunkSize2": {
|
||||
chunk: make([]byte, 4),
|
||||
channels: 2,
|
||||
sampleSize: 4,
|
||||
expected: ChunkInfo{},
|
||||
expectErr: true,
|
||||
},
|
||||
"InvalidChannels": {
|
||||
chunk: nil,
|
||||
channels: 0,
|
||||
sampleSize: 2,
|
||||
expected: ChunkInfo{},
|
||||
expectErr: true,
|
||||
},
|
||||
"InvalidSampleSize": {
|
||||
chunk: nil,
|
||||
channels: 2,
|
||||
sampleSize: 0,
|
||||
expected: ChunkInfo{},
|
||||
expectErr: true,
|
||||
},
|
||||
"Valid1": {
|
||||
chunk: nil,
|
||||
channels: 2,
|
||||
sampleSize: 2,
|
||||
expected: ChunkInfo{
|
||||
Len: 0,
|
||||
Channels: 2,
|
||||
SamplingRate: 0,
|
||||
},
|
||||
expectErr: false,
|
||||
},
|
||||
"Valid2": {
|
||||
chunk: make([]byte, 8),
|
||||
channels: 2,
|
||||
sampleSize: 4,
|
||||
expected: ChunkInfo{
|
||||
Len: 1,
|
||||
Channels: 2,
|
||||
SamplingRate: 0,
|
||||
},
|
||||
expectErr: false,
|
||||
},
|
||||
"Valid3": {
|
||||
chunk: make([]byte, 4),
|
||||
channels: 1,
|
||||
sampleSize: 2,
|
||||
expected: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 1,
|
||||
SamplingRate: 0,
|
||||
},
|
||||
expectErr: false,
|
||||
},
|
||||
}
|
||||
|
||||
for testCaseName, testCase := range testCases {
|
||||
testCase := testCase
|
||||
t.Run(testCaseName, func(t *testing.T) {
|
||||
actual, err := calculateChunkInfo(testCase.chunk, testCase.channels, testCase.sampleSize)
|
||||
if testCase.expectErr && err == nil {
|
||||
t.Fatal("expected an error, but got nil")
|
||||
} else if !testCase.expectErr && err != nil {
|
||||
t.Fatalf("expected no error, but got %s", err)
|
||||
} else if !testCase.expectErr && !reflect.DeepEqual(actual, testCase.expected) {
|
||||
t.Errorf("Wrong chunk info calculation result,\nexpected:\n%+v\ngot:\n%+v", testCase.expected, actual)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewDecoder(t *testing.T) {
|
||||
rawFormats := []RawFormat{
|
||||
{
|
||||
SampleSize: 2,
|
||||
IsFloat: false,
|
||||
Interleaved: false,
|
||||
},
|
||||
{
|
||||
SampleSize: 4,
|
||||
IsFloat: true,
|
||||
Interleaved: false,
|
||||
},
|
||||
{
|
||||
SampleSize: 2,
|
||||
IsFloat: false,
|
||||
Interleaved: true,
|
||||
},
|
||||
{
|
||||
SampleSize: 4,
|
||||
IsFloat: true,
|
||||
Interleaved: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, rawFormat := range rawFormats {
|
||||
_, err := NewDecoder(&rawFormat)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDecodeInt16Interleaved(t *testing.T) {
|
||||
raw := []byte{
|
||||
// 16 bits per channel
|
||||
0x01, 0x02, 0x03, 0x04,
|
||||
0x05, 0x06, 0x07, 0x08,
|
||||
}
|
||||
decoder, _ := newInt16InterleavedDecoder()
|
||||
|
||||
t.Run("BigEndian", func(t *testing.T) {
|
||||
expected := &Int16Interleaved{
|
||||
Data: []int16{
|
||||
int16(binary.BigEndian.Uint16([]byte{0x01, 0x02})),
|
||||
int16(binary.BigEndian.Uint16([]byte{0x03, 0x04})),
|
||||
int16(binary.BigEndian.Uint16([]byte{0x05, 0x06})),
|
||||
int16(binary.BigEndian.Uint16([]byte{0x07, 0x08})),
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.BigEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("LittleEndian", func(t *testing.T) {
|
||||
expected := &Int16Interleaved{
|
||||
Data: []int16{
|
||||
int16(binary.LittleEndian.Uint16([]byte{0x01, 0x02})),
|
||||
int16(binary.LittleEndian.Uint16([]byte{0x03, 0x04})),
|
||||
int16(binary.LittleEndian.Uint16([]byte{0x05, 0x06})),
|
||||
int16(binary.LittleEndian.Uint16([]byte{0x07, 0x08})),
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.LittleEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestDecodeInt16NonInterleaved(t *testing.T) {
|
||||
raw := []byte{
|
||||
// 16 bits per channel
|
||||
0x01, 0x02, 0x03, 0x04,
|
||||
0x05, 0x06, 0x07, 0x08,
|
||||
}
|
||||
|
||||
decoder, _ := newInt16NonInterleavedDecoder()
|
||||
|
||||
t.Run("BigEndian", func(t *testing.T) {
|
||||
expected := &Int16NonInterleaved{
|
||||
Data: [][]int16{
|
||||
{int16(binary.BigEndian.Uint16([]byte{0x01, 0x02})), int16(binary.BigEndian.Uint16([]byte{0x03, 0x04}))},
|
||||
{int16(binary.BigEndian.Uint16([]byte{0x05, 0x06})), int16(binary.BigEndian.Uint16([]byte{0x07, 0x08}))},
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.BigEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("LittleEndian", func(t *testing.T) {
|
||||
expected := &Int16NonInterleaved{
|
||||
Data: [][]int16{
|
||||
{int16(binary.LittleEndian.Uint16([]byte{0x01, 0x02})), int16(binary.LittleEndian.Uint16([]byte{0x03, 0x04}))},
|
||||
{int16(binary.LittleEndian.Uint16([]byte{0x05, 0x06})), int16(binary.LittleEndian.Uint16([]byte{0x07, 0x08}))},
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.LittleEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestDecodeFloat32Interleaved(t *testing.T) {
|
||||
raw := []byte{
|
||||
// 32 bits per channel
|
||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
|
||||
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
|
||||
}
|
||||
|
||||
decoder, _ := newFloat32InterleavedDecoder()
|
||||
|
||||
t.Run("BigEndian", func(t *testing.T) {
|
||||
expected := &Float32Interleaved{
|
||||
Data: []float32{
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x01, 0x02, 0x03, 0x04})),
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x05, 0x06, 0x07, 0x08})),
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x09, 0x0a, 0x0b, 0x0c})),
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x0d, 0x0e, 0x0f, 0x10})),
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.BigEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("LittleEndian", func(t *testing.T) {
|
||||
expected := &Float32Interleaved{
|
||||
Data: []float32{
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x01, 0x02, 0x03, 0x04})),
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x05, 0x06, 0x07, 0x08})),
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x09, 0x0a, 0x0b, 0x0c})),
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x0d, 0x0e, 0x0f, 0x10})),
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.LittleEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestDecodeFloat32NonInterleaved(t *testing.T) {
|
||||
raw := []byte{
|
||||
// 32 bits per channel
|
||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
|
||||
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
|
||||
}
|
||||
|
||||
decoder, _ := newFloat32NonInterleavedDecoder()
|
||||
|
||||
t.Run("BigEndian", func(t *testing.T) {
|
||||
expected := &Float32NonInterleaved{
|
||||
Data: [][]float32{
|
||||
{
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x01, 0x02, 0x03, 0x04})),
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x05, 0x06, 0x07, 0x08})),
|
||||
},
|
||||
{
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x09, 0x0a, 0x0b, 0x0c})),
|
||||
math.Float32frombits(binary.BigEndian.Uint32([]byte{0x0d, 0x0e, 0x0f, 0x10})),
|
||||
},
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.BigEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("LittleEndian", func(t *testing.T) {
|
||||
expected := &Float32NonInterleaved{
|
||||
Data: [][]float32{
|
||||
{
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x01, 0x02, 0x03, 0x04})),
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x05, 0x06, 0x07, 0x08})),
|
||||
},
|
||||
{
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x09, 0x0a, 0x0b, 0x0c})),
|
||||
math.Float32frombits(binary.LittleEndian.Uint32([]byte{0x0d, 0x0e, 0x0f, 0x10})),
|
||||
},
|
||||
},
|
||||
Size: ChunkInfo{
|
||||
Len: 2,
|
||||
Channels: 2,
|
||||
},
|
||||
}
|
||||
actual, err := decoder.Decode(binary.LittleEndian, raw, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, actual) {
|
||||
t.Errorf("Wrong decode result,\nexpected:\n%+v\ngot:\n%+v", expected, actual)
|
||||
}
|
||||
})
|
||||
}
|
@@ -34,6 +34,16 @@ func (a *Float32Interleaved) SetFloat32(i, ch int, s Float32Sample) {
|
||||
a.Data[i*a.Size.Channels+ch] = float32(s)
|
||||
}
|
||||
|
||||
// SubAudio returns part of the original audio sharing the buffer.
|
||||
func (a *Float32Interleaved) SubAudio(offsetSamples, nSamples int) *Float32Interleaved {
|
||||
ret := *a
|
||||
offset := offsetSamples * a.Size.Channels
|
||||
n := nSamples * a.Size.Channels
|
||||
ret.Data = ret.Data[offset : offset+n]
|
||||
ret.Size.Len = nSamples
|
||||
return &ret
|
||||
}
|
||||
|
||||
func NewFloat32Interleaved(size ChunkInfo) *Float32Interleaved {
|
||||
return &Float32Interleaved{
|
||||
Data: make([]float32, size.Channels*size.Len),
|
||||
@@ -68,6 +78,16 @@ func (a *Float32NonInterleaved) SetFloat32(i, ch int, s Float32Sample) {
|
||||
a.Data[ch][i] = float32(s)
|
||||
}
|
||||
|
||||
// SubAudio returns part of the original audio sharing the buffer.
|
||||
func (a *Float32NonInterleaved) SubAudio(offsetSamples, nSamples int) *Float32NonInterleaved {
|
||||
ret := *a
|
||||
for i := range a.Data {
|
||||
ret.Data[i] = ret.Data[i][offsetSamples : offsetSamples+nSamples]
|
||||
}
|
||||
ret.Size.Len = nSamples
|
||||
return &ret
|
||||
}
|
||||
|
||||
func NewFloat32NonInterleaved(size ChunkInfo) *Float32NonInterleaved {
|
||||
d := make([][]float32, size.Channels)
|
||||
for i := 0; i < size.Channels; i++ {
|
||||
|
@@ -51,3 +51,44 @@ func TestFloat32(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloat32SubAudio(t *testing.T) {
|
||||
t.Run("Interleaved", func(t *testing.T) {
|
||||
in := &Float32Interleaved{
|
||||
Data: []float32{
|
||||
0.1, -0.5, 0.2, -0.6, 0.3, -0.7, 0.4, -0.8, 0.5, -0.9, 0.6, -1.0, 0.7, -1.1, 0.8, -1.2,
|
||||
},
|
||||
Size: ChunkInfo{8, 2, 48000},
|
||||
}
|
||||
expected := &Float32Interleaved{
|
||||
Data: []float32{
|
||||
0.3, -0.7, 0.4, -0.8, 0.5, -0.9,
|
||||
},
|
||||
Size: ChunkInfo{3, 2, 48000},
|
||||
}
|
||||
out := in.SubAudio(2, 3)
|
||||
if !reflect.DeepEqual(expected, out) {
|
||||
t.Errorf("SubAudio differs, expected: %v, got: %v", expected, out)
|
||||
}
|
||||
})
|
||||
t.Run("NonInterleaved", func(t *testing.T) {
|
||||
in := &Float32NonInterleaved{
|
||||
Data: [][]float32{
|
||||
{0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8},
|
||||
{-0.5, -0.6, -0.7, -0.8, -0.9, -1.0, -1.1, -1.2},
|
||||
},
|
||||
Size: ChunkInfo{8, 2, 48000},
|
||||
}
|
||||
expected := &Float32NonInterleaved{
|
||||
Data: [][]float32{
|
||||
{0.3, 0.4, 0.5},
|
||||
{-0.7, -0.8, -0.9},
|
||||
},
|
||||
Size: ChunkInfo{3, 2, 48000},
|
||||
}
|
||||
out := in.SubAudio(2, 3)
|
||||
if !reflect.DeepEqual(expected, out) {
|
||||
t.Errorf("SubAudio differs, expected: %v, got: %v", expected, out)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@@ -34,6 +34,16 @@ func (a *Int16Interleaved) SetInt16(i, ch int, s Int16Sample) {
|
||||
a.Data[i*a.Size.Channels+ch] = int16(s)
|
||||
}
|
||||
|
||||
// SubAudio returns part of the original audio sharing the buffer.
|
||||
func (a *Int16Interleaved) SubAudio(offsetSamples, nSamples int) *Int16Interleaved {
|
||||
ret := *a
|
||||
offset := offsetSamples * a.Size.Channels
|
||||
n := nSamples * a.Size.Channels
|
||||
ret.Data = ret.Data[offset : offset+n]
|
||||
ret.Size.Len = nSamples
|
||||
return &ret
|
||||
}
|
||||
|
||||
func NewInt16Interleaved(size ChunkInfo) *Int16Interleaved {
|
||||
return &Int16Interleaved{
|
||||
Data: make([]int16, size.Channels*size.Len),
|
||||
@@ -68,6 +78,16 @@ func (a *Int16NonInterleaved) SetInt16(i, ch int, s Int16Sample) {
|
||||
a.Data[ch][i] = int16(s)
|
||||
}
|
||||
|
||||
// SubAudio returns part of the original audio sharing the buffer.
|
||||
func (a *Int16NonInterleaved) SubAudio(offsetSamples, nSamples int) *Int16NonInterleaved {
|
||||
ret := *a
|
||||
for i := range a.Data {
|
||||
ret.Data[i] = ret.Data[i][offsetSamples : offsetSamples+nSamples]
|
||||
}
|
||||
ret.Size.Len = nSamples
|
||||
return &ret
|
||||
}
|
||||
|
||||
func NewInt16NonInterleaved(size ChunkInfo) *Int16NonInterleaved {
|
||||
d := make([][]int16, size.Channels)
|
||||
for i := 0; i < size.Channels; i++ {
|
||||
|
@@ -51,3 +51,44 @@ func TestInt16(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestInt32SubAudio(t *testing.T) {
|
||||
t.Run("Interleaved", func(t *testing.T) {
|
||||
in := &Int16Interleaved{
|
||||
Data: []int16{
|
||||
1, -5, 2, -6, 3, -7, 4, -8, 5, -9, 6, -10, 7, -11, 8, -12,
|
||||
},
|
||||
Size: ChunkInfo{8, 2, 48000},
|
||||
}
|
||||
expected := &Int16Interleaved{
|
||||
Data: []int16{
|
||||
3, -7, 4, -8, 5, -9,
|
||||
},
|
||||
Size: ChunkInfo{3, 2, 48000},
|
||||
}
|
||||
out := in.SubAudio(2, 3)
|
||||
if !reflect.DeepEqual(expected, out) {
|
||||
t.Errorf("SubAudio differs, expected: %v, got: %v", expected, out)
|
||||
}
|
||||
})
|
||||
t.Run("NonInterleaved", func(t *testing.T) {
|
||||
in := &Int16NonInterleaved{
|
||||
Data: [][]int16{
|
||||
{1, 2, 3, 4, 5, 6, 7, 8},
|
||||
{-5, -6, -7, -8, -9, -10, -11, -12},
|
||||
},
|
||||
Size: ChunkInfo{8, 2, 48000},
|
||||
}
|
||||
expected := &Int16NonInterleaved{
|
||||
Data: [][]int16{
|
||||
{3, 4, 5},
|
||||
{-7, -8, -9},
|
||||
},
|
||||
Size: ChunkInfo{3, 2, 48000},
|
||||
}
|
||||
out := in.SubAudio(2, 3)
|
||||
if !reflect.DeepEqual(expected, out) {
|
||||
t.Errorf("SubAudio differs, expected: %v, got: %v", expected, out)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
8
pkg/wave/int64.go
Normal file
8
pkg/wave/int64.go
Normal file
@@ -0,0 +1,8 @@
|
||||
package wave
|
||||
|
||||
// Int64Sample is a 64-bits signed integer audio sample.
|
||||
type Int64Sample int64
|
||||
|
||||
func (s Int64Sample) Int() int64 {
|
||||
return int64(s)
|
||||
}
|
42
pkg/wave/mixer/mixer.go
Normal file
42
pkg/wave/mixer/mixer.go
Normal file
@@ -0,0 +1,42 @@
|
||||
package mixer
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
)
|
||||
|
||||
// ChannelMixer mixes audio into specifix channels.
|
||||
type ChannelMixer interface {
|
||||
Mix(dst wave.Audio, src wave.Audio) error
|
||||
}
|
||||
|
||||
// MonoMixer mixes channels into monaural audio.
|
||||
type MonoMixer struct {
|
||||
}
|
||||
|
||||
func (m *MonoMixer) Mix(dst wave.Audio, src wave.Audio) error {
|
||||
if dst.ChunkInfo().Len != src.ChunkInfo().Len {
|
||||
return errors.New("buffer size mismatch")
|
||||
}
|
||||
dstSetter, ok := dst.(wave.EditableAudio)
|
||||
if !ok {
|
||||
return errors.New("destination buffer is not settable")
|
||||
}
|
||||
|
||||
n := src.ChunkInfo().Len
|
||||
channels := src.ChunkInfo().Channels
|
||||
dstChannels := dst.ChunkInfo().Channels
|
||||
for i := 0; i < n; i++ {
|
||||
var mean int64
|
||||
for ch := 0; ch < channels; ch++ {
|
||||
mean += src.At(i, ch).Int()
|
||||
}
|
||||
mean /= int64(channels)
|
||||
|
||||
for ch := 0; ch < dstChannels; ch++ {
|
||||
dstSetter.Set(i, ch, wave.Int64Sample(mean))
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
80
pkg/wave/mixer/mixer_test.go
Normal file
80
pkg/wave/mixer/mixer_test.go
Normal file
@@ -0,0 +1,80 @@
|
||||
package mixer
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/pion/mediadevices/pkg/wave"
|
||||
)
|
||||
|
||||
func TestMonoMixer(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
src wave.Audio
|
||||
dst wave.Audio
|
||||
expected wave.Audio
|
||||
}{
|
||||
"MultiToMono": {
|
||||
src: &wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{
|
||||
Len: 3,
|
||||
Channels: 3,
|
||||
},
|
||||
Data: []int16{
|
||||
0, 2, 4,
|
||||
1, -2, 1,
|
||||
3, 3, 6,
|
||||
},
|
||||
},
|
||||
dst: &wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{
|
||||
Len: 3,
|
||||
Channels: 1,
|
||||
},
|
||||
Data: make([]int16, 3),
|
||||
},
|
||||
expected: &wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{
|
||||
Len: 3,
|
||||
Channels: 1,
|
||||
},
|
||||
Data: []int16{2, 0, 4},
|
||||
},
|
||||
},
|
||||
"MonoToStereo": {
|
||||
src: &wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{
|
||||
Len: 3,
|
||||
Channels: 1,
|
||||
},
|
||||
Data: []int16{0, 2, 4},
|
||||
},
|
||||
dst: &wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{
|
||||
Len: 3,
|
||||
Channels: 2,
|
||||
},
|
||||
Data: make([]int16, 6),
|
||||
},
|
||||
expected: &wave.Int16Interleaved{
|
||||
Size: wave.ChunkInfo{
|
||||
Len: 3,
|
||||
Channels: 2,
|
||||
},
|
||||
Data: []int16{0, 0, 2, 2, 4, 4},
|
||||
},
|
||||
},
|
||||
}
|
||||
for name, testCase := range testCases {
|
||||
testCase := testCase
|
||||
t.Run(name, func(t *testing.T) {
|
||||
m := &MonoMixer{}
|
||||
err := m.Mix(testCase.dst, testCase.src)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !reflect.DeepEqual(testCase.expected, testCase.dst) {
|
||||
t.Errorf("Mix result is wrong\nexpected: %v\ngot: %v", testCase.expected, testCase.dst)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
@@ -8,6 +8,12 @@ type Audio interface {
|
||||
At(i, ch int) Sample
|
||||
}
|
||||
|
||||
// EditableAudio is an editable finite series of audio Sample values.
|
||||
type EditableAudio interface {
|
||||
Audio
|
||||
Set(i, ch int, s Sample)
|
||||
}
|
||||
|
||||
// ChunkInfo contains size of the audio chunk.
|
||||
type ChunkInfo struct {
|
||||
Len int
|
||||
|
16
track.go
16
track.go
@@ -1,7 +1,7 @@
|
||||
package mediadevices
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"errors"
|
||||
"math/rand"
|
||||
"sync"
|
||||
|
||||
@@ -62,11 +62,11 @@ func newTrack(opts *MediaDevicesOptions, d driver.Driver, constraints MediaTrack
|
||||
case driver.AudioRecorder:
|
||||
rtpCodecs = opts.codecs[webrtc.RTPCodecTypeAudio]
|
||||
buildSampler = func(t LocalTrack) samplerFunc {
|
||||
return newAudioSampler(t, constraints.Latency)
|
||||
return newAudioSampler(t, constraints.selectedMedia.Latency)
|
||||
}
|
||||
encoderBuilders, err = newAudioEncoderBuilders(r, constraints)
|
||||
default:
|
||||
err = fmt.Errorf("newTrack: invalid driver type")
|
||||
err = errors.New("newTrack: invalid driver type")
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
@@ -114,7 +114,7 @@ func newTrack(opts *MediaDevicesOptions, d driver.Driver, constraints MediaTrack
|
||||
}
|
||||
|
||||
d.Close()
|
||||
return nil, fmt.Errorf("newTrack: failed to find a matching codec")
|
||||
return nil, errors.New("newTrack: failed to find a matching codec")
|
||||
}
|
||||
|
||||
// OnEnded sets an error handler. When a track has been created and started, if an
|
||||
@@ -196,7 +196,7 @@ type encoderBuilder struct {
|
||||
// newVideoEncoderBuilders transforms video given by VideoRecorder with the video transformer that is passed through
|
||||
// constraints and create a list of generic encoder builders
|
||||
func newVideoEncoderBuilders(vr driver.VideoRecorder, constraints MediaTrackConstraints) ([]encoderBuilder, error) {
|
||||
r, err := vr.VideoRecord(constraints.Media)
|
||||
r, err := vr.VideoRecord(constraints.selectedMedia)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -209,7 +209,7 @@ func newVideoEncoderBuilders(vr driver.VideoRecorder, constraints MediaTrackCons
|
||||
for i, b := range constraints.VideoEncoderBuilders {
|
||||
encoderBuilders[i].name = b.Name()
|
||||
encoderBuilders[i].build = func() (codec.ReadCloser, error) {
|
||||
return b.BuildVideoEncoder(r, constraints.Media)
|
||||
return b.BuildVideoEncoder(r, constraints.selectedMedia)
|
||||
}
|
||||
}
|
||||
return encoderBuilders, nil
|
||||
@@ -218,7 +218,7 @@ func newVideoEncoderBuilders(vr driver.VideoRecorder, constraints MediaTrackCons
|
||||
// newAudioEncoderBuilders transforms audio given by AudioRecorder with the audio transformer that is passed through
|
||||
// constraints and create a list of generic encoder builders
|
||||
func newAudioEncoderBuilders(ar driver.AudioRecorder, constraints MediaTrackConstraints) ([]encoderBuilder, error) {
|
||||
r, err := ar.AudioRecord(constraints.Media)
|
||||
r, err := ar.AudioRecord(constraints.selectedMedia)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -231,7 +231,7 @@ func newAudioEncoderBuilders(ar driver.AudioRecorder, constraints MediaTrackCons
|
||||
for i, b := range constraints.AudioEncoderBuilders {
|
||||
encoderBuilders[i].name = b.Name()
|
||||
encoderBuilders[i].build = func() (codec.ReadCloser, error) {
|
||||
return b.BuildAudioEncoder(r, constraints.Media)
|
||||
return b.BuildAudioEncoder(r, constraints.selectedMedia)
|
||||
}
|
||||
}
|
||||
return encoderBuilders, nil
|
||||
|
Reference in New Issue
Block a user