recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Add TV track support and remembering audio track :)

Browse source
This commit is contained in:
Blatzar 2022-08-29 13:14:36 +02:00
parent 60968f2244
commit e855ccfb25
4 changed files with 368 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
View file

@ -221,6 +221,7 @@ class CS3IPlayer : IPlayer {
} }
override fun setExoplayerAudioTrack(trackLanguage: String?) { override fun setExoplayerAudioTrack(trackLanguage: String?) {
preferredAudioTrackLanguage = trackLanguage
exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
?.buildUpon() ?.buildUpon()
?.setPreferredAudioLanguage(trackLanguage) ?.setPreferredAudioLanguage(trackLanguage)
@ -374,6 +375,12 @@ class CS3IPlayer : IPlayer {
} }
companion object { companion object {
/**
* Fuck it, does not reset after player exit, people probably want that.
* It will default to the first audio track if the language does not exist anyways.
* // TODO using setKey?
**/
private var preferredAudioTrackLanguage: String? = null
private var simpleCache: SimpleCache? = null private var simpleCache: SimpleCache? = null
var requestSubtitleUpdate: (() -> Unit)? = null var requestSubtitleUpdate: (() -> Unit)? = null
@ -491,7 +498,11 @@ class CS3IPlayer : IPlayer {
.setRendererDisabled(C.TRACK_TYPE_TEXT, true) .setRendererDisabled(C.TRACK_TYPE_TEXT, true)
.setTunnelingEnabled(true) .setTunnelingEnabled(true)
.setDisabledTextTrackSelectionFlags(C.TRACK_TYPE_TEXT) .setDisabledTextTrackSelectionFlags(C.TRACK_TYPE_TEXT)
.clearSelectionOverrides() .clearVideoSizeConstraints()
.setPreferredAudioLanguage(preferredAudioTrackLanguage)
// This would also clear preferred audio
// .clearSelectionOverrides()
.build() .build()
return trackSelector return trackSelector
} }

15
app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt
View file

@ -116,15 +116,15 @@ class M3u8Helper {
return !url.contains("https://") && !url.contains("http://") return !url.contains("https://") && !url.contains("http://")
} }
suspend fun m3u8Generation(m3u8: M3u8Stream, returnThis: Boolean?): List<M3u8Stream> { suspend fun m3u8Generation(m3u8: M3u8Stream, returnThis: Boolean? = true): List<M3u8Stream> {
val list = mutableListOf<M3u8Stream>() val list = mutableListOf<M3u8Stream>()
val m3u8Parent = getParentLink(m3u8.streamUrl) val m3u8Parent = getParentLink(m3u8.streamUrl)
val response = app.get(m3u8.streamUrl, headers = m3u8.headers, verify = false).text val response = app.get(m3u8.streamUrl, headers = m3u8.headers, verify = false).text
var hasAnyContent = false // var hasAnyContent = false
for (match in QUALITY_REGEX.findAll(response)) { for (match in QUALITY_REGEX.findAll(response)) {
hasAnyContent = true // hasAnyContent = true
var (quality, m3u8Link, m3u8Link2) = match.destructured var (quality, m3u8Link, m3u8Link2) = match.destructured
if (m3u8Link.isEmpty()) m3u8Link = m3u8Link2 if (m3u8Link.isEmpty()) m3u8Link = m3u8Link2
if (absoluteExtensionDetermination(m3u8Link) == "m3u8") { if (absoluteExtensionDetermination(m3u8Link) == "m3u8") {
@ -141,16 +141,14 @@ class M3u8Helper {
m3u8.headers m3u8.headers
), false ), false
) )
} }
list += M3u8Stream( list += M3u8Stream(
m3u8Link, m3u8Link,
quality.toIntOrNull(), quality.toIntOrNull(),
m3u8.headers m3u8.headers
) )
} }
if (returnThis ?: !hasAnyContent) { if (returnThis != false) {
list += M3u8Stream( list += M3u8Stream(
m3u8.streamUrl, m3u8.streamUrl,
Qualities.Unknown.value, Qualities.Unknown.value,
@ -169,7 +167,10 @@ class M3u8Helper {
val errored: Boolean = false val errored: Boolean = false
) )
suspend fun hlsYield(qualities: List<M3u8Stream>, startIndex: Int = 0): Iterator<HlsDownloadData> { suspend fun hlsYield(
qualities: List<M3u8Stream>,
startIndex: Int = 0
): Iterator<HlsDownloadData> {
if (qualities.isEmpty()) return listOf( if (qualities.isEmpty()) return listOf(
HlsDownloadData( HlsDownloadData(
byteArrayOf(), byteArrayOf(),

108
app/src/main/res/layout/fragment_player_tv.xml
View file

@ -2,74 +2,74 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/player_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
android:keepScreenOn="true"
android:id="@+id/player_background"
app:backgroundTint="@android:color/black"
android:background="@android:color/black" android:background="@android:color/black"
android:keepScreenOn="true"
android:orientation="horizontal"
android:screenOrientation="sensorLandscape" android:screenOrientation="sensorLandscape"
app:backgroundTint="@android:color/black"
app:surface_type="texture_view"> app:surface_type="texture_view">
<!-- <!--
app:fastforward_increment="10000" app:fastforward_increment="10000"
app:rewind_increment="10000"--> app:rewind_increment="10000"-->
<com.google.android.exoplayer2.ui.PlayerView <com.google.android.exoplayer2.ui.PlayerView
android:id="@+id/player_view" android:id="@+id/player_view"
app:show_timeout="0"
app:hide_on_touch="false"
app:auto_show="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:auto_show="true"
app:controller_layout_id="@layout/player_custom_layout_tv"
app:hide_on_touch="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:controller_layout_id="@layout/player_custom_layout_tv" /> app:show_timeout="0" />
<FrameLayout <FrameLayout
android:id="@+id/player_loading_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:backgroundTint="@android:color/black"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/player_loading_overlay"
android:background="@android:color/black"
android:backgroundTint="@android:color/black">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:nextFocusUp="@id/player_loading_go_back"
android:nextFocusLeft="@id/player_loading_go_back"
tools:visibility="visible"
android:visibility="gone"
android:layout_marginTop="70dp"
android:layout_gravity="center"
android:id="@+id/overlay_loading_skip_button" android:id="@+id/overlay_loading_skip_button"
android:text="@string/skip_loading"
android:focusable="true"
android:clickable="true"
android:focusableInTouchMode="true"
app:icon="@drawable/ic_baseline_skip_next_24"
style="@style/VideoButtonTV" style="@style/VideoButtonTV"
android:layout_width="wrap_content" />
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="70dp"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusLeft="@id/player_loading_go_back"
android:nextFocusUp="@id/player_loading_go_back"
android:text="@string/skip_loading"
android:visibility="gone"
app:icon="@drawable/ic_baseline_skip_next_24"
tools:visibility="visible" />
<ProgressBar <ProgressBar
android:id="@+id/main_load"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="center" android:layout_gravity="center" />
android:id="@+id/main_load" />
<FrameLayout <FrameLayout
android:id="@+id/video_go_back_holder_holder" android:id="@+id/video_go_back_holder_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView <ImageView
android:layout_width="30dp" android:layout_width="30dp"
@ -79,53 +79,53 @@
app:tint="@android:color/white" /> app:tint="@android:color/white" />
<ImageView <ImageView
android:nextFocusRight="@id/overlay_loading_skip_button"
android:nextFocusDown="@id/overlay_loading_skip_button"
android:focusableInTouchMode="true"
android:id="@+id/player_loading_go_back" android:id="@+id/player_loading_go_back"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_gravity="center" android:layout_gravity="center"
android:focusable="true" android:background="@drawable/video_tap_button_always_white"
android:clickable="true" android:clickable="true"
android:background="@drawable/video_tap_button_always_white" /> android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusRight="@id/overlay_loading_skip_button"
android:nextFocusDown="@id/overlay_loading_skip_button" />
</FrameLayout> </FrameLayout>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:visibility="gone" android:id="@+id/player_torrent_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
android:id="@+id/player_torrent_info"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/video_torrent_progress"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:gravity="start"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:textStyle="bold" android:gravity="start"
android:textColor="@color/white" android:textColor="@color/white"
android:id="@+id/video_torrent_progress" android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="78% at 18kb/s" /> tools:text="78% at 18kb/s" />
<TextView <TextView
android:id="@+id/video_torrent_seeders"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
android:gravity="start"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:gravity="start"
android:textColor="@color/white" android:textColor="@color/white"
android:id="@+id/video_torrent_seeders" app:layout_constraintLeft_toLeftOf="parent"
tools:text="17 seeders" app:layout_constraintTop_toBottomOf="@+id/player_video_title"
app:layout_constraintTop_toBottomOf="@+id/player_video_title" /> tools:text="17 seeders" />
</FrameLayout> </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

27
app/src/main/res/layout/player_custom_layout_tv.xml
View file

@ -6,8 +6,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:screenOrientation="landscape" android:screenOrientation="landscape"
tools:orientation="vertical" android:tag="television"
android:tag="television"> tools:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/subtitle_holder" android:id="@+id/subtitle_holder"
@ -115,9 +115,9 @@
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/go_back_img_des"
android:src="@drawable/ic_baseline_arrow_back_24" android:src="@drawable/ic_baseline_arrow_back_24"
app:tint="@android:color/white" app:tint="@android:color/white" />
android:contentDescription="@string/go_back_img_des" />
<ImageView <ImageView
android:id="@+id/player_go_back" android:id="@+id/player_go_back"
@ -323,25 +323,34 @@
tools:text="Speed" /> tools:text="Speed" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:visibility="gone"
tools:visibility="visible"
android:id="@+id/player_subtitle_offset_btt" android:id="@+id/player_subtitle_offset_btt"
style="@style/VideoButtonTV" style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_speed_btt" android:nextFocusLeft="@id/player_speed_btt"
android:nextFocusRight="@id/player_sources_btt" android:nextFocusRight="@id/player_sources_btt"
android:text="@string/subtitle_offset"
android:visibility="gone"
app:icon="@drawable/ic_outline_subtitles_24" app:icon="@drawable/ic_outline_subtitles_24"
android:text="@string/subtitle_offset"/> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/player_sources_btt" android:id="@+id/player_sources_btt"
style="@style/VideoButtonTV" style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_subtitle_offset_btt" android:nextFocusLeft="@id/player_subtitle_offset_btt"
android:nextFocusRight="@id/player_skip_op" android:nextFocusRight="@id/player_tracks_btt"
android:nextFocusUp="@id/player_pause_play" android:nextFocusUp="@id/player_pause_play"
android:text="@string/video_source" android:text="@string/video_source"
app:icon="@drawable/ic_baseline_playlist_play_24" /> app:icon="@drawable/ic_baseline_playlist_play_24" />
<com.google.android.material.button.MaterialButton
android:id="@+id/player_tracks_btt"
style="@style/VideoButtonTV"
android:nextFocusLeft="@id/player_sources_btt"
android:nextFocusRight="@id/player_skip_op"
android:nextFocusUp="@id/player_pause_play"
android:text="@string/tracks"
app:icon="@drawable/ic_baseline_playlist_play_24" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/player_skip_op" android:id="@+id/player_skip_op"
style="@style/VideoButtonTV" style="@style/VideoButtonTV"