Skip to content

Implement CronetEngine and HttpEngine support #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uzu09811 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Implement CronetEngine and HttpEngine support #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
197cc9b
Allow using non-http data sources (e.g. cronet)
uzu09811 Nov 6, 2024
d2ae01a
Remove unused imports
uzu09811 Nov 12, 2024
49c6f46
Remove unused imports
uzu09811 Nov 12, 2024
924d63e
typo
uzu09811 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ internalPlayStream(mediaSource: MediaSource, playMode: PlayMode) {
val builder = MediaSourceBuilder(
repository = repository,
mutableErrorFlow = mutableErrorFlow,
httpDataSourceFactory = repository.getHttpDataSourceFactory(item),
dataSourceFactory = repository.getDataSourceFactory(item, app),
Copy link
Member

@theScrabi theScrabi Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dataSourceFactory = repository.getDataSourceFactory(item, app),
dataSourceFactory = repository.getDataSourceFactory(item),

Copy link
Member

@theScrabi theScrabi Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A repository will have the ability to access a Context regardless of weather that Context was supplied from the interface call or not. So this should be removed eventually.

)

val uniqueId = Random.nextLong()
Expand Down
8 changes: 4 additions & 4 deletions new-player/src/main/java/net/newpipe/newplayer/logic/MediaSourceBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package net.newpipe.newplayer.logic
import androidx.annotation.OptIn
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.media3.datasource.HttpDataSource
import androidx.media3.datasource.DataSource
import androidx.media3.exoplayer.dash.DashMediaSource
import androidx.media3.exoplayer.source.MediaSource
import androidx.media3.exoplayer.source.MergingMediaSource
Expand All @@ -47,7 +47,7 @@ internal class MediaSourceBuilder
(
private val repository: MediaRepository,
private val mutableErrorFlow: MutableSharedFlow<Exception>,
private val httpDataSourceFactory: HttpDataSource.Factory,
private val dataSourceFactory: DataSource.Factory,
) {
@OptIn(UnstableApi::class)

Expand Down Expand Up @@ -105,10 +105,10 @@ internal suspend fun buildMediaSource(
@OptIn(UnstableApi::class)
private fun toMediaSource(mediaItem: MediaItem, stream: Stream): MediaSource =
if (stream.isDashOrHls)
DashMediaSource.Factory(httpDataSourceFactory)
DashMediaSource.Factory(dataSourceFactory)
.createMediaSource(mediaItem)
else
ProgressiveMediaSource.Factory(httpDataSourceFactory)
ProgressiveMediaSource.Factory(dataSourceFactory)
.createMediaSource(mediaItem)


Expand Down
9 changes: 6 additions & 3 deletions new-player/src/main/java/net/newpipe/newplayer/repository/MediaRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@

package net.newpipe.newplayer.repository

import android.os.Build
import android.content.Context
import android.graphics.Bitmap
import androidx.media3.common.MediaMetadata
import androidx.media3.datasource.DefaultHttpDataSource
import androidx.media3.datasource.HttpDataSource
import androidx.media3.datasource.DataSource
import net.newpipe.newplayer.data.Chapter
import net.newpipe.newplayer.data.Stream
import net.newpipe.newplayer.data.Subtitle
Expand Down Expand Up @@ -114,8 +116,9 @@ interface MediaRepository {
/**
* Supply a custom [HttpDataSource.Factory]. This is important for Youtube.
*/
fun getHttpDataSourceFactory(item: String): HttpDataSource.Factory =
DefaultHttpDataSource.Factory()
fun getDataSourceFactory(item: String, context: Context): DataSource.Factory {
Copy link
Member

@theScrabi theScrabi Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fun getDataSourceFactory(item: String, context: Context): DataSource.Factory {
fun getDataSourceFactory(item: String): DataSource.Factory {

return DefaultHttpDataSource.Factory()
}

/**
* Get MediaMetadata information for a certain item. Please refer to the media3 documentation
Expand Down