PLAT-22530: support captions in Simulive #10302
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
get the entry's captionAssets and put it in the serveFlavor's json for the Simulive flow
use languageCodeManager to get the language code
…d include the captionAssets inside
change getClipData to receive asset instead of flavorAsset , and change hasAudio to it's opposite - addSilence (put true in case of asset different than flavorAsset)
…default language for flavorAsset without language specified (will add the captions to the json also in case of undefined language)
remove mergeAssets function as not needed (peers don't return null) avoid insert caption to json in case of 'und' language
| @@ -1427,15 +1427,15 @@ public static function getPlaylistDataFromEntries($entries, $flavorParamsIds, $c | |||
| return array($entryIds, $durations, $mediaEntry, $captionFiles); | |||
| } | |||
|
|
|||
| protected static function getCaptionFilesForEntryIds($entryIds, $captionLanguages) | |||
| public static function getCaptionFilesForEntryIds($entryIds, $captionLanguages, $allLanguages = false) | |||
There was a problem hiding this comment.
No need to add another flag to the function, we can set that $captionLanguages is default to null, and if it is not set that we grab all langueges
There was a problem hiding this comment.
I'm removing this change, it isn't needed anymore (was needed before and forgot to remove it)
alpha/apps/kaltura/modules/extwidget/actions/serveFlavorAction.class.php
Show resolved
Hide resolved
remove unnecessary array_merge in serveFlavorAction remove change of getCaptionFilesForEntryIds (as not used anymore)
|
reviewed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
get the entry's captionAssets and put it in the serveFlavor's json for the Simulive flow