kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #4510 from Bnyro/master

Browse Source 
feat: support for selecting auto-generated captions
This commit is contained in:
Bnyro 2023-08-16 17:56:01 +02:00 committed by GitHub
commit 86a00f4702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
View File

@ -53,6 +53,7 @@ object PlayerHelper {
"preview" "preview"
) )
const val SPONSOR_HIGHLIGHT_CATEGORY = "poi_highlight" const val SPONSOR_HIGHLIGHT_CATEGORY = "poi_highlight"
const val ROLE_FLAG_AUTO_GEN_SUBTITLE = C.ROLE_FLAG_SUPPLEMENTARY
/** /**
* Create a base64 encoded DASH stream manifest * Create a base64 encoded DASH stream manifest

37
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -60,6 +60,7 @@ import com.github.libretube.api.obj.Message
import com.github.libretube.api.obj.Segment import com.github.libretube.api.obj.Segment
import com.github.libretube.api.obj.StreamItem import com.github.libretube.api.obj.StreamItem
import com.github.libretube.api.obj.Streams import com.github.libretube.api.obj.Streams
import com.github.libretube.api.obj.Subtitle
import com.github.libretube.compat.PictureInPictureCompat import com.github.libretube.compat.PictureInPictureCompat
import com.github.libretube.compat.PictureInPictureParamsCompat import com.github.libretube.compat.PictureInPictureParamsCompat
import com.github.libretube.constants.IntentData import com.github.libretube.constants.IntentData
@ -234,8 +235,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
} }
} }
else -> { else -> Unit
}
} }
} }
} }
@ -757,7 +757,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
if (binding.playerMotionLayout.progress != 1.0f) { if (binding.playerMotionLayout.progress != 1.0f) {
// show controllers when not in picture in picture mode // show controllers when not in picture in picture mode
val inPipMode = PlayerHelper.pipEnabled && val inPipMode = PlayerHelper.pipEnabled &&
PictureInPictureCompat.isInPictureInPictureMode(requireActivity()) PictureInPictureCompat.isInPictureInPictureMode(requireActivity())
if (!inPipMode) { if (!inPipMode) {
binding.player.useController = true binding.player.useController = true
} }
@ -1005,8 +1005,8 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
}.orEmpty() }.orEmpty()
binding.additionalVideoInfo.text = binding.additionalVideoInfo.text =
"${context?.getString(R.string.category)}: ${streams.category}\n" + "${context?.getString(R.string.category)}: ${streams.category}\n" +
"${context?.getString(R.string.license)}: ${streams.license}\n" + "${context?.getString(R.string.license)}: ${streams.license}\n" +
"${context?.getString(R.string.visibility)}: $visibility" "${context?.getString(R.string.visibility)}: $visibility"
if (streams.tags.isNotEmpty()) { if (streams.tags.isNotEmpty()) {
binding.tagsRecycler.layoutManager = binding.tagsRecycler.layoutManager =
@ -1212,7 +1212,11 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
} }
private fun getSubtitleConfigs(): List<SubtitleConfiguration> = streams.subtitles.map { private fun getSubtitleConfigs(): List<SubtitleConfiguration> = streams.subtitles.map {
SubtitleConfiguration.Builder(it.url!!.toUri()).setLanguage(it.code) val roleFlags =
if (it.autoGenerated == true) PlayerHelper.ROLE_FLAG_AUTO_GEN_SUBTITLE else C.ROLE_FLAG_CAPTION
SubtitleConfiguration.Builder(it.url!!.toUri())
.setRoleFlags(roleFlags)
.setLanguage(it.code)
.setMimeType(it.mimeType).build() .setMimeType(it.mimeType).build()
} }
@ -1421,14 +1425,23 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
return return
} }
val subtitles = streams.subtitles.map { it.name!! to it.code!! } val subtitles = listOf(Subtitle(name = getString(R.string.none))).plus(streams.subtitles)
val subtitleOptions = listOf(getString(R.string.none) to "").plus(subtitles)
BaseBottomSheet() BaseBottomSheet()
.setSimpleItems(subtitleOptions.map { it.first }) { index -> .setSimpleItems(subtitles.map {
val subtitleLanguage = subtitleOptions.getOrNull(index)?.second if (it.autoGenerated != true) it.name!!
updateCaptionsLanguage(subtitleLanguage) else "${it.name} (${getString(R.string.auto_generated)})"
this.captionLanguage = subtitleLanguage }) { index ->
val subtitle = subtitles.getOrNull(index) ?: return@setSimpleItems
updateCaptionsLanguage(subtitle.code)
trackSelector.updateParameters {
trackSelector.updateParameters {
val roleFlags = if (subtitle.autoGenerated != true) C.ROLE_FLAG_CAPTION
else PlayerHelper.ROLE_FLAG_AUTO_GEN_SUBTITLE
this.setPreferredTextRoleFlags(roleFlags)
}
}
this.captionLanguage = subtitle.code
} }
.show(childFragmentManager) .show(childFragmentManager)
} }

2
app/src/main/res/values/strings.xml
View File

@ -462,6 +462,8 @@
<string name="continue_watching">Continue watching</string> <string name="continue_watching">Continue watching</string>
<string name="no_chapter">No chapter</string> <string name="no_chapter">No chapter</string>
<string name="screen_orientation">Screen orientation</string> <string name="screen_orientation">Screen orientation</string>
<string name="auto_generated">auto-generated</string>
<!-- Notification channel strings --> <!-- Notification channel strings -->
<string name="download_channel_name">Download Service</string> <string name="download_channel_name">Download Service</string>
<string name="download_channel_description">Shows a notification when downloading media.</string> <string name="download_channel_description">Shows a notification when downloading media.</string>