Added Streaming functionality for iOS Browsers #442

Forchapeatl · 2022-08-05T20:07:39Z

Removed Webrtc Library
-Added getUserMedia Api
-Added function to initialize video streaming src/io/camera.js on function unInitialize()
Fixes GSoC Infragram.org full-screen UI and video upload Discussion and Planning #418

Hosted on https://forchapeatl.github.io/infragram/indexs.html

Added streaming on IOS browsers

gitpod-io · 2022-08-05T20:07:42Z

jywarren · 2022-08-05T22:42:38Z

package.json

@@ -25,11 +25,9 @@
    "bootstrap": "~3.4.0",
    "bootstrap5": "npm:bootstrap@^5.1.3",
    "font-awesome": "~4.7.0",
-    "getusermedia-js": "~1.0.0",


Ah, if we remove these here, won't it break v1? Shall we leave them in even though v2 won't be using them?

Or alternatively, should we implement the same changes in index2.html into index.html and fix both v1 and v2 in this respect?

Let's not break v1 for now. We can break it after v2 is complete , when @stephaniequintana and I synchronize our codebase.

@jywarren , package.json has been fixed. Please may I merge?

jywarren · 2022-08-05T23:30:10Z

Can you check if any of the changes to the src files adversely affected v1 functionality? Thank you!

…

On Fri, Aug 5, 2022 at 7:21 PM FORCHA ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In package.json <#442 (comment)>: > @@ -25,11 +25,9 @@ "bootstrap": "~3.4.0", "bootstrap5": "npm:bootstrap@^5.1.3", "font-awesome": "~4.7.0", - "getusermedia-js": "~1.0.0", @jywarren <https://github.com/jywarren> , package.json has been fixed. Please may I merge? — Reply to this email directly, view it on GitHub <#442 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAAF6JYOY2CBLIH6REQPM5LVXWOWVANCNFSM55XEYOFA> . You are receiving this because you were mentioned.Message ID: ***@***.***>

stephaniequintana · 2022-08-05T23:48:08Z

FANTASTIC work, @Forchapeatl! Kudos!!! 🚀 🎆

Forchapeatl · 2022-08-05T23:50:46Z

sorry about that @jywarren it affects the functionality of camera.js a whole lot. As the bootstrap modal is replaced by offcanvas and WebcamVideo element is not created by WebRTC. Should I create a seperate cameraV2.js file ?

jywarren · 2022-08-06T00:04:24Z

sorry about that @jywarren it affects the functionality of camera.js a whole lot. As the bootstrap modal is replaced by offcanvas and WebcamVideo element is not created by WebRTC. Should I create a seperate cameraV2.js file ?

It's ok! @stephaniequintana would you like to explain how we could use the options flag to switch behaviors between the two versions?

src/io/camera.js

Forchapeatl · 2022-08-06T23:30:20Z

Hello @jywarren the options.version condition has been included to the camera.js and dist/infragram.js files. Please have a look at the video below . hosted on (version 2 )https://forchapeatl.github.io/infragram/indexs.html and (version 1) https://forchapeatl.github.io/infragram/index.html . May I merge this PR ?

9b0cfba2-1835-4ddf-a9a5-a7fa222e5624.online-video-cutter.com.mp4

welcome · 2022-08-08T07:47:03Z

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to http://infragram.org in the next few days.
Now that you've completed this, you can help someone else take their first step!
See: Public Lab's coding community!

jywarren · 2022-08-09T00:04:25Z

src/io/camera.js

-    // detection), we handle getting video/images for our canvas 
-    // from our HTML5 <video> element.
-    if (webRtcOptions.context === "webrtc") {
+    if(options.version == 1){


This all looks great! Please do try to standardize spacing -- there are some auto-formatters you can use too to achieve this! So, if (options.version == 1) { <= note the spaces. But not a big deal -- it just is nice over the long term (over years) to have the code be very regularly formatted.

Thanks @Forchapeatl!!!

Ohh, please do you mean indenting ?

Ah no, actually just notice there's a space between if and ( in line 109, but on 133 that's missing. it's a very small thing and not super important but is kind of nice to preserve completely consistent formatting as much as possible. Thank you!

jywarren · 2022-08-09T00:04:50Z

dist/infragram2.js

-      var canvas, ctx; // Initialize getUserMedia with options
+      var canvas, ctx;
+      options.webcamVideoSelector = options.webcamVideoSelector || 'webcamVideoEl';
+      options.webcamVideoEl = document.getElementById(options.webcamVideoSelector); // Initialize getUserMedia with options


jywarren · 2022-08-09T00:08:22Z

So, one more thing @Forchapeatl -- here, are you generating the dist/infragram.js and then renaming it dist/infragram2.js? If all the version differences are managed by the options.version conditionals now, can't we begin leaving it as dist/infragram.js instead of infragram2.js, since both versions will be able to run off the same file?

And thank you for merging this and moving it along -- i think sorry it might have needed just one more review before doing so but it's not a big deal since you did confirm that the previous version was working fine!

However if you open a new PR where we just use dist/infragram.js we'll have to be extra sure all features work in both versions since they'll all be running off the same file from there onward. Make sense?

Thanks!!!

jywarren · 2022-08-09T00:08:53Z

Also just cc'ing @stephaniequintana can you and @Forchapeatl just put a 👍 on the above so I know we're all coordinated? Thank you! Exciting!!!!

jywarren · 2022-08-09T00:10:39Z

And thanks for your patience this week as I'm teaching long hours so less able to reply quickly! Definitely continue relying on reviews from each other and other mentors as well!

Forchapeatl added 5 commits August 5, 2022 19:47

Update camera.js

64faac1

Added streaming on IOS browsers

Update index2.html

00e71cf

Update infragram2.js

8375e8b

Update camera.js

771b9bf

Update infragram.js

afa50e2

Forchapeatl added 5 commits August 5, 2022 21:21

Update infragram2.js

5c43960

Update infragram.js

dd6bd6e

Update package.json

6dc4b7c

Update package.json

85d7d7e

Update infragram2.js

8a0772c

Forchapeatl requested review from jywarren and stephaniequintana August 5, 2022 20:34

jywarren reviewed Aug 5, 2022

View reviewed changes

Update package.json

85da456

jywarren reviewed Aug 6, 2022

View reviewed changes

src/io/camera.js Show resolved Hide resolved

Forchapeatl added 5 commits August 6, 2022 23:23

Update camera.js

62f4eed

Update index2.html

be2c102

Update infragram.js

9812da2

Update infragram.js

e687f88

Update infragram2.js

a56b08c

Forchapeatl merged commit 9547f0b into main Aug 8, 2022

Forchapeatl changed the title ~~Added Streaming functionality for Safari Browsers~~ Added Streaming functionality for iOS Browsers Aug 8, 2022

jywarren reviewed Aug 9, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Streaming functionality for iOS Browsers #442

Added Streaming functionality for iOS Browsers #442

Forchapeatl commented Aug 5, 2022 •

edited

Loading

gitpod-io bot commented Aug 5, 2022

jywarren Aug 5, 2022

jywarren Aug 5, 2022

Forchapeatl Aug 5, 2022

Forchapeatl Aug 5, 2022 •

edited

Loading

Forchapeatl Aug 5, 2022

jywarren commented Aug 5, 2022 via email

stephaniequintana commented Aug 5, 2022

Forchapeatl commented Aug 5, 2022

jywarren commented Aug 6, 2022

Forchapeatl commented Aug 6, 2022 •

edited

Loading

welcome bot commented Aug 8, 2022

jywarren Aug 9, 2022

Forchapeatl Aug 9, 2022

jywarren Aug 9, 2022

jywarren Aug 9, 2022

jywarren commented Aug 9, 2022

jywarren commented Aug 9, 2022

jywarren commented Aug 9, 2022

Added Streaming functionality for iOS Browsers #442

Added Streaming functionality for iOS Browsers #442

Conversation

Forchapeatl commented Aug 5, 2022 • edited Loading

gitpod-io bot commented Aug 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Forchapeatl Aug 5, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jywarren commented Aug 5, 2022 via email

stephaniequintana commented Aug 5, 2022

Forchapeatl commented Aug 5, 2022

jywarren commented Aug 6, 2022

Forchapeatl commented Aug 6, 2022 • edited Loading

welcome bot commented Aug 8, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jywarren commented Aug 9, 2022

jywarren commented Aug 9, 2022

jywarren commented Aug 9, 2022

Forchapeatl commented Aug 5, 2022 •

edited

Loading

Forchapeatl Aug 5, 2022 •

edited

Loading

Forchapeatl commented Aug 6, 2022 •

edited

Loading