-
Notifications
You must be signed in to change notification settings - Fork 15
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
Add screenshot button to video annotator #1004
Open
lehecht
wants to merge
6
commits into
master
Choose a base branch
from
screenshot-videos
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1f23be2
Add screenshot function to videos
lehecht 4a7684d
Check for non-CORS enabled videos
lehecht 5397a20
Minor changes
lehecht e511238
Reduce redundant code
lehecht 6233512
Remove unused code
lehecht 7715e5e
Check if video source has CORS enabled
lehecht File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,8 +99,28 @@ export default { | |
swappingLabel: false, | ||
disableJobTracking: false, | ||
supportsJumpByFrame: false, | ||
hasCrossOriginError: false, | ||
}; | ||
}, | ||
provide() { | ||
const appData = {} | ||
|
||
let videoInfo = {}; | ||
videoInfo['currentId'] = biigle.$require('videos.id'); | ||
videoInfo['ids'] = biigle.$require('videos.videoIds'); | ||
videoInfo['filenames'] = biigle.$require('videos.videoFilenames'); | ||
videoInfo['type'] = 'video'; | ||
videoInfo['fileChangedEvent'] = 'video.change'; | ||
videoInfo['mapChangedEvent'] = 'videos.map.init'; | ||
|
||
// Need defineProperty to maintain reactivity. | ||
// See https://stackoverflow.com/questions/65718651/how-do-i-make-vue-2-provide-inject-api-reactive | ||
Object.defineProperty(appData, "info", { | ||
get: () => videoInfo, | ||
}) | ||
|
||
return { 'files': appData }; | ||
}, | ||
computed: { | ||
selectedAnnotations() { | ||
return this.filteredAnnotations.filter((a) => a.isSelected); | ||
|
@@ -560,7 +580,19 @@ export default { | |
.then(this.maybeFocusInitialAnnotation) | ||
.then(this.maybeInitCurrentTime); | ||
|
||
this.video.src = this.videoFileUri.replace(':id', video.id); | ||
let self = this; | ||
fetch(this.videoFileUri.replace(':id', video.id)) | ||
.then((res) => { | ||
res.blob().then(function (blob) { | ||
let urlCreator = window.URL || window.webkitURL; | ||
self.video.src = urlCreator.createObjectURL(blob); | ||
}); | ||
}) | ||
.catch((e) => { | ||
// Access on non-CORS enabled file causes TypeError | ||
this.hasCrossOriginError = e instanceof TypeError; | ||
self.video.src = self.videoFileUri.replace(':id', video.id); | ||
}); | ||
Comment on lines
+584
to
+595
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This tries to download the whole video. Usually the video is fetched dynamically through a series of HTTP range requests, which is crucial here. You need another method to detect CORS. Maybe create a small canvas element and try to read some data from the video into it? |
||
|
||
return promise; | ||
}, | ||
|
@@ -692,6 +724,9 @@ export default { | |
UrlParams.set(params); | ||
}, | ||
}, | ||
videoId() { | ||
Events.$emit('video.change', this.videoId, this.video); | ||
} | ||
}, | ||
created() { | ||
let shapes = biigle.$require('videos.shapes'); | ||
|
@@ -752,6 +787,8 @@ export default { | |
if(navigator.userAgent.toLowerCase().indexOf('firefox') > -1){ | ||
Messages.danger('Current versions of the Firefox browser may not show the correct video frame for a given time. Annotations may be placed incorrectly. Please consider using Chrome until the issue is fixed in Firefox. Learn more on https://github.com/biigle/core/issues/391.'); | ||
} | ||
Events.$emit('videos.map.init', this.$refs.videoScreen.map); | ||
|
||
}, | ||
}; | ||
</script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where do you use
type
?