Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Process Uploaded Video File Locally #445

Merged
merged 7 commits into from
Aug 12, 2022
Merged

Process Uploaded Video File Locally #445

merged 7 commits into from
Aug 12, 2022

Conversation

Forchapeatl
Copy link
Collaborator

@Forchapeatl Forchapeatl commented Aug 8, 2022

Process Uploaded Video File Locally
Fixes #418
Passed Test case

  • Upload Video.
  • Switch between video and Webcam
  • Switch between video and image file.
  • Switch between multiple videos.
  • Switch between multiple image files

Found at https://forchapeatl.github.io/infragram/indexs.html#

Switch between image and video file

7ea8b9b1-745a-4d99-8d82-fffa7563a07e.mp4

Switch between camera and video file

ezgif-3-1e26f85df8.mp4

Misc test

ezgif-5-4f445a5226.mp4

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

-Switch between Live Stream and Video File analysis
Added function "options.processLocalVideo()"
-Adapted functions '$("#webcam-activate")' and '$(options.fileSelector)' for Version 1 and Version 2.
-Included function for local video Processing and interactive video controls.
-Included Function for Local Video Processing.
Adapted "$("#webcam-activate")" and "$(options.fileSelector)" functions for both Version 1 and Version 2
@gitpod-io
Copy link

gitpod-io bot commented Aug 8, 2022

@Forchapeatl
Copy link
Collaborator Author

Hello @stephaniequintana , Here is the clean PR for video upload and processing. During the drag and drop please drop the video file as id= "localVideo" and append it under this element . Thank you.

<div id="video-container" style="display:none"></div>

@Forchapeatl
Copy link
Collaborator Author

@jywarren , @TildaDares please for your feedback on this PR

@Forchapeatl Forchapeatl requested a review from jywarren August 11, 2022 03:40
@@ -22,7 +22,7 @@
<script src="node_modules/webrtc-adapter/out/adapter.js"></script>
<script src="node_modules/getusermedia-js/dist/getUserMedia.min.js"></script>

<script src="dist/infragram2.js"></script>
<script src="dist/infragram.js"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very cool! So do we need to keep dist/infragram2.js now? Just curious, thanks for all the thorough testing! I'd love to hear from @stephaniequintana on this as well, just a review would be helpful! Thank you!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's no need to keep the dist/infragram2.js file.In the mean time please permit me move forward with the merge.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stephaniequintana, your review is very important on this topic. Please I will consider and apply it on the next PR. For now please let me merge this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, sounds good - @Forchapeatl can you delete dist/infragram2.js in a new PR?

@Forchapeatl Forchapeatl merged commit e31f893 into main Aug 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GSoC Infragram.org full-screen UI and video upload Discussion and Planning
2 participants