Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #417 from EpicGames/master
Browse files Browse the repository at this point in the history
Merging master into 5.4
  • Loading branch information
mcottontensor authored Oct 31, 2023
2 parents b16bb6c + da0a871 commit e90a685
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Frontend/library/src/Inputs/FakeTouchController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class FakeTouchController implements ITouchController {
* @param touch - the activating touch event
*/
onTouchStart(touch: TouchEvent): void {
if (!this.videoElementProvider.isVideoReady()) {
if (!this.videoElementProvider.isVideoReady() || touch.target !== this.videoElementProvider.getVideoElement()) {
return;
}
if (this.fakeTouchFinger == null) {
Expand Down Expand Up @@ -108,7 +108,7 @@ export class FakeTouchController implements ITouchController {
* @param touchEvent - the activating touch event
*/
onTouchEnd(touchEvent: TouchEvent): void {
if (!this.videoElementProvider.isVideoReady()) {
if (!this.videoElementProvider.isVideoReady() || this.fakeTouchFinger == null) {
return;
}
const videoElementParent =
Expand Down Expand Up @@ -144,7 +144,7 @@ export class FakeTouchController implements ITouchController {
* @param touchEvent - the activating touch event
*/
onTouchMove(touchEvent: TouchEvent): void {
if (!this.videoElementProvider.isVideoReady()) {
if (!this.videoElementProvider.isVideoReady() || this.fakeTouchFinger == null) {
return;
}
const toStreamerHandlers =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class PeerConnectionController {
this.onVideoStats(this.aggregatedStats);

// Update the preferred codec selection based on what was actually negotiated
if (this.updateCodecSelection) {
if (this.updateCodecSelection && !!this.aggregatedStats.inboundVideoStats.codecId) {
this.config.setOptionSettingValue(
OptionParameters.PreferredCodec,
this.aggregatedStats.codecs.get(
Expand Down Expand Up @@ -370,7 +370,7 @@ export class PeerConnectionController {
if (RTCRtpReceiver.getCapabilities && this.preferredCodec != '') {
for (const transceiver of this.peerConnection?.getTransceivers() ?? []) {
if (
transceiver &&
transceiver &&
transceiver.receiver &&
transceiver.receiver.track &&
transceiver.receiver.track.kind === 'video' &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ export class WebRtcPlayerController {
);

this.streamMessageController.toStreamerHandlers.get(
'Command'
'UIInteraction'
)([JSON.stringify(descriptor)]);
}

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The Pixel Streaming Infrastructure contains reference implementations for all th
- shared libraries for [communication](Frontend/library/) and [UI](Frontend/ui-library/) functionality
- separate [implementations](Frontend/implementations/) using different techologies such as TypeScript or React/JSX

For detailed information, see the [frontend readme](Frontend/README.md).
For detailed information, see the [/frontend](/Frontend/).

## Releases
We release a number of different components under this repository, specifically:
Expand Down Expand Up @@ -64,7 +64,7 @@ npm i @epicgames-ps/lib-pixelstreamingfrontend-ui-ue5.3

## Documentation
* [General Docs](/Docs/README.md)
* [Frontend Docs](/Frontend/Docs/README.md)
* [Frontend Docs](/Frontend/)
* Signalling Server Docs [TO DO](https://github.com/EpicGames/PixelStreamingInfrastructure/issues/255)
* Matchmaker Docs [TO DO](https://github.com/EpicGames/PixelStreamingInfrastructure/issues/256)
* SFU Docs [TO DO](https://github.com/EpicGames/PixelStreamingInfrastructure/issues/257)
Expand Down
6 changes: 3 additions & 3 deletions SFU/Docs/What is the SFU.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Adding the above to your level blueprint lets you use the assigned key as a conn
**Note:** The SFU is designed to automatically switch peers between layers based on their connection, so using this blueprint isn’t required for actual deployments.


![Layer1](images/Layer1.png) Layer 1
![Layer1](images/Layer1.PNG) Layer 1

![Layer2](images/Layer2.png) Layer 2
![Layer2](images/Layer2.PNG) Layer 2

![Layer3](images/Layer3.png) Layer 3
![Layer3](images/Layer3.PNG) Layer 3

0 comments on commit e90a685

Please sign in to comment.