tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '2acd3261c49e846c46f05e2223a685797cb15f06'

This commit is contained in:
PrestonN 2021-10-12 17:05:21 -04:00
parent 36e8e7b7aa 2acd3261c4
commit dc2ff5e009
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/components/ft-video-player/ft-video-player.js
View File

@ -1070,7 +1070,7 @@ export default Vue.extend({
this.activeAdaptiveFormats.push(adaptiveFormat) this.activeAdaptiveFormats.push(adaptiveFormat)
fps = adaptiveFormat.fps fps = adaptiveFormat.fps ? adaptiveFormat.fps : 30
qualityLabel = adaptiveFormat.qualityLabel ? adaptiveFormat.qualityLabel : quality.height + 'p' qualityLabel = adaptiveFormat.qualityLabel ? adaptiveFormat.qualityLabel : quality.height + 'p'
bitrate = quality.bitrate bitrate = quality.bitrate
} else { } else {

12
src/renderer/views/Watch/Watch.js
View File

@ -431,12 +431,12 @@ export default Vue.extend({
} }
if (typeof result.player_response.streamingData.adaptiveFormats !== 'undefined') { if (typeof result.player_response.streamingData.adaptiveFormats !== 'undefined') {
const adaptiveFormats = result.player_response.streamingData.adaptiveFormats
this.adaptiveFormats = adaptiveFormats
if (this.proxyVideos) { if (this.proxyVideos) {
this.dashSrc = await this.createInvidiousDashManifest() this.dashSrc = await this.createInvidiousDashManifest()
} else { } else {
const adaptiveFormats = result.player_response.streamingData.adaptiveFormats
this.dashSrc = await this.createLocalDashManifest(adaptiveFormats) this.dashSrc = await this.createLocalDashManifest(adaptiveFormats)
this.adaptiveFormats = adaptiveFormats
} }
this.audioSourceList = result.player_response.streamingData.adaptiveFormats.filter((format) => { this.audioSourceList = result.player_response.streamingData.adaptiveFormats.filter((format) => {
@ -544,7 +544,11 @@ export default Vue.extend({
this.videoPublished = result.published * 1000 this.videoPublished = result.published * 1000
this.videoDescriptionHtml = result.descriptionHtml this.videoDescriptionHtml = result.descriptionHtml
this.recommendedVideos = result.recommendedVideos this.recommendedVideos = result.recommendedVideos
this.adaptiveFormats = result.adaptiveFormats this.adaptiveFormats = result.adaptiveFormats.map((format) => {
format.bitrate = parseInt(format.bitrate)
format.height = parseInt(format.resolution.replace('p', ''))
return format
})
this.isLive = result.liveNow this.isLive = result.liveNow
this.captionHybridList = result.captions.map(caption => { this.captionHybridList = result.captions.map(caption => {
caption.url = this.currentInvidiousInstance + caption.url caption.url = this.currentInvidiousInstance + caption.url
@ -1040,7 +1044,7 @@ export default Vue.extend({
}, },
createInvidiousDashManifest: function () { createInvidiousDashManifest: function () {
let url = `${this.currentInvidiousInstance}/api/manifest/dash/id/${this.videoId}.mpd` let url = `${this.currentInvidiousInstance}/api/manifest/dash/id/${this.videoId}`
if (this.proxyVideos || !this.usingElectron) { if (this.proxyVideos || !this.usingElectron) {
url = url + '?local=true' url = url + '?local=true'