Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion samples/qa-videoplayer/src/views/MainPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ const SelectableVideoPlayer = (props) => {
<MediaControls>
<Button onClick={handleToggleSelection} selected={selecting}>{selecting ? 'Play Loop' : 'Set End Time'}</Button>
</MediaControls>
<source src="https://media.w3.org/2010/05/video/movie_300.mp4" />
<source
// Big Buck Bunny (CC BY 3.0) - Blender Foundation, https://www.blender.org
src="https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4"
/>
</VideoPlayer>
);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {VideoPlayer} from '@enact/limestone/VideoPlayer';

const src = 'https://media.w3.org/2010/05/sintel/trailer.mp4';
// Big Buck Bunny (CC BY 3.0) - Blender Foundation, https://www.blender.org
const src = 'https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4';

const UseCaseVideoPlayer = () => {
return (
Expand Down
9 changes: 6 additions & 3 deletions samples/sampler/stories/default/MediaOverlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ const prop = {
marqueeOn: ['focus', 'hover', 'render'],
textAlign: ['start', 'center', 'end'],
videos: {
Sintel: 'https://media.w3.org/2010/05/sintel/trailer.mp4',
// Big Buck Bunny (CC BY 3.0) - Blender Foundation, https://www.blender.org
'Big Buck Bunny': 'https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4',
// Cosmos Laundromat (CC BY 4.0) - Blender Foundation, https://www.blender.org
'Cosmos Laundromat': 'https://media.xiph.org/cosmoslaundromat/Pilot_Trailer_Cosmos_Laundromat.mp4',
VideoTest: 'https://media.w3.org/2010/05/video/movie_300.mp4',
// Elephants Dream (CC BY 3.0) - Blender Foundation, https://www.blender.org
'Elephants Dream': 'https://archive.org/download/ElephantsDream/ed_1024_512kb.mp4',
// Purposefully not a video to demonstrate source error state
'Bad Video Source': 'https://github.com/mderrick/react-html5video'
},
Expand Down Expand Up @@ -85,7 +88,7 @@ text('subtitle', _MediaOverlay, Config, '07:00 AM - 08:00 AM');
select('text', _MediaOverlay, prop.strings, Config);
select('textAlign', _MediaOverlay, prop.textAlign, Config);
text('title', _MediaOverlay, Config, 'Program Name');
select('source', _MediaOverlay, prop.videos, Config, prop.videos.Sintel);
select('source', _MediaOverlay, prop.videos, Config, prop.videos['Big Buck Bunny']);

_MediaOverlay.storyName = 'MediaOverlay';
_MediaOverlay.parameters = {
Expand Down
17 changes: 10 additions & 7 deletions samples/sampler/stories/default/VideoPlayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,22 @@ updateDataSize(size);
// Set up some defaults for info and controls
const prop = {
moreButtonColor: ['', 'red', 'green', 'yellow', 'blue'],
videoTitles: ['Sintel', 'Cosmos Laundromat', 'VideoTest', 'Bad Video Source'],
videoTitles: ['Big Buck Bunny', 'Cosmos Laundromat', 'Elephants Dream', 'Bad Video Source'],
videos: {
Sintel: 'https://media.w3.org/2010/05/sintel/trailer.mp4',
// Big Buck Bunny (CC BY 3.0) - Blender Foundation, https://www.blender.org
'Big Buck Bunny': 'https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4',
// Cosmos Laundromat (CC BY 4.0) - Blender Foundation, https://www.blender.org
'Cosmos Laundromat': 'https://media.xiph.org/cosmoslaundromat/Pilot_Trailer_Cosmos_Laundromat.mp4',
VideoTest: 'https://media.w3.org/2010/05/video/movie_300.mp4',
// Elephants Dream (CC BY 3.0) - Blender Foundation, https://www.blender.org
'Elephants Dream': 'https://archive.org/download/ElephantsDream/ed_1024_512kb.mp4',
// Purposefully not a video to demonstrate source error state
'Bad Video Source': 'https://github.com/mderrick/react-html5video'
},
posters: {
Sintel: 'https://media.w3.org/2010/05/sintel/poster.png',
'Big Buck Bunny': 'https://upload.wikimedia.org/wikipedia/commons/c/c5/Big_buck_bunny_poster_big.jpg',
'Cosmos Laundromat': 'https://media.xiph.org/cosmoslaundromat/Cosmos_Laundromat_1-2k-png/07580.png',
VideoTest: 'https://media.w3.org/2010/05/video/poster.png',
'Bad Video Source': 'https://media.w3.org/2010/05/video/poster.png'
'Elephants Dream': 'https://upload.wikimedia.org/wikipedia/commons/e/e8/Elephants_Dream_s5_both.jpg',
'Bad Video Source': ''
},
events: [
'onAbort',
Expand Down Expand Up @@ -213,7 +216,7 @@ export const _VideoPlayer = (args) => {
);
};

select('source', _VideoPlayer, prop.videoTitles, Config, 'Sintel');
select('source', _VideoPlayer, prop.videoTitles, Config, 'Big Buck Bunny');
range('video scale', _VideoPlayer, Config, {min: 0.05, max: 1, step: 0.01}, 1);
number('autoCloseTimeout', _VideoPlayer, Config, 7000);
text('backButtonAriaLabel', _VideoPlayer, Config, 'go to previous');
Expand Down
13 changes: 8 additions & 5 deletions samples/sampler/stories/qa/VideoPlayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ class VideoSourceSwap extends Component {
checkPropTypes(this, this.props);

this.state = {
videoTitles: ['Cosmos Laundromat', 'Sintel', 'VideoTest'],
videoTitles: ['Cosmos Laundromat', 'Big Buck Bunny', 'Elephants Dream'],
playlist: [
// Cosmos Laundromat (CC BY 4.0) - Blender Foundation, https://www.blender.org
'https://media.xiph.org/cosmoslaundromat/Pilot_Trailer_Cosmos_Laundromat.mp4',
'https://media.w3.org/2010/05/sintel/trailer.mp4',
'https://media.w3.org/2010/05/video/movie_300.mp4'
// Big Buck Bunny (CC BY 3.0) - Blender Foundation, https://www.blender.org
'https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4',
// Elephants Dream (CC BY 3.0) - Blender Foundation, https://www.blender.org
'https://archive.org/download/ElephantsDream/ed_1024_512kb.mp4'
],
cursor: 0,
preloadCursor: 1
Expand Down Expand Up @@ -238,10 +241,10 @@ class VideoPlayerWithExpandedMediaControls extends Component {
feedbackHideDelay={0}
muted
ref={this.setVideoPlayer}
title="Sintel"
title="Big Buck Bunny"
>
<Video>
<source src="https://media.w3.org/2010/05/sintel/trailer.mp4" />
<source src="https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4" />
</Video>
</VideoPlayer>
</div>
Expand Down
7 changes: 4 additions & 3 deletions tests/ui/apps/MediaOverlay/MediaOverlay-View.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import spotlight from '@enact/spotlight';
spotlight.setPointerMode(false);

const videos = {
Sintel: 'https://media.w3.org/2010/05/sintel/trailer.mp4'
// Big Buck Bunny (CC BY 3.0) - Blender Foundation, https://www.blender.org
BigBuckBunny: 'https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4'
};

const app = (props) => <div {...props}>
Expand All @@ -22,7 +23,7 @@ const app = (props) => <div {...props}>
text="Media Overlay text"
title="Media Overlay title"
>
<source src={videos.Sintel} />
<source src={videos.BigBuckBunny} />
</MediaOverlay>
<MediaOverlay
id="mediaOverlay2LongText"
Expand All @@ -36,7 +37,7 @@ const app = (props) => <div {...props}>
text="Media Overlay extremely long text"
title="Media Overlay very long title"
>
<source src={videos.Sintel} />
<source src={videos.BigBuckBunny} />
</MediaOverlay>
</div>;

Expand Down
Loading