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

Retrieve Extended Tracks Data from Streaming Server #75

Merged
merged 22 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from 11 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
45 changes: 45 additions & 0 deletions src/TizenVideo/TizenVideo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var cloneDeep = require('lodash.clonedeep');
var deepFreeze = require('deep-freeze');
var Color = require('color');
var ERROR = require('../error');
var getTracksData = require('../tracksData');

function TizenVideo(options) {
options = options || {};
Expand Down Expand Up @@ -148,6 +149,24 @@ function TizenVideo(options) {
playbackSpeed: false
};

var gotTraktData = false;
var tracksData = { audio: [], subs: [] };

function retrieveExtendedTracks() {
if (!gotTraktData && stream !== null) {
gotTraktData = true;
getTracksData(stream.url, function(resp) {
tracksData = resp;
if (((tracksData || {}).subs || []).length) {
onPropChanged('subtitlesTracks');
}
if (((tracksData || {}).audio || []).length) {
onPropChanged('audioTracks');
}
});
}
}

function getProp(propName) {
switch (propName) {
case 'stream': {
Expand Down Expand Up @@ -213,6 +232,14 @@ function TizenVideo(options) {
extra = JSON.parse(textTrack.extra_info);
} catch(e) {}
var textTrackLang = typeof extra.track_lang === 'string' && extra.track_lang.length > 0 ? extra.track_lang.trim() : null;
if (((tracksData || {}).subs || []).length) {
var extendedTrackData = tracksData.subs.find(function(el) {
return (el || {})['StreamOrder'] === textTrack.index;
});
if ((extendedTrackData || {})['Language']) {
textTrackLang = extendedTrackData['Language'];
}
}
textTracks.push({
id: textTrackId,
lang: textTrackLang,
Expand Down Expand Up @@ -307,6 +334,14 @@ function TizenVideo(options) {
extra = JSON.parse(audioTrack.extra_info);
} catch(e) {}
var audioTrackLang = typeof extra.language === 'string' && extra.language.length > 0 ? extra.language : null;
if (((tracksData || {}).audio || []).length) {
var extendedTrackData = tracksData.audio.find(function(el) {
return (el || {})['StreamOrder'] === audioTrack.index;
});
if ((extendedTrackData || {})['Language']) {
audioTrackLang = extendedTrackData['Language'];
}
}
audioTracks.push({
id: audioTrackId,
lang: audioTrackLang,
Expand Down Expand Up @@ -581,6 +616,16 @@ function TizenVideo(options) {
}
onPropChanged('buffering');

var tizenVersion = false;

try {
tizenVersion = parseFloat(global.tizen.systeminfo.getCapability('http://tizen.org/feature/platform.version'));
} catch(e) {}

if (!tizenVersion || tizenVersion >= 6) {
retrieveExtendedTracks();
}

window.webapis.avplay.open(stream.url);
window.webapis.avplay.setDisplayRect(0, 0, window.innerWidth, window.innerHeight);
window.webapis.avplay.setDisplayMethod('PLAYER_DISPLAY_MODE_LETTER_BOX');
Expand Down
17 changes: 17 additions & 0 deletions src/tracksData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = function(url, cb) {
fetch('http://127.0.0.1:11470/tracks/'+encodeURIComponent(url)).then(function(resp) {
resp.json().then(function(tracks) {
var audioTracks = tracks.filter(function(el) { return el['@type'] === 'Audio'; });
var subsTracks = tracks.filter(function(el) { return el['@type'] === 'Text'; });
cb({ audio: audioTracks, subs: subsTracks });
}).catch(function(err) {
// eslint-disable-next-line no-console
console.error(err);
cb({ audio: [], subs: [] });
});
}).catch(function(err) {
// eslint-disable-next-line no-console
console.error(err);
cb({ audio: [], subs: [] });
});
};
Loading