Commit fa8e1b58 by Christoph

fixed camera access issues on latest Chrome release + changed version to V1.9845…

fixed camera access issues on latest Chrome release + changed version to V1.9845 + updated dependencies
parent faa6f60d
{ {
"name": "awrtc_browser", "name": "awrtc_browser",
"version": "1.9844.0", "version": "1.984.5",
"description": "Compatible browser implementation to the Unity asset WebRTC Video Chat. Try examples in build folder", "description": "Compatible browser implementation to the Unity asset WebRTC Video Chat. Try examples in build folder",
"author": "because-why-not.com Limited", "author": "because-why-not.com Limited",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"tsc": "tsc", "tsc": "tsc",
"webpack": "webpack", "webpack": "webpack",
"build": "webpack && tsc -p ./src/awrtc", "build": "webpack && tsc -p ./src/awrtc",
"watch": "webpack --watch",
"clean": "shx rm -rf ./build/awrtc ./build/bundle" "clean": "shx rm -rf ./build/awrtc ./build/bundle"
}, },
"files": [ "files": [
...@@ -25,13 +26,17 @@ ...@@ -25,13 +26,17 @@
"@types/jasmine": "^2.8.16", "@types/jasmine": "^2.8.16",
"jasmine": "^2.99.0", "jasmine": "^2.99.0",
"jasmine-core": "^3.5.0", "jasmine-core": "^3.5.0",
"karma": "^5.0.5",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "^1.3.0",
"karma-jasmine": "^2.0.1",
"shx": "^0.3.2", "shx": "^0.3.2",
"source-map-loader": "^0.2.4", "source-map-loader": "^0.2.4",
"ts-loader": "^5.4.5", "ts-loader": "^5.4.5",
"tsconfig-paths-webpack-plugin": "^3.2.0", "tsconfig-paths-webpack-plugin": "^3.2.0",
"typescript": "^3.8.3", "typescript": "^3.8.3",
"uglify-js": "^2.8.29", "uglify-js": "^2.8.29",
"webpack": "^4.42.1", "webpack": "^4.43.0",
"webpack-cli": "^3.3.11", "webpack-cli": "^3.3.11",
"webrtc-adapter": "^6.4.8" "webrtc-adapter": "^6.4.8"
} }
......
...@@ -144,12 +144,13 @@ export class BrowserMediaNetwork extends WebRtcNetwork implements IMediaNetwork ...@@ -144,12 +144,13 @@ export class BrowserMediaNetwork extends WebRtcNetwork implements IMediaNetwork
{ {
deviceId = DeviceApi.GetDeviceId(config.VideoDeviceName); deviceId = DeviceApi.GetDeviceId(config.VideoDeviceName);
SLog.L("using device " + config.VideoDeviceName); SLog.L("using device " + config.VideoDeviceName);
if(deviceId !== null) if(deviceId !== null && deviceId !== "")
{ {
//SLog.L("using device id " + deviceId); //SLog.L("using device id " + deviceId);
} }
else{ else{
SLog.LE("Failed to find deviceId for label " + config.VideoDeviceName); deviceId = null;
SLog.LW("Failed to find deviceId for label " + config.VideoDeviceName + "! Using default device instead");
} }
} }
//watch out: unity changed behaviour and will now //watch out: unity changed behaviour and will now
......
...@@ -132,12 +132,13 @@ describe("DeviceApiTest", () => { ...@@ -132,12 +132,13 @@ describe("DeviceApiTest", () => {
let update2complete = false; let update2complete = false;
let deviceCount = 0; let deviceCount = 0;
expect(CAPI_DeviceApi_Devices_Length()).toBe(0); const devices_length_unitialized = CAPI_DeviceApi_Devices_Length();
CAPI_DeviceApi_Update(); expect(devices_length_unitialized).toBe(0);
DeviceApi.AddOnChangedHandler(()=>{
setTimeout(()=>{ let dev_length = CAPI_DeviceApi_Devices_Length();
expect(CAPI_DeviceApi_Devices_Length()).not.toBe(0); expect(dev_length).not.toBe(0);
expect(CAPI_DeviceApi_Devices_Length()).toBe(Object.keys(DeviceApi.Devices).length); expect(dev_length).toBe(Object.keys(DeviceApi.Devices).length);
let keys = Object.keys(DeviceApi.Devices); let keys = Object.keys(DeviceApi.Devices);
let counter = 0; let counter = 0;
...@@ -150,7 +151,9 @@ describe("DeviceApiTest", () => { ...@@ -150,7 +151,9 @@ describe("DeviceApiTest", () => {
counter++; counter++;
} }
done(); done();
}, 100); });
CAPI_DeviceApi_Update();
}); });
}); });
......
...@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
import { BrowserMediaNetwork, NetworkConfig, MediaConfig, import { BrowserMediaNetwork, NetworkConfig, MediaConfig,
ConnectionId, MediaEvent, MediaEventType, ConnectionId, MediaEvent, MediaEventType,
MediaConfigurationState, NetEventType } from "../awrtc/index"; MediaConfigurationState, NetEventType, BrowserMediaStream } from "../awrtc/index";
export class MediaNetworkTest{ export class MediaNetworkTest{
...@@ -77,7 +77,8 @@ export class MediaNetworkTest{ ...@@ -77,7 +77,8 @@ export class MediaNetworkTest{
}); });
it("MediaEvent", (done) => { it("MediaEventLocal", (done) => {
BrowserMediaStream.DEBUG_SHOW_ELEMENTS = true;
let mediaConfig = new MediaConfig(); let mediaConfig = new MediaConfig();
let network = this.createDefault(); let network = this.createDefault();
...@@ -88,6 +89,7 @@ export class MediaNetworkTest{ ...@@ -88,6 +89,7 @@ export class MediaNetworkTest{
let evt : MediaEvent = null; let evt : MediaEvent = null;
while((evt = network.DequeueMediaEvent()) != null) while((evt = network.DequeueMediaEvent()) != null)
{ {
console.log("Stream added",evt );
expect(evt.EventType).toBe(MediaEventType.StreamAdded); expect(evt.EventType).toBe(MediaEventType.StreamAdded);
expect(evt.Args.videoHeight).toBeGreaterThan(0); expect(evt.Args.videoHeight).toBeGreaterThan(0);
expect(evt.Args.videoWidth).toBeGreaterThan(0); expect(evt.Args.videoWidth).toBeGreaterThan(0);
...@@ -100,7 +102,7 @@ export class MediaNetworkTest{ ...@@ -100,7 +102,7 @@ export class MediaNetworkTest{
it("MediaEventRemote", (done) => { it("MediaEventRemote", (done) => {
BrowserMediaStream.DEBUG_SHOW_ELEMENTS = true;
let testaddress = "testaddress" + Math.random(); let testaddress = "testaddress" + Math.random();
let sender = this.createDefault(); let sender = this.createDefault();
let receiver = this.createDefault(); let receiver = this.createDefault();
...@@ -167,9 +169,9 @@ export class MediaNetworkTest{ ...@@ -167,9 +169,9 @@ export class MediaNetworkTest{
if(senderFrame && receiverFrame) if(senderFrame && receiverFrame)
done(); done();
}, 10); }, 40);
}); }, 15000);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment