Skip to content

Instantly share code, notes, and snippets.

@KarneAsada
Created October 31, 2018 01:43
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save KarneAsada/4be21b678e0307f45d8848e48e71cc9d to your computer and use it in GitHub Desktop.
Save KarneAsada/4be21b678e0307f45d8848e48e71cc9d to your computer and use it in GitHub Desktop.
diff --git a/server/controllers/manifest.js b/server/controllers/manifest.js
index 94b3ab7..b28956f 100644
--- a/server/controllers/manifest.js
+++ b/server/controllers/manifest.js
@@ -2,7 +2,7 @@ const HLS = require('hls-parser')
const config = require('../../config')
const Story = require('../models/story')
const Video = require('../models/video')
-const transcoderProfiles = require('../../config/transcoder.js')
+const transcoderProfiles = require('../../config/transcoder.js')[config.transcoderProfile]
const StoryChapterVersion = require('../models/storychapterversion')
const { MasterPlaylist, MediaPlaylist, Variant, Segment } = HLS.types
@@ -176,10 +176,10 @@ controllerManifest.storyMainPlaylist = async (req, res) => {
const variants = []
let i = 0
- const vl = transcoderProfiles.default.levels.length
+ const vl = transcoderProfiles.levels.length
for (i; i < vl; i++) {
- const level = transcoderProfiles.default.levels[i]
+ const level = transcoderProfiles.levels[i]
const variant = new Variant({
bandwidth : level.bitrate,
uri : `${config.HLS_SERVER}/hls/media/v2/${storyId}/${level.name}.m3u8`,
@@ -242,17 +242,18 @@ controllerManifest.storyMediaPlaylist = async (req, res) => {
oneChapterVersionId
)
- // Skip Image Chapters
- const imageObj = oneChapterVersion.renderedImage || oneChapterVersion.baseImage
- if (imageObj && imageObj.path) {
- return
- }
-
const videoObjId = oneChapterVersion.intermediateVideo
const videoObj = await Video.getVideoObjById(videoObjId)
// Video has intermediate video check.
if (!videoObj) {
+ // Don't emit error is this is an image chapter
+ // @todo remove once image chapters are deprecated
+ const imageObj = oneChapterVersion.renderedImage || oneChapterVersion.baseImage
+ if (imageObj && imageObj.path) {
+ return
+ }
+
console.error(`Video ${videoObj._id} has no intermediate video.`)
return
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment