mirror of
https://github.com/pion/mediadevices.git
synced 2025-09-28 05:12:15 +08:00
Compare commits
2 Commits
fork-v0.3.
...
fork-v0.3.
Author | SHA1 | Date | |
---|---|---|---|
![]() |
988cc9861d | ||
![]() |
64f728bf27 |
@@ -2,6 +2,7 @@ package mediadevices
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"math"
|
||||
"strings"
|
||||
|
||||
@@ -157,6 +158,7 @@ func selectBestDriver(filter driver.FilterFn, constraints MediaTrackConstraints)
|
||||
constraints.selectedMedia = prop.Media{}
|
||||
constraints.selectedMedia.MergeConstraints(constraints.MediaConstraints)
|
||||
constraints.selectedMedia.Merge(bestProp)
|
||||
log.Println("selected media:", constraints.selectedMedia)
|
||||
return bestDriver, constraints, nil
|
||||
}
|
||||
|
||||
|
@@ -345,7 +345,7 @@ STATUS AVBindSessionProperties(PAVBindSession pSession, PAVBindMediaProperty *pp
|
||||
if ([refFormat.mediaType isEqual:AVMediaTypeVideo]) {
|
||||
fourCC = CMFormatDescriptionGetMediaSubType(refFormat.formatDescription);
|
||||
if (frameFormatFromFourCC(fourCC, &pProperty->frameFormat) != STATUS_OK) {
|
||||
NSLog(@"[WARNING] skipping %@ %dx%d since it's not supported", FourCCString(fourCC), videoDimensions.width, videoDimensions.height);
|
||||
NSLog(@"[WARNING] skipping %@(%d) %dx%d since it's not supported", FourCCString(fourCC), fourCC, videoDimensions.width, videoDimensions.height);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
BIN
pkg/avfoundation/_obj/_cgo_.o
Normal file
BIN
pkg/avfoundation/_obj/_cgo_.o
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -141,7 +141,9 @@ func (broadcaster *Broadcaster) NewReader(copyFn func(interface{}) interface{})
|
||||
data, err, currentCount = ringData.data, ringData.err, ringData.count
|
||||
}
|
||||
|
||||
data = copyFn(data)
|
||||
if err != nil {
|
||||
data = copyFn(data)
|
||||
}
|
||||
return
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user