kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 07:50:31 +05:30
Code Issues Projects Releases Wiki Activity

Run ktlint.

Browse Source
This commit is contained in:
Kavin 2022-11-16 14:26:25 +00:00
parent db83051e5e
commit acc6afced6
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/api/obj/PipedStream.kt
View File

@ -19,5 +19,5 @@ data class PipedStream(
var height: Int? = null, var height: Int? = null,
var fps: Int? = null, var fps: Int? = null,
val audioTrackName: String? = null, val audioTrackName: String? = null,
val audioTrackId: String? = null, val audioTrackId: String? = null
) )

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

@ -88,22 +88,16 @@ import com.google.android.exoplayer2.DefaultLoadControl
import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.MediaItem.SubtitleConfiguration import com.google.android.exoplayer2.MediaItem.SubtitleConfiguration
import com.google.android.exoplayer2.MediaItem.fromUri
import com.google.android.exoplayer2.PlaybackException import com.google.android.exoplayer2.PlaybackException
import com.google.android.exoplayer2.Player import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.audio.AudioAttributes import com.google.android.exoplayer2.audio.AudioAttributes
import com.google.android.exoplayer2.ext.cronet.CronetDataSource import com.google.android.exoplayer2.ext.cronet.CronetDataSource
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory import com.google.android.exoplayer2.source.DefaultMediaSourceFactory
import com.google.android.exoplayer2.source.MediaSource
import com.google.android.exoplayer2.source.MergingMediaSource
import com.google.android.exoplayer2.source.ProgressiveMediaSource
import com.google.android.exoplayer2.text.Cue.TEXT_SIZE_TYPE_ABSOLUTE import com.google.android.exoplayer2.text.Cue.TEXT_SIZE_TYPE_ABSOLUTE
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import com.google.android.exoplayer2.ui.CaptionStyleCompat import com.google.android.exoplayer2.ui.CaptionStyleCompat
import com.google.android.exoplayer2.ui.StyledPlayerView import com.google.android.exoplayer2.ui.StyledPlayerView
import com.google.android.exoplayer2.upstream.DataSource
import com.google.android.exoplayer2.upstream.DefaultDataSource import com.google.android.exoplayer2.upstream.DefaultDataSource
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
import com.google.android.exoplayer2.util.MimeTypes import com.google.android.exoplayer2.util.MimeTypes
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@ -774,7 +768,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
binding.apply { binding.apply {
playerViewsInfo.text = playerViewsInfo.text =
context?.getString(R.string.views, response.views.formatShort()) + context?.getString(R.string.views, response.views.formatShort()) +
if (!isLive) TextUtils.SEPARATOR + response.uploadDate else "" if (!isLive) TextUtils.SEPARATOR + response.uploadDate else ""
textLike.text = response.likes.formatShort() textLike.text = response.likes.formatShort()
textDislike.text = response.dislikes.formatShort() textDislike.text = response.dislikes.formatShort()
@ -1161,7 +1155,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
// set media source and resolution in the beginning // set media source and resolution in the beginning
setStreamSource( setStreamSource(
streams, streams
) )
} }
@ -1177,7 +1171,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
// encode to base64 // encode to base64
val encoded = Base64.encodeToString(manifest.toByteArray(), Base64.DEFAULT) val encoded = Base64.encodeToString(manifest.toByteArray(), Base64.DEFAULT)
val mediaItem = "data:application/dash+xml;charset=utf-8;base64,${encoded}" val mediaItem = "data:application/dash+xml;charset=utf-8;base64,$encoded"
this.setMediaSource(mediaItem.toUri(), MimeTypes.APPLICATION_MPD) this.setMediaSource(mediaItem.toUri(), MimeTypes.APPLICATION_MPD)
} }

4
app/src/main/java/com/github/libretube/util/DashHelper.kt
View File

@ -41,10 +41,10 @@ class DashHelper {
val adapSetInfos = ArrayList<AdapSetInfo>() val adapSetInfos = ArrayList<AdapSetInfo>()
for (stream in streams.videoStreams!!) { for (stream in streams.videoStreams!!) {
// ignore dual format streams // ignore dual format streams
if (!stream.videoOnly!!) if (!stream.videoOnly!!) {
continue continue
}
val adapSetInfo = adapSetInfos.find { it.mimeType == stream.mimeType } val adapSetInfo = adapSetInfos.find { it.mimeType == stream.mimeType }
if (adapSetInfo != null) { if (adapSetInfo != null) {