Skip to content

Commit 1cb67ab

Browse files
brandonocaseybrandonocasey
authored
refactor: move sourceset code out of tech (#5037)
1 parent bc2da7c commit 1cb67ab

2 files changed

Lines changed: 88 additions & 78 deletions

File tree

‎src/js/tech/html5.js‎

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {assign} from '../utils/obj';
1313
import mergeOptions from '../utils/merge-options.js';
1414
import toTitleCase from '../utils/to-title-case.js';
1515
import {NORMAL as TRACK_TYPES} from '../tracks/track-types';
16+
import setupSourceset from './setup-sourceset';
1617

1718
/**
1819
* HTML5 Media Controller - Wrapper for HTML5 Media API
@@ -128,84 +129,7 @@ class Html5 extends Tech {
128129
* the source is changed. Fires `sourceset` just after the source has changed
129130
*/
130131
setupSourcesetHandling_() {
131-
if (!this.featuresSourceset) {
132-
return;
133-
}
134-
135-
const el = this.el();
136-
137-
// we need to fire sourceset when the player is ready
138-
// if we find that the media element had a src when it was
139-
// given to us and that tech element is not in a stalled state
140-
if (el.src || el.currentSrc && this.el().initNetworkState_ !== 3) {
141-
this.triggerSourceset(el.src || el.currentSrc);
142-
}
143-
144-
const proto = window.HTMLMediaElement.prototype;
145-
let srcDescriptor = {};
146-
147-
// preserve getters/setters already on `el.src` if they exist
148-
if (Object.getOwnPropertyDescriptor(el, 'src')) {
149-
srcDescriptor = Object.getOwnPropertyDescriptor(el, 'src');
150-
} else if (Object.getOwnPropertyDescriptor(proto, 'src')) {
151-
srcDescriptor = mergeOptions(srcDescriptor, Object.getOwnPropertyDescriptor(proto, 'src'));
152-
}
153-
154-
if (!srcDescriptor.get) {
155-
srcDescriptor.get = function() {
156-
return proto.getAttribute.call(this, 'src');
157-
};
158-
}
159-
160-
if (!srcDescriptor.set) {
161-
srcDescriptor.set = function(v) {
162-
return proto.setAttribute.call(this, 'src', v);
163-
};
164-
}
165-
166-
if (typeof srcDescriptor.enumerable === 'undefined') {
167-
srcDescriptor.enumerable = true;
168-
}
169-
170-
Object.defineProperty(el, 'src', {
171-
get: srcDescriptor.get.bind(el),
172-
set: (v) => {
173-
const retval = srcDescriptor.set.call(el, v);
174-
175-
this.triggerSourceset(v);
176-
177-
return retval;
178-
},
179-
configurable: true,
180-
enumerable: srcDescriptor.enumerable
181-
});
182-
183-
const oldSetAttribute = el.setAttribute;
184-
185-
el.setAttribute = (n, v) => {
186-
const retval = oldSetAttribute.call(el, n, v);
187-
188-
if (n === 'src') {
189-
this.triggerSourceset(v);
190-
}
191-
192-
return retval;
193-
};
194-
195-
const oldLoad = el.load;
196-
197-
el.load = () => {
198-
const retval = oldLoad.call(el);
199-
200-
// if `el.src` is set, that source will be loaded
201-
// otherwise, we can't know for sure what source will be set because
202-
// source elements will be used but implementing the source selection algorithm
203-
// is laborious and asynchronous, so,
204-
// instead return an empty string to basically indicate source may change
205-
this.triggerSourceset(el.src || '');
206-
207-
return retval;
208-
};
132+
setupSourceset(this);
209133
}
210134

211135
/**

‎src/js/tech/setup-sourceset.js‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
import window from 'global/window';
2+
import mergeOptions from '../utils/merge-options';
3+
4+
const setupSourceset = function(tech) {
5+
6+
if (!tech.featuresSourceset) {
7+
return;
8+
}
9+
10+
const el = tech.el();
11+
12+
// we need to fire sourceset when the player is ready
13+
// if we find that the media element had a src when it was
14+
// given to us and that tech element is not in a stalled state
15+
if (el.src || el.currentSrc && tech.el().initNetworkState_ !== 3) {
16+
tech.triggerSourceset(el.src || el.currentSrc);
17+
}
18+
19+
const proto = window.HTMLMediaElement.prototype;
20+
let srcDescriptor = {};
21+
22+
// preserve getters/setters already on `el.src` if they exist
23+
if (Object.getOwnPropertyDescriptor(el, 'src')) {
24+
srcDescriptor = Object.getOwnPropertyDescriptor(el, 'src');
25+
} else if (Object.getOwnPropertyDescriptor(proto, 'src')) {
26+
srcDescriptor = mergeOptions(srcDescriptor, Object.getOwnPropertyDescriptor(proto, 'src'));
27+
}
28+
29+
if (!srcDescriptor.get) {
30+
srcDescriptor.get = function() {
31+
return proto.getAttribute.call(el, 'src');
32+
};
33+
}
34+
35+
if (!srcDescriptor.set) {
36+
srcDescriptor.set = function(v) {
37+
return proto.setAttribute.call(el, 'src', v);
38+
};
39+
}
40+
41+
if (typeof srcDescriptor.enumerable === 'undefined') {
42+
srcDescriptor.enumerable = true;
43+
}
44+
45+
Object.defineProperty(el, 'src', {
46+
get: srcDescriptor.get.bind(el),
47+
set: (v) => {
48+
const retval = srcDescriptor.set.call(el, v);
49+
50+
tech.triggerSourceset(v);
51+
52+
return retval;
53+
},
54+
configurable: true,
55+
enumerable: srcDescriptor.enumerable
56+
});
57+
58+
const oldSetAttribute = el.setAttribute;
59+
60+
el.setAttribute = (n, v) => {
61+
const retval = oldSetAttribute.call(el, n, v);
62+
63+
if (n === 'src') {
64+
tech.triggerSourceset(v);
65+
}
66+
67+
return retval;
68+
};
69+
70+
const oldLoad = el.load;
71+
72+
el.load = () => {
73+
const retval = oldLoad.call(el);
74+
75+
// if `el.src` is set, that source will be loaded
76+
// otherwise, we can't know for sure what source will be set because
77+
// source elements will be used but implementing the source selection algorithm
78+
// is laborious and asynchronous, so,
79+
// instead return an empty string to basically indicate source may change
80+
tech.triggerSourceset(el.src || '');
81+
82+
return retval;
83+
};
84+
};
85+
86+
export default setupSourceset;

0 commit comments

Comments
 (0)