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

Media: Skip video optimization based on criteria #11454

Merged
merged 36 commits into from
Jul 20, 2022
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5c62058
Allow skipping video optimization based on criteria
swissspidy May 8, 2022
d3f160a
Update tests
swissspidy May 9, 2022
a00e4dd
Use optional chaining for trim
swissspidy May 9, 2022
cf508e4
Merge branch 'main' into try/11405-mediainfo
swissspidy Jun 15, 2022
29872ea
Merge branch 'main' into try/11405-mediainfo
swissspidy Jun 17, 2022
d3ba75f
Merge branch 'main' into try/11405-mediainfo
swissspidy Jun 24, 2022
1dfcc24
Add tests for `isConsideredOptimized`
swissspidy Jun 24, 2022
b66ccd1
More getFileInfo tests
swissspidy Jun 24, 2022
e217998
Track event
swissspidy Jun 26, 2022
5db096c
Do not override pre-existing mediaSource if provided
swissspidy Jun 26, 2022
6fb1f07
Merge branch 'main' into try/11405-mediainfo
swissspidy Jun 26, 2022
6ade9d4
Mock getTimeTracker
swissspidy Jun 26, 2022
f938e72
Merge branch 'main' into try/11405-mediainfo
swissspidy Jun 27, 2022
0ac1532
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 1, 2022
cbd8e59
Add todo
swissspidy Jul 1, 2022
1030d79
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 4, 2022
8b65a5c
Refactor to allow for short circuiting
swissspidy Jul 4, 2022
438b837
Use const
swissspidy Jul 4, 2022
e306432
Take duration into account, add explanation
swissspidy Jul 4, 2022
344e2aa
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 4, 2022
005d50a
Merge branch 'main' into try/11405-mediainfo
spacedmonkey Jul 6, 2022
332592b
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 7, 2022
f6fb6c7
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 8, 2022
212fa86
Fix image stretching in library
swissspidy Jul 12, 2022
b48aa48
New pending/preparing states
swissspidy Jul 12, 2022
8892a7d
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 12, 2022
4c968ca
Slight rewrite in `useMediaInfo`
swissspidy Jul 12, 2022
173b808
Fix dimension check
swissspidy Jul 12, 2022
f9d6ad2
Reject small frame rate
swissspidy Jul 13, 2022
e2b55ae
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 13, 2022
dba641b
Lint fix
swissspidy Jul 13, 2022
2412dc9
Fix dimensions check
swissspidy Jul 13, 2022
4fa932d
Update comment
swissspidy Jul 13, 2022
f4f9b48
Add new states to selectors
swissspidy Jul 13, 2022
c637c72
Fix incorrect comparison operators
swissspidy Jul 18, 2022
627a736
Merge branch 'main' into try/11405-mediainfo
swissspidy Jul 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions includes/Admin/Editor.php
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ public function get_editor_settings(): array {
'encodeMarkup' => $this->decoder->supports_decoding(),
'metaBoxes' => $this->meta_boxes->get_meta_boxes_per_location(),
'ffmpegCoreUrl' => trailingslashit( WEBSTORIES_CDN_URL ) . 'js/@ffmpeg/core@0.10.0/dist/ffmpeg-core.js',
'mediainfoUrl' => trailingslashit( WEBSTORIES_CDN_URL ) . 'js/mediainfo.js@0.1.7/dist/mediainfo.min.js',
'flags' => array_merge(
$this->experiments->get_experiment_statuses( 'general' ),
$this->experiments->get_experiment_statuses( 'editor' )
Expand Down
6 changes: 6 additions & 0 deletions packages/story-editor/src/app/media/useUploadMedia.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
localStore,
LOCAL_STORAGE_PREFIX,
} from '@googleforcreators/design-system';
import { isAnimatedGif } from '@googleforcreators/media';

/**
* Internal dependencies
Expand Down Expand Up @@ -301,6 +302,10 @@ function useUploadMedia({
resource = newResource;
}

const isGif =
resource.mimeType === 'image/gif' &&
isAnimatedGif(await file.arrayBuffer());

// Treat incoming video as a gif if wanted, used by media recording.
if (additionalData?.isGif) {
resource = {
Expand All @@ -327,6 +332,7 @@ function useUploadMedia({
trimData,
originalResourceId,
elementId,
isAnimatedGif: isGif,
});
})
);
Expand Down
Loading