diff --git a/app/build.gradle b/app/build.gradle index 421e7d3b95..06f3a6b5c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,8 @@ android { defaultConfig { applicationId "InfinityLoop1309.NewPipeEnhanced" - minSdk 21 + // media3 1.9+ requires API 23 (media3-session). Bumped from 21 -> drops Android 5.0/5.1. + minSdk 23 //noinspection ExpiredTargetSdkVersion targetSdk 33 versionCode 1100 @@ -137,7 +138,7 @@ ext { androidxRoomVersion = '2.4.2' androidxWorkVersion = '2.10.2' - exoPlayerVersion = '2.18.7' + media3Version = '1.10.1' googleAutoServiceVersion = '1.0.1' groupieVersion = '2.10.0' markwonVersion = '4.6.2' @@ -271,8 +272,14 @@ dependencies { implementation "com.squareup.okhttp3:okhttp:3.12.13" // Media player - implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}" - implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}" + implementation "androidx.media3:media3-exoplayer:${media3Version}" + implementation "androidx.media3:media3-exoplayer-dash:${media3Version}" + implementation "androidx.media3:media3-exoplayer-hls:${media3Version}" + implementation "androidx.media3:media3-exoplayer-smoothstreaming:${media3Version}" + implementation "androidx.media3:media3-datasource:${media3Version}" + implementation "androidx.media3:media3-ui:${media3Version}" + implementation "androidx.media3:media3-session:${media3Version}" + implementation "androidx.media3:media3-common:${media3Version}" // Metadata generator for service descriptors compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5152dd485d..a9e04a151f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,6 +43,7 @@ android:banner="@mipmap/tv_banner" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:largeHeap="true" android:logo="@mipmap/ic_launcher" android:theme="@style/OpeningTheme" android:resizeableActivity="true" diff --git a/app/src/main/assets/sabr_potoken_poc.js b/app/src/main/assets/sabr_potoken_poc.js new file mode 100644 index 0000000000..88b5ffa82d --- /dev/null +++ b/app/src/main/assets/sabr_potoken_poc.js @@ -0,0 +1,301 @@ +/* + * SABR PO token POC — WebView pipeline (att mode). + * + * Ported from the local research mint (mint-po-token-browser.mjs), adapted to run inside an Android + * WebView instead of puppeteer. It must be injected AFTER https://www.youtube.com/ has finished + * loading (same-origin is required: att/get and GenerateIT are youtube.com endpoints, and the + * BotGuard interpreter is embedded in the challenge). + * + * Flow: read browser context -> att/get challenge -> run BotGuard VM -> snapshot -> GenerateIT + * integrity token -> mint a videoId-bound PO token -> hand the result back through the + * `SabrPocBridge` JavascriptInterface. + * + * INTERNAL / LOCAL POC ONLY. The minted PO token is session-bound; keep it out of any public log. + * API_KEY / REQUEST_KEY are the well-known public ecosystem constants, not secrets. + */ +(function () { + 'use strict'; + + // YouTube ships a Trusted Types CSP (require-trusted-types-for 'script') that blocks + // new Function()/eval of the BotGuard interpreter. Installing an identity "default" policy makes + // Chromium route those sinks through it, restoring dynamic evaluation. If the CSP forbids + // creating the policy, loadBotGuard() will surface the eval error instead. + try { + if (window.trustedTypes && window.trustedTypes.createPolicy + && !window.trustedTypes.defaultPolicy) { + window.trustedTypes.createPolicy('default', { + createHTML: function (value) { return value; }, + createScript: function (value) { return value; }, + createScriptURL: function (value) { return value; } + }); + } + } catch (ttError) { + // ignore; surfaced later as an eval failure + } + + var API_KEY = 'AIzaSyDyT5W0Jh49F30Pqqtyfdf7pDLFKLJoAnw'; + var REQUEST_KEY = 'O43z0dpjhgX20SCx4KAo'; + + function report(result) { + try { + // eslint-disable-next-line no-undef + SabrPocBridge.onResult(JSON.stringify(result)); + } catch (e) { + // Bridge not present (e.g. plain browser run): fall back to console. + try { + console.log('[sabr-poc] ' + JSON.stringify(result)); + } catch (ignored) { + // nothing else we can do + } + } + } + + function step(message) { + try { console.log('[sabr-poc] ' + message); } catch (e) { /* ignore */ } + } + + function readVisitorData() { + var cfg = window.ytcfg; + var fromCfg = cfg && typeof cfg.get === 'function' ? cfg.get('VISITOR_DATA') : null; + if (fromCfg) { + return fromCfg; + } + var html = document.documentElement.innerHTML; + var marker = '"VISITOR_DATA":"'; + var start = html.indexOf(marker); + if (start < 0) { + throw new Error('Could not find visitor data'); + } + var from = start + marker.length; + var end = html.indexOf('"', from); + if (end < 0) { + throw new Error('Could not find visitor data end'); + } + return html.slice(from, end); + } + + function readClientVersion() { + var cfg = window.ytcfg; + var fromCfg = cfg && typeof cfg.get === 'function' + ? cfg.get('INNERTUBE_CLIENT_VERSION') : null; + return fromCfg || '2.20260114.01.00'; + } + + function normalizeTrustedUrl(value) { + if (!value) { + throw new Error('Missing interpreter url'); + } + return value.indexOf('//') === 0 ? 'https:' + value : value; + } + + function fetchChallenge(ctx) { + var context = { + client: { + clientName: 'WEB', + clientVersion: ctx.clientVersion, + hl: 'en', + gl: 'US', + utcOffsetMinutes: 0, + visitorData: ctx.visitorData + } + }; + return fetch('https://www.youtube.com/youtubei/v1/att/get?prettyPrint=false&alt=json', { + method: 'POST', + headers: { + 'Accept': '*/*', + 'Content-Type': 'application/json', + 'X-Goog-Visitor-Id': ctx.visitorData, + 'X-Youtube-Client-Version': ctx.clientVersion, + 'X-Youtube-Client-Name': '1' + }, + body: JSON.stringify({ + engagementType: 'ENGAGEMENT_TYPE_UNBOUND', + context: context + }) + }).then(function (response) { + return response.json().then(function (data) { + if (!response.ok || !data.bgChallenge) { + throw new Error('att/get failed status=' + response.status); + } + return data.bgChallenge; + }); + }); + } + + function resolveInterpreter(challenge, userAgent) { + var embedded = challenge.interpreterJavascript + && challenge.interpreterJavascript.privateDoNotAccessOrElseSafeScriptWrappedValue; + if (embedded) { + return Promise.resolve(embedded); + } + var url = normalizeTrustedUrl( + (challenge.interpreterJavascript + && challenge.interpreterJavascript + .privateDoNotAccessOrElseTrustedResourceUrlWrappedValue) + || (challenge.interpreterUrl + && challenge.interpreterUrl + .privateDoNotAccessOrElseTrustedResourceUrlWrappedValue)); + return fetch(url, { headers: { 'User-Agent': userAgent } }).then(function (response) { + return response.text().then(function (js) { + if (!response.ok || !js) { + throw new Error('interpreter fetch failed status=' + response.status); + } + return js; + }); + }); + } + + function loadBotGuard(interpreterJavascript, program, globalName) { + return new Promise(function (resolve, reject) { + try { + new Function(interpreterJavascript)(); + } catch (e) { + reject(new Error('interpreter eval failed: ' + e.message)); + return; + } + var vm = window[globalName]; + if (!vm || typeof vm.a !== 'function') { + reject(new Error('BotGuard VM missing init function')); + return; + } + var timeout = setTimeout(function () { + reject(new Error('BotGuard init timeout')); + }, 10000); + try { + vm.a(program, function (asyncSnapshotFunction) { + clearTimeout(timeout); + resolve({ asyncSnapshotFunction: asyncSnapshotFunction }); + }, true, undefined, function () { }, [[], []]); + } catch (e) { + clearTimeout(timeout); + reject(new Error('BotGuard init threw: ' + e.message)); + } + }); + } + + function snapshot(functions, webPoSignalOutput) { + return new Promise(function (resolve, reject) { + var timeout = setTimeout(function () { + reject(new Error('BotGuard snapshot timeout')); + }, 10000); + functions.asyncSnapshotFunction(function (response) { + clearTimeout(timeout); + resolve(response); + }, [undefined, undefined, webPoSignalOutput, undefined]); + }); + } + + function fetchIntegrityToken(botGuardResponse, userAgent) { + return fetch('https://www.youtube.com/api/jnn/v1/GenerateIT', { + method: 'POST', + headers: { + 'content-type': 'application/json+protobuf', + 'x-goog-api-key': API_KEY, + 'x-user-agent': 'grpc-web-javascript/0.1', + 'User-Agent': userAgent + }, + body: JSON.stringify([REQUEST_KEY, botGuardResponse]) + }).then(function (response) { + return response.json().then(function (data) { + var integrityToken = data[0]; + if (typeof integrityToken !== 'string') { + throw new Error('GenerateIT failed status=' + response.status); + } + return integrityToken; + }); + }); + } + + function base64ToU8(value) { + var normalized = value.replace(/-/g, '+').replace(/_/g, '/'); + var padded = normalized + '==='.slice((normalized.length + 3) % 4); + var binary = atob(padded); + var bytes = new Uint8Array(binary.length); + for (var i = 0; i < binary.length; i++) { + bytes[i] = binary.charCodeAt(i); + } + return bytes; + } + + function u8ToBase64Url(value) { + var binary = ''; + for (var i = 0; i < value.length; i++) { + binary += String.fromCharCode(value[i]); + } + return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, ''); + } + + function mint(webPoSignalOutput, integrityToken, identifier) { + var getMinter = webPoSignalOutput[0]; + if (typeof getMinter !== 'function') { + return Promise.reject(new Error('Missing PO minter factory')); + } + return Promise.resolve(getMinter(base64ToU8(integrityToken))).then(function (mintCallback) { + if (typeof mintCallback !== 'function') { + throw new Error('Missing PO mint callback'); + } + return Promise.resolve(mintCallback(new TextEncoder().encode(identifier))) + .then(u8ToBase64Url); + }); + } + + function run() { + step('run start, readyState=' + document.readyState + ' origin=' + location.origin); + var videoId = window.__SABR_POC_VIDEO_ID || 'aqz-KE-bpKQ'; + var ctx = { + visitorData: readVisitorData(), + clientVersion: readClientVersion(), + userAgent: navigator.userAgent + }; + step('context ok visitorLen=' + ctx.visitorData.length + ' clientVersion=' + ctx.clientVersion); + var webPoSignalOutput = []; + var integrityTokenLength = -1; + step('fetching att/get challenge...'); + return fetchChallenge(ctx).then(function (challenge) { + step('challenge ok embedded=' + + !!(challenge.interpreterJavascript + && challenge.interpreterJavascript.privateDoNotAccessOrElseSafeScriptWrappedValue)); + return resolveInterpreter(challenge, ctx.userAgent).then(function (interpreterJs) { + step('interpreter resolved len=' + (interpreterJs ? interpreterJs.length : -1)); + return loadBotGuard(interpreterJs, challenge.program, challenge.globalName); + }); + }).then(function (functions) { + step('botguard loaded, taking snapshot...'); + return snapshot(functions, webPoSignalOutput); + }).then(function (botGuardResponse) { + step('snapshot ok, calling GenerateIT...'); + return fetchIntegrityToken(botGuardResponse, ctx.userAgent); + }).then(function (integrityToken) { + step('integrity token len=' + integrityToken.length + ', minting...'); + integrityTokenLength = integrityToken.length; + return mint(webPoSignalOutput, integrityToken, videoId); + }).then(function (poToken) { + report({ + ok: true, + videoId: videoId, + clientVersion: ctx.clientVersion, + visitorDataLength: ctx.visitorData.length, + integrityTokenLength: integrityTokenLength, + poTokenLength: poToken.length, + poToken: poToken, + userAgent: ctx.userAgent + }); + }); + } + + function reportError(e) { + report({ + ok: false, + error: (e && e.message) ? e.message : String(e), + errorName: e && e.name ? e.name : '', + stack: e && e.stack ? String(e.stack).slice(0, 400) : '', + userAgent: navigator.userAgent + }); + } + + try { + run().catch(reportError); + } catch (e) { + reportError(e); + } +})(); diff --git a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt index aa849655a9..a34ae5ed22 100644 --- a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt +++ b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt @@ -2,7 +2,7 @@ package org.schabi.newpipe.error import android.os.Parcelable import androidx.annotation.StringRes -import com.google.android.exoplayer2.ExoPlaybackException +import androidx.media3.exoplayer.ExoPlaybackException import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import org.schabi.newpipe.R diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index 63835ed6e7..c86d04ecf0 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -46,8 +46,8 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.PreferenceManager; -import com.google.android.exoplayer2.PlaybackException; -import com.google.android.exoplayer2.PlaybackParameters; +import androidx.media3.common.PlaybackException; +import androidx.media3.common.PlaybackParameters; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.tabs.TabLayout; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailPlayerCrasher.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailPlayerCrasher.java index ae704e88c9..af6c41c2be 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailPlayerCrasher.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailPlayerCrasher.java @@ -13,9 +13,9 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.ExoPlaybackException; -import com.google.android.exoplayer2.PlaybackException; +import androidx.media3.common.C; +import androidx.media3.exoplayer.ExoPlaybackException; +import androidx.media3.common.PlaybackException; import org.schabi.newpipe.R; import org.schabi.newpipe.databinding.ListRadioIconItemBinding; @@ -29,9 +29,9 @@ import java.util.Map; import java.util.function.Supplier; -import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW; -import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_DECODING_FAILED; -import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_UNSPECIFIED; +import static androidx.media3.common.PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW; +import static androidx.media3.common.PlaybackException.ERROR_CODE_DECODING_FAILED; +import static androidx.media3.common.PlaybackException.ERROR_CODE_UNSPECIFIED; /** * Outsourced logic for crashing the player in the {@link VideoDetailFragment}. diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java index 205b786408..c06540db9d 100644 --- a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java +++ b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java @@ -26,8 +26,8 @@ import java.util.List; import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE; +import static androidx.media3.common.Player.REPEAT_MODE_ALL; +import static androidx.media3.common.Player.REPEAT_MODE_ONE; import static org.schabi.newpipe.player.PlayerService.ACTION_CLOSE; import static org.schabi.newpipe.player.PlayerService.ACTION_FAST_FORWARD; import static org.schabi.newpipe.player.PlayerService.ACTION_FAST_REWIND; @@ -269,19 +269,19 @@ private NotificationCompat.Action getAction( case NotificationConstants.SMART_REWIND_PREVIOUS: if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) { - return getAction(player, R.drawable.exo_notification_previous, + return getAction(player, R.drawable.exo_icon_previous, R.string.exo_controls_previous_description, ACTION_PLAY_PREVIOUS); } else { - return getAction(player, R.drawable.exo_controls_rewind, + return getAction(player, R.drawable.exo_icon_rewind, R.string.exo_controls_rewind_description, ACTION_FAST_REWIND); } case NotificationConstants.SMART_FORWARD_NEXT: if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) { - return getAction(player, R.drawable.exo_notification_next, + return getAction(player, R.drawable.exo_icon_next, R.string.exo_controls_next_description, ACTION_PLAY_NEXT); } else { - return getAction(player, R.drawable.exo_controls_fastforward, + return getAction(player, R.drawable.exo_icon_fastforward, R.string.exo_controls_fastforward_description, ACTION_FAST_FORWARD); } @@ -303,10 +303,10 @@ private NotificationCompat.Action getAction( || player.getCurrentState() == Player.STATE_PREFLIGHT || player.getCurrentState() == Player.STATE_BLOCKED || player.getCurrentState() == Player.STATE_BUFFERING) { - return getAction(player, R.drawable.exo_notification_pause, + return getAction(player, R.drawable.exo_icon_pause, R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE); } else { - return getAction(player, R.drawable.exo_notification_play, + return getAction(player, R.drawable.exo_icon_play, R.string.exo_controls_play_description, ACTION_PLAY_PAUSE); } @@ -324,10 +324,10 @@ private NotificationCompat.Action getAction( case NotificationConstants.SHUFFLE: if (player.getPlayQueue() != null && player.getPlayQueue().isShuffled()) { - return getAction(player, R.drawable.exo_controls_shuffle_on, + return getAction(player, R.drawable.exo_icon_shuffle_on, R.string.exo_controls_shuffle_on_description, ACTION_SHUFFLE); } else { - return getAction(player, R.drawable.exo_controls_shuffle_off, + return getAction(player, R.drawable.exo_icon_shuffle_off, R.string.exo_controls_shuffle_off_description, ACTION_SHUFFLE); } diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java index b9fba40c65..ea0c233108 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java +++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java @@ -21,7 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.exoplayer2.PlaybackParameters; +import androidx.media3.common.PlaybackParameters; import org.schabi.newpipe.R; import org.schabi.newpipe.databinding.ActivityPlayerQueueControlBinding; @@ -553,17 +553,17 @@ private void onStateChanged(final int state) { private void onPlayModeChanged(final int repeatMode, final boolean shuffled) { switch (repeatMode) { - case com.google.android.exoplayer2.Player.REPEAT_MODE_OFF: + case androidx.media3.common.Player.REPEAT_MODE_OFF: queueControlBinding.controlRepeat - .setImageResource(R.drawable.exo_controls_repeat_off); + .setImageResource(R.drawable.exo_icon_repeat_off); break; - case com.google.android.exoplayer2.Player.REPEAT_MODE_ONE: + case androidx.media3.common.Player.REPEAT_MODE_ONE: queueControlBinding.controlRepeat - .setImageResource(R.drawable.exo_controls_repeat_one); + .setImageResource(R.drawable.exo_icon_repeat_one); break; - case com.google.android.exoplayer2.Player.REPEAT_MODE_ALL: + case androidx.media3.common.Player.REPEAT_MODE_ALL: queueControlBinding.controlRepeat - .setImageResource(R.drawable.exo_controls_repeat_all); + .setImageResource(R.drawable.exo_icon_repeat_all); break; } diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java index 23e803fee1..bfd5b53b02 100644 --- a/app/src/main/java/org/schabi/newpipe/player/Player.java +++ b/app/src/main/java/org/schabi/newpipe/player/Player.java @@ -1,18 +1,18 @@ package org.schabi.newpipe.player; -import static com.google.android.exoplayer2.PlaybackException.*; -import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_AUTO_TRANSITION; -import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL; -import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_REMOVE; -import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK; -import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT; -import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SKIP; -import static com.google.android.exoplayer2.Player.DiscontinuityReason; -import static com.google.android.exoplayer2.Player.Listener; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE; -import static com.google.android.exoplayer2.Player.RepeatMode; +import static androidx.media3.common.PlaybackException.*; +import static androidx.media3.common.Player.DISCONTINUITY_REASON_AUTO_TRANSITION; +import static androidx.media3.common.Player.DISCONTINUITY_REASON_INTERNAL; +import static androidx.media3.common.Player.DISCONTINUITY_REASON_REMOVE; +import static androidx.media3.common.Player.DISCONTINUITY_REASON_SEEK; +import static androidx.media3.common.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT; +import static androidx.media3.common.Player.DISCONTINUITY_REASON_SKIP; +import static androidx.media3.common.Player.DiscontinuityReason; +import static androidx.media3.common.Player.Listener; +import static androidx.media3.common.Player.REPEAT_MODE_ALL; +import static androidx.media3.common.Player.REPEAT_MODE_OFF; +import static androidx.media3.common.Player.REPEAT_MODE_ONE; +import static androidx.media3.common.Player.RepeatMode; import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu; import static org.schabi.newpipe.extractor.ServiceList.YouTube; import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; @@ -78,22 +78,23 @@ import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.exoplayer2.*; -import com.google.android.exoplayer2.Player.PositionInfo; -import com.google.android.exoplayer2.Timeline; -import com.google.android.exoplayer2.Tracks; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.TrackGroup; -import com.google.android.exoplayer2.source.TrackGroupArray; -import com.google.android.exoplayer2.text.CueGroup; -import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; -import com.google.android.exoplayer2.trackselection.MappingTrackSelector; -import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; -import com.google.android.exoplayer2.ui.CaptionStyleCompat; -import com.google.android.exoplayer2.ui.SubtitleView; -import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; -import com.google.android.exoplayer2.util.Util; -import com.google.android.exoplayer2.video.VideoSize; +import androidx.media3.common.*; +import androidx.media3.exoplayer.*; +import androidx.media3.common.Player.PositionInfo; +import androidx.media3.common.Timeline; +import androidx.media3.common.Tracks; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.common.TrackGroup; +import androidx.media3.exoplayer.source.TrackGroupArray; +import androidx.media3.common.text.CueGroup; +import androidx.media3.exoplayer.trackselection.DefaultTrackSelector; +import androidx.media3.exoplayer.trackselection.MappingTrackSelector; +import androidx.media3.ui.AspectRatioFrameLayout; +import androidx.media3.ui.CaptionStyleCompat; +import androidx.media3.ui.SubtitleView; +import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter; +import androidx.media3.common.util.Util; +import androidx.media3.common.VideoSize; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; @@ -130,6 +131,7 @@ import org.schabi.newpipe.player.helper.MediaSessionManager; import org.schabi.newpipe.player.helper.PlayerDataSource; import org.schabi.newpipe.player.helper.PlayerHelper; +import org.schabi.newpipe.player.datasource.SabrSessionStore; import org.schabi.newpipe.player.listeners.view.PlaybackSpeedClickListener; import org.schabi.newpipe.player.listeners.view.QualityClickListener; import org.schabi.newpipe.player.mediaitem.MediaItemTag; @@ -794,7 +796,7 @@ public void handleIntent(@NonNull final Intent intent) { // Player can have state = IDLE when playback is stopped or failed // and we should retry in this case if (simpleExoPlayer.getPlaybackState() - == com.google.android.exoplayer2.Player.STATE_IDLE) { + == androidx.media3.common.Player.STATE_IDLE) { simpleExoPlayer.prepare(); } if (shouldSeek()) { @@ -811,7 +813,7 @@ public void handleIntent(@NonNull final Intent intent) { // Player can have state = IDLE when playback is stopped or failed // and we should retry in this case if (simpleExoPlayer.getPlaybackState() - == com.google.android.exoplayer2.Player.STATE_IDLE) { + == androidx.media3.common.Player.STATE_IDLE) { simpleExoPlayer.prepare(); } simpleExoPlayer.setPlayWhenReady(playWhenReady); @@ -1780,6 +1782,10 @@ private void onUpdateProgress(final int currentProgress, return; } + // Feed the real play head to any live SABR session (no-op otherwise). + getCurrentStreamInfo().ifPresent(info -> + SabrSessionStore.updatePlayerTime(info.getId(), currentProgress)); + if (duration != binding.playbackSeekBar.getMax()) { setVideoDurationToControls(duration); } @@ -2265,7 +2271,7 @@ public void onPlayWhenReadyChanged(final boolean playWhenReady, final int reason + "reason = [" + reason + "]"); } final int playbackState = exoPlayerIsNull() - ? com.google.android.exoplayer2.Player.STATE_IDLE + ? androidx.media3.common.Player.STATE_IDLE : simpleExoPlayer.getPlaybackState(); updatePlaybackState(playWhenReady, playbackState); } @@ -2294,22 +2300,22 @@ private void updatePlaybackState(final boolean playWhenReady, final int playback } switch (playbackState) { - case com.google.android.exoplayer2.Player.STATE_IDLE: // 1 + case androidx.media3.common.Player.STATE_IDLE: // 1 isPrepared = false; break; - case com.google.android.exoplayer2.Player.STATE_BUFFERING: // 2 + case androidx.media3.common.Player.STATE_BUFFERING: // 2 if (isPrepared) { changeState(STATE_BUFFERING); } break; - case com.google.android.exoplayer2.Player.STATE_READY: //3 + case androidx.media3.common.Player.STATE_READY: //3 if (!isPrepared) { isPrepared = true; onPrepared(playWhenReady); } changeState(playWhenReady ? STATE_PLAYING : STATE_PAUSED); break; - case com.google.android.exoplayer2.Player.STATE_ENDED: // 4 + case androidx.media3.common.Player.STATE_ENDED: // 4 changeState(STATE_COMPLETED); saveStreamProgressStateCompleted(); isPrepared = false; @@ -2826,13 +2832,13 @@ private void setRepeatModeButton(final AppCompatImageButton imageButton, @RepeatMode final int repeatMode) { switch (repeatMode) { case REPEAT_MODE_OFF: - imageButton.setImageResource(R.drawable.exo_controls_repeat_off); + imageButton.setImageResource(R.drawable.exo_icon_repeat_off); break; case REPEAT_MODE_ONE: - imageButton.setImageResource(R.drawable.exo_controls_repeat_one); + imageButton.setImageResource(R.drawable.exo_icon_repeat_one); break; case REPEAT_MODE_ALL: - imageButton.setImageResource(R.drawable.exo_controls_repeat_all); + imageButton.setImageResource(R.drawable.exo_icon_repeat_all); break; } } @@ -2920,13 +2926,13 @@ public void onScreenRotationButtonClicked() { * This is done because not all source resolution errors are {@link PlaybackException}, which * are also captured by {@link ExoPlayer} and stops the playback.

* - * @param player The {@link com.google.android.exoplayer2.Player} whose state changed. - * @param events The {@link com.google.android.exoplayer2.Player.Events} that has triggered + * @param player The {@link androidx.media3.common.Player} whose state changed. + * @param events The {@link androidx.media3.common.Player.Events} that has triggered * the player state changes. **/ @Override - public void onEvents(@NonNull final com.google.android.exoplayer2.Player player, - @NonNull final com.google.android.exoplayer2.Player.Events events) { + public void onEvents(@NonNull final androidx.media3.common.Player player, + @NonNull final androidx.media3.common.Player.Events events) { Listener.super.onEvents(player, events); MediaItemTag.from(player.getCurrentMediaItem()).ifPresent(tag -> { if (tag == currentMetadata) { @@ -3053,7 +3059,7 @@ public void onPrepare() { //region Errors /** - * Process exceptions produced by {@link com.google.android.exoplayer2.ExoPlayer ExoPlayer}. + * Process exceptions produced by {@link androidx.media3.exoplayer.ExoPlayer ExoPlayer}. *

There are multiple types of errors:

* - * @see com.google.android.exoplayer2.Player.Listener#onPlayerError(PlaybackException) + * @see androidx.media3.common.Player.Listener#onPlayerError(PlaybackException) * */ // Any error code not explicitly covered here are either unrelated to NewPipe use case // (e.g. DRM) or not recoverable (e.g. Decoder error). In both cases, the player should @@ -3297,9 +3303,36 @@ public void onPlaybackSynchronize(@NonNull final PlayQueueItem item, final boole } public boolean shouldSeek() { + // our v1 SABR seek is a dumb byte-skip that can't land on a real position, so resuming + // mid-video just freezes the whole thing. so SABR always starts from 0, scrubbing can wait. + // honestly nobody died from rewatching an intro. plays fine from 0. + if (isCurrentStreamSabr()) { + return false; + } return !prefs.getBoolean(context.getString(R.string.always_start_from_beginning_key), false); } + private boolean isCurrentStreamSabr() { + return getCurrentStreamInfo().map(info -> { + for (final VideoStream s : info.getVideoOnlyStreams()) { + if (s.getDeliveryMethod() == DeliveryMethod.SABR) { + return true; + } + } + for (final VideoStream s : info.getVideoStreams()) { + if (s.getDeliveryMethod() == DeliveryMethod.SABR) { + return true; + } + } + for (final AudioStream s : info.getAudioStreams()) { + if (s.getDeliveryMethod() == DeliveryMethod.SABR) { + return true; + } + } + return false; + }).orElse(false); + } + public void seekTo(final long positionMillis) { if (DEBUG) { Log.d(TAG, "seekBy() called with: position = [" + positionMillis + "]"); @@ -4000,15 +4033,21 @@ private void buildQualityMenu() { for (int i = 0; i < availableStreams.size(); i++) { final VideoStream videoStream = availableStreams.get(i); - qualityPopupMenu.getMenu().add(POPUP_MENU_ID_QUALITY, i, Menu.NONE, videoStream.getCodec().toUpperCase().split("\\.")[0] + " " + videoStream.resolution); + qualityPopupMenu.getMenu().add(POPUP_MENU_ID_QUALITY, i, Menu.NONE, videoStream.getCodec().toUpperCase().split("\\.")[0] + " " + videoStream.resolution + sabrTag(videoStream)); } if (getSelectedVideoStream() != null) { - binding.qualityTextView.setText(getSelectedVideoStream().resolution); + binding.qualityTextView.setText(getSelectedVideoStream().resolution + sabrTag(getSelectedVideoStream())); } qualityPopupMenu.setOnMenuItemClickListener(this); qualityPopupMenu.setOnDismissListener(this); } + // PoC marker: flag SABR-delivered streams in the quality UI + private static String sabrTag(final VideoStream stream) { + return stream != null && stream.getDeliveryMethod() == DeliveryMethod.SABR + ? " (SABR)" : ""; + } + private void buildPlaybackSpeedMenu() { if (playbackSpeedPopupMenu == null) { return; @@ -4148,7 +4187,7 @@ public void onDismiss(@Nullable final PopupMenu menu) { } isSomePopupMenuVisible = false; //TODO check if this works if (getSelectedVideoStream() != null) { - binding.qualityTextView.setText(getSelectedVideoStream().resolution); + binding.qualityTextView.setText(getSelectedVideoStream().resolution + sabrTag(getSelectedVideoStream())); } if (isPlaying()) { hideControls(DEFAULT_CONTROLS_DURATION, 0); diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayerServiceForAuto.java b/app/src/main/java/org/schabi/newpipe/player/PlayerServiceForAuto.java index b529c34bac..85b0ac81ad 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PlayerServiceForAuto.java +++ b/app/src/main/java/org/schabi/newpipe/player/PlayerServiceForAuto.java @@ -38,7 +38,8 @@ import androidx.core.content.ContextCompat; import androidx.media.MediaBrowserServiceCompat; -import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; +import android.net.Uri; +import android.support.v4.media.session.PlaybackStateCompat; import org.schabi.newpipe.App; import org.schabi.newpipe.databinding.PlayerBinding; import org.schabi.newpipe.player.mediabrowser.MediaBrowserImpl; @@ -71,7 +72,6 @@ public final class PlayerServiceForAuto extends MediaBrowserServiceCompat implem // these are instantiated in onCreate() as per // https://developer.android.com/training/cars/media#browser_workflow private MediaSessionCompat mediaSession; - private MediaSessionConnector sessionConnector; private Player player; private WindowManager windowManager; @@ -103,20 +103,44 @@ public void onCreate() { // see https://developer.android.com/training/cars/media#browser_workflow mediaSession = new MediaSessionCompat(this, "MediaSessionPlayerServ"); setSessionToken(mediaSession.getSessionToken()); - sessionConnector = new MediaSessionConnector(mediaSession); - sessionConnector.setMetadataDeduplicationEnabled(true); + mediaSession.setActive(true); mediaBrowserPlaybackPreparer = new MediaBrowserPlaybackPreparer( this, - sessionConnector::setCustomErrorMessage, - () -> sessionConnector.setCustomErrorMessage(null), + this::setSessionError, + () -> setSessionError(null, 0), (playWhenReady) -> { if (player != null) { player.onPrepare(); } } ); - sessionConnector.setPlaybackPreparer(mediaBrowserPlaybackPreparer); + mediaSession.setCallback(new MediaSessionCompat.Callback() { + @Override + public void onPrepare() { + mediaBrowserPlaybackPreparer.onPrepare(false); + } + + @Override + public void onPlayFromMediaId(final String mediaId, final Bundle extras) { + mediaBrowserPlaybackPreparer.onPrepareFromMediaId(mediaId, true, extras); + } + + @Override + public void onPrepareFromMediaId(final String mediaId, final Bundle extras) { + mediaBrowserPlaybackPreparer.onPrepareFromMediaId(mediaId, false, extras); + } + + @Override + public void onPlayFromSearch(final String query, final Bundle extras) { + mediaBrowserPlaybackPreparer.onPrepareFromSearch(query, true, extras); + } + + @Override + public void onPlayFromUri(final Uri uri, final Bundle extras) { + mediaBrowserPlaybackPreparer.onPrepareFromUri(uri, true, extras); + } + }); } private void createView() { @@ -302,6 +326,17 @@ public Player getPlayer() { return player; } + private void setSessionError(@Nullable final String message, final int code) { + final PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder() + .setActions(PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID); + if (message != null) { + builder.setState(PlaybackStateCompat.STATE_ERROR, 0, 1).setErrorMessage(code, message); + } else { + builder.setState(PlaybackStateCompat.STATE_NONE, 0, 1); + } + mediaSession.setPlaybackState(builder.build()); + } + /** * @return the media session for Android Auto compatibility */ diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/SabrChunkSource.java b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrChunkSource.java new file mode 100644 index 0000000000..151fcbc7df --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrChunkSource.java @@ -0,0 +1,145 @@ +package org.schabi.newpipe.player.datasource; + +import android.net.Uri; + +import androidx.annotation.Nullable; + +import androidx.media3.common.C; +import androidx.media3.common.Format; +import androidx.media3.datasource.DataSpec; +import androidx.media3.exoplayer.LoadingInfo; +import androidx.media3.exoplayer.SeekParameters; +import androidx.media3.exoplayer.source.chunk.BundledChunkExtractor; +import androidx.media3.exoplayer.source.chunk.Chunk; +import androidx.media3.exoplayer.source.chunk.ChunkExtractor; +import androidx.media3.exoplayer.source.chunk.ChunkHolder; +import androidx.media3.exoplayer.source.chunk.ChunkSource; +import androidx.media3.exoplayer.source.chunk.ContainerMediaChunk; +import androidx.media3.exoplayer.source.chunk.MediaChunk; +import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy; +import androidx.media3.extractor.Extractor; +import androidx.media3.extractor.mkv.MatroskaExtractor; +import androidx.media3.extractor.mp4.FragmentedMp4Extractor; +import androidx.media3.extractor.text.SubtitleParser; + +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrFormat; + +import java.io.IOException; +import java.util.List; + +/** + * Tier-2: feeds the media3 chunk framework one SABR segment per chunk. Because the framework drives + * loading by chunk INDEX (mapped from time), seeking is time-based and real, unlike the v1 byte + * stream that could not land a seek. One {@link FragmentedMp4Extractor} is shared per track via a + * {@link BundledChunkExtractor}; the init segment is loaded once as an {@link InitializationChunk}, + * then each media segment is a {@link ContainerMediaChunk}. + */ +final class SabrChunkSource implements ChunkSource { + + private final SabrSessionStore.Holder holder; + private final YoutubeSabrFormat format; + private final Format trackFormat; + private final int trackType; + private final Localization localization; + + @Nullable + private IOException fatalError; + + SabrChunkSource(final SabrSessionStore.Holder holder, + final YoutubeSabrFormat format, + final Format trackFormat, + final int trackType, + final Localization localization) { + this.holder = holder; + this.format = format; + this.trackFormat = trackFormat; + this.trackType = trackType; + this.localization = localization; + } + + @Override + public long getAdjustedSeekPositionUs(final long positionUs, final SeekParameters seekParameters) { + // Snap to the start of the segment that contains positionUs. + final int seq = holder.session.getStreamState() + .getSegmentNumberAtOrAfterTimeMs(format, positionUs / 1000); + final long startMs = holder.session.getStreamState().getSegmentStartMs(format, seq); + return Math.max(0, startMs) * 1000; + } + + @Override + public void maybeThrowError() throws IOException { + if (fatalError != null) { + throw fatalError; + } + } + + @Override + public int getPreferredQueueSize(final long playbackPositionUs, + final List queue) { + return queue.size(); + } + + @Override + public boolean shouldCancelLoad(final long playbackPositionUs, final Chunk loadingChunk, + final List queue) { + return false; + } + + @Override + public void getNextChunk(final LoadingInfo loadingInfo, final long loadPositionUs, + final List queue, final ChunkHolder out) { + final int nextSeq; + if (queue.isEmpty()) { + nextSeq = holder.session.getStreamState() + .getSegmentNumberAtOrAfterTimeMs(format, loadPositionUs / 1000); + } else { + nextSeq = (int) (queue.get(queue.size() - 1).getNextChunkIndex()); + } + final long endSeq = holder.session.getStreamState().getEndSegment(format); + if (endSeq > 0 && nextSeq > endSeq) { + out.endOfStream = true; + return; + } + out.chunk = newMediaChunk(nextSeq); + } + + private Chunk newMediaChunk(final int seq) { + final long startMs = holder.session.getStreamState().getSegmentStartMs(format, seq); + final long endMs = holder.session.getStreamState().getSegmentEndMs(format, seq); + final long startUs = Math.max(0, startMs) * 1000; + final long endUs = (endMs > 0 ? endMs : startMs) * 1000; + final DataSpec spec = new DataSpec(Uri.parse("sabrseg://" + format.getItag() + "/" + seq)); + // Fresh extractor per chunk: the data source prepends the init, so each chunk is a complete + // init + one fragment. Absolute fragment timestamps -> sampleOffsetUs = 0. Pick the container + // by mime: YouTube ships VP9/Opus in WebM (Matroska) and AVC/AAC in fragmented mp4. + final String mime = format.getMimeType(); + final Extractor extractorImpl = mime != null && mime.contains("webm") + ? new MatroskaExtractor(SubtitleParser.Factory.UNSUPPORTED) + : new FragmentedMp4Extractor(SubtitleParser.Factory.UNSUPPORTED); + final ChunkExtractor extractor = new BundledChunkExtractor( + extractorImpl, trackType, trackFormat); + return new ContainerMediaChunk( + new SabrSegmentDataSource(holder, format, localization, /* prependInit= */ true), + spec, trackFormat, C.SELECTION_REASON_UNKNOWN, null, + startUs, endUs, /* clippedStartTimeUs= */ startUs, /* clippedEndTimeUs= */ endUs, + /* chunkIndex= */ seq, /* chunkCount= */ 1, /* sampleOffsetUs= */ 0L, + extractor); + } + + @Override + public void onChunkLoadCompleted(final Chunk chunk) { + } + + @Override + public boolean onChunkLoadError(final Chunk chunk, final boolean cancelable, + final LoadErrorHandlingPolicy.LoadErrorInfo loadErrorInfo, + final LoadErrorHandlingPolicy loadErrorHandlingPolicy) { + // Let the framework apply its retry/backoff policy. + return false; + } + + @Override + public void release() { + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/SabrMediaPeriod.java b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrMediaPeriod.java new file mode 100644 index 0000000000..885ca558ec --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrMediaPeriod.java @@ -0,0 +1,287 @@ +package org.schabi.newpipe.player.datasource; + +import androidx.annotation.Nullable; + +import androidx.media3.common.C; +import androidx.media3.common.Format; +import androidx.media3.common.TrackGroup; +import androidx.media3.exoplayer.LoadingInfo; +import androidx.media3.exoplayer.SeekParameters; +import androidx.media3.exoplayer.drm.DrmSessionEventListener; +import androidx.media3.exoplayer.drm.DrmSessionManager; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSourceEventListener; +import androidx.media3.exoplayer.source.SampleStream; +import androidx.media3.exoplayer.source.SequenceableLoader; +import androidx.media3.exoplayer.source.TrackGroupArray; +import androidx.media3.exoplayer.source.chunk.ChunkSampleStream; +import androidx.media3.exoplayer.trackselection.ExoTrackSelection; +import androidx.media3.exoplayer.upstream.Allocator; +import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy; +import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy; + +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrFormat; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * Tier-2 {@link MediaPeriod} for SABR: exposes the audio and video tracks and backs each selected + * one with a {@link ChunkSampleStream} over a {@link SabrChunkSource}. Seeking is handled by the + * chunk streams (time -> chunk index), so it actually lands, unlike the v1 byte-stream source. + */ +final class SabrMediaPeriod implements MediaPeriod, + SequenceableLoader.Callback> { + + private final SabrSessionStore.Holder holder; + private final Localization localization; + private final long durationUs; + private final Allocator allocator; + private final DrmSessionManager drmSessionManager; + private final DrmSessionEventListener.EventDispatcher drmEventDispatcher; + private final MediaSourceEventListener.EventDispatcher mediaSourceEventDispatcher; + private final LoadErrorHandlingPolicy loadErrorHandlingPolicy = + new DefaultLoadErrorHandlingPolicy(); + + private final TrackGroupArray trackGroups; + private final YoutubeSabrFormat[] sabrFormats; + private final int[] trackTypes; + + private final List> streams = new ArrayList<>(); + private SequenceableLoader compositeLoader = new EmptyLoader(); + @Nullable + private MediaPeriod.Callback callback; + + SabrMediaPeriod(final SabrSessionStore.Holder holder, + final Format audioFormat, + final Format videoFormat, + final long durationUs, + final Allocator allocator, + final DrmSessionManager drmSessionManager, + final DrmSessionEventListener.EventDispatcher drmEventDispatcher, + final MediaSourceEventListener.EventDispatcher mediaSourceEventDispatcher, + final Localization localization) { + this.holder = holder; + this.localization = localization; + this.durationUs = durationUs; + this.allocator = allocator; + this.drmSessionManager = drmSessionManager; + this.drmEventDispatcher = drmEventDispatcher; + this.mediaSourceEventDispatcher = mediaSourceEventDispatcher; + this.sabrFormats = new YoutubeSabrFormat[]{holder.videoFormat, holder.audioFormat}; + this.trackTypes = new int[]{C.TRACK_TYPE_VIDEO, C.TRACK_TYPE_AUDIO}; + this.trackGroups = new TrackGroupArray( + new TrackGroup("sabr-video", videoFormat), + new TrackGroup("sabr-audio", audioFormat)); + } + + @Override + public void prepare(final MediaPeriod.Callback cb, final long positionUs) { + this.callback = cb; + cb.onPrepared(this); + } + + @Override + public void maybeThrowPrepareError() { + } + + @Override + public TrackGroupArray getTrackGroups() { + return trackGroups; + } + + @Override + public long selectTracks(final ExoTrackSelection[] selections, final boolean[] mayRetainFlags, + final SampleStream[] outStreams, final boolean[] streamResetFlags, + final long positionUs) { + // Release streams no longer wanted; create streams for newly selected tracks. + for (int i = 0; i < selections.length; i++) { + if (outStreams[i] instanceof ChunkSampleStream && (selections[i] == null + || !mayRetainFlags[i])) { + @SuppressWarnings("unchecked") + final ChunkSampleStream s = + (ChunkSampleStream) outStreams[i]; + streams.remove(s); + s.release(); + outStreams[i] = null; + } + if (outStreams[i] == null && selections[i] != null) { + final ChunkSampleStream s = buildStream(selections[i], positionUs); + streams.add(s); + outStreams[i] = s; + streamResetFlags[i] = true; + } + } + rebuildCompositeLoader(); + return positionUs; + } + + private ChunkSampleStream buildStream(final ExoTrackSelection selection, + final long positionUs) { + final TrackGroup group = selection.getTrackGroup(); + final int groupIndex = trackGroups.indexOf(group); + final Format trackFormat = group.getFormat(0); + final SabrChunkSource chunkSource = new SabrChunkSource(holder, sabrFormats[groupIndex], + trackFormat, trackTypes[groupIndex], localization); + // Last 3 args are new in media3 1.10 (handleInitialDiscontinuity, firstChunkStartTimeUs, + // downloadExecutor); false / TIME_UNSET / null reproduces the pre-1.10 behaviour. + return new ChunkSampleStream<>(trackTypes[groupIndex], null, null, chunkSource, this, + allocator, positionUs, drmSessionManager, drmEventDispatcher, + loadErrorHandlingPolicy, mediaSourceEventDispatcher, + false, C.TIME_UNSET, null); + } + + private void rebuildCompositeLoader() { + // Simplest correct loader: drive each stream; report the min buffered / max load position. + compositeLoader = new SequenceableLoader() { + @Override + public long getBufferedPositionUs() { + // Skip tracks already buffered to the end (END_OF_SOURCE = Long.MIN_VALUE), else a + // finished shorter track (audio) would collapse the min and make media3 think the + // whole period is buffered to the end, starving the still-loading video near the end. + long min = Long.MAX_VALUE; + for (final ChunkSampleStream s : streams) { + final long b = s.getBufferedPositionUs(); + if (b != C.TIME_END_OF_SOURCE) { + min = Math.min(min, b); + } + } + return min == Long.MAX_VALUE ? C.TIME_END_OF_SOURCE : min; + } + + @Override + public long getNextLoadPositionUs() { + long min = Long.MAX_VALUE; + for (final ChunkSampleStream s : streams) { + final long n = s.getNextLoadPositionUs(); + if (n != C.TIME_END_OF_SOURCE) { + min = Math.min(min, n); + } + } + return min == Long.MAX_VALUE ? C.TIME_END_OF_SOURCE : min; + } + + @Override + public boolean continueLoading(final LoadingInfo loadingInfo) { + boolean any = false; + for (final ChunkSampleStream s : streams) { + any |= s.continueLoading(loadingInfo); + } + return any; + } + + @Override + public boolean isLoading() { + for (final ChunkSampleStream s : streams) { + if (s.isLoading()) { + return true; + } + } + return false; + } + + @Override + public void reevaluateBuffer(final long positionUs) { + for (final ChunkSampleStream s : streams) { + s.reevaluateBuffer(positionUs); + } + } + }; + } + + @Override + public void discardBuffer(final long positionUs, final boolean toKeyframe) { + for (final ChunkSampleStream s : streams) { + s.discardBuffer(positionUs, toKeyframe); + } + } + + @Override + public long readDiscontinuity() { + return C.TIME_UNSET; + } + + @Override + public long seekToUs(final long positionUs) { + for (final ChunkSampleStream s : streams) { + s.seekToUs(positionUs); + } + return positionUs; + } + + @Override + public long getAdjustedSeekPositionUs(final long positionUs, final SeekParameters params) { + for (final ChunkSampleStream s : streams) { + return s.getAdjustedSeekPositionUs(positionUs, params); + } + return positionUs; + } + + @Override + public long getBufferedPositionUs() { + return compositeLoader.getBufferedPositionUs(); + } + + @Override + public long getNextLoadPositionUs() { + return compositeLoader.getNextLoadPositionUs(); + } + + @Override + public boolean continueLoading(final LoadingInfo loadingInfo) { + return compositeLoader.continueLoading(loadingInfo); + } + + @Override + public boolean isLoading() { + return compositeLoader.isLoading(); + } + + @Override + public void reevaluateBuffer(final long positionUs) { + compositeLoader.reevaluateBuffer(positionUs); + } + + @Override + public void onContinueLoadingRequested(final ChunkSampleStream source) { + if (callback != null) { + callback.onContinueLoadingRequested(this); + } + } + + void release() { + for (final ChunkSampleStream s : streams) { + s.release(); + } + streams.clear(); + } + + /** No-op loader used before any track is selected. */ + private static final class EmptyLoader implements SequenceableLoader { + @Override + public long getBufferedPositionUs() { + return C.TIME_END_OF_SOURCE; + } + + @Override + public long getNextLoadPositionUs() { + return C.TIME_END_OF_SOURCE; + } + + @Override + public boolean continueLoading(final LoadingInfo loadingInfo) { + return false; + } + + @Override + public boolean isLoading() { + return false; + } + + @Override + public void reevaluateBuffer(final long positionUs) { + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/SabrMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrMediaSource.java new file mode 100644 index 0000000000..2d928f248b --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrMediaSource.java @@ -0,0 +1,101 @@ +package org.schabi.newpipe.player.datasource; + +import androidx.annotation.Nullable; + +import androidx.media3.common.Format; +import androidx.media3.common.MediaItem; +import androidx.media3.common.MimeTypes; +import androidx.media3.datasource.TransferListener; +import androidx.media3.exoplayer.drm.DrmSessionManager; +import androidx.media3.exoplayer.source.BaseMediaSource; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.SinglePeriodTimeline; +import androidx.media3.exoplayer.upstream.Allocator; + +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrFormat; + +/** + * Tier-2 {@link androidx.media3.exoplayer.source.MediaSource} for SABR. Unlike the v1 + * ProgressiveMediaSource over a byte stream (which could not seek), this exposes a seekable + * single-period timeline and a {@link SabrMediaPeriod} backed by the chunk framework, so seeking is + * time-based and lands correctly. The session is created by the resolver and handed in. + */ +public final class SabrMediaSource extends BaseMediaSource { + + private final MediaItem mediaItem; + private final SabrSessionStore.Holder holder; + private final Localization localization; + private final Format audioFormat; + private final Format videoFormat; + private final long durationUs; + + public SabrMediaSource(final MediaItem mediaItem, + final SabrSessionStore.Holder holder, + final Localization localization) { + this.mediaItem = mediaItem; + this.holder = holder; + this.localization = localization; + this.audioFormat = toMedia3Format(holder.audioFormat); + this.videoFormat = toMedia3Format(holder.videoFormat); + this.durationUs = Math.max(holder.audioFormat.getApproxDurationMs(), + holder.videoFormat.getApproxDurationMs()) * 1000L; + } + + @Override + public MediaItem getMediaItem() { + return mediaItem; + } + + @Override + protected void prepareSourceInternal(@Nullable final TransferListener mediaTransferListener) { + refreshSourceInfo(new SinglePeriodTimeline(durationUs, /* isSeekable= */ true, + /* isDynamic= */ false, /* useLiveConfiguration= */ false, + /* manifest= */ null, mediaItem)); + } + + @Override + public void maybeThrowSourceInfoRefreshError() { + } + + @Override + public MediaPeriod createPeriod(final MediaPeriodId id, final Allocator allocator, + final long startPositionUs) { + return new SabrMediaPeriod(holder, audioFormat, videoFormat, durationUs, allocator, + DrmSessionManager.DRM_UNSUPPORTED, createDrmEventDispatcher(id), + createEventDispatcher(id), localization); + } + + @Override + public void releasePeriod(final MediaPeriod mediaPeriod) { + ((SabrMediaPeriod) mediaPeriod).release(); + } + + @Override + protected void releaseSourceInternal() { + } + + private static Format toMedia3Format(final YoutubeSabrFormat f) { + final String mime = f.getMimeType(); + String container = mime; + String codecs = null; + final int sc = mime.indexOf(';'); + if (sc > 0) { + container = mime.substring(0, sc).trim(); + } + final int ci = mime.indexOf("codecs="); + if (ci >= 0) { + codecs = mime.substring(ci + "codecs=".length()).replace("\"", "").trim(); + } + final Format.Builder b = new Format.Builder() + .setId(String.valueOf(f.getItag())) + .setContainerMimeType(container) + .setCodecs(codecs) + .setSampleMimeType(codecs != null ? MimeTypes.getMediaMimeType(codecs) : container) + .setAverageBitrate(f.getBitrate()); + if (f.isVideo()) { + b.setWidth(f.getWidth()).setHeight(f.getHeight()); + } + return b.build(); + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/SabrSegmentDataSource.java b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrSegmentDataSource.java new file mode 100644 index 0000000000..168e2b990b --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrSegmentDataSource.java @@ -0,0 +1,190 @@ +package org.schabi.newpipe.player.datasource; + +import android.net.Uri; + +import androidx.annotation.Nullable; + +import androidx.media3.common.C; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.DataSpec; +import androidx.media3.datasource.TransferListener; + +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrMediaSegment; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrSegmentRequest; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrFormat; + +import java.io.IOException; + +/** + * Tier-2 chunk source helper: a {@link DataSource} that serves exactly ONE SABR segment (the init + * segment or one media segment) from the session cache, then ends. The chunk framework + * ({@code ChunkSampleStream}) opens one of these per chunk, so seeking is handled by the framework + * picking the chunk index, NOT by byte-skipping a continuous stream (which the v1 source could not + * land). + * + *

The segment is identified by the {@link DataSpec} uri: {@code sabrseg:///init} or + * {@code sabrseg:///}.

+ */ +public final class SabrSegmentDataSource implements DataSource { + + private static final long WAIT_MS = 250; + private static final long STALL_MS = 120_000; + // After waiting this long for a media segment that's BEHIND the buffered edge, treat it as a + // backward seek onto an evicted segment and ask the pump to reposition the session there. + private static final long REFETCH_AFTER_MS = 2_000; + + private final SabrSessionStore.Holder holder; + private final YoutubeSabrFormat format; + private final Localization localization; + // Prepend the init segment so each media chunk is a self-contained fmp4 (init + one fragment), + // which a fresh FragmentedMp4Extractor parses fully. SABR's init isn't a clean standalone atom + // boundary, so feeding it on its own (DASH-style InitializationChunk) hit an EOF mid-atom. + private final boolean prependInit; + + @Nullable + private Uri uri; + @Nullable + private byte[] data; + private int pos; + private boolean opened; + private volatile boolean canceled; + + public SabrSegmentDataSource(final SabrSessionStore.Holder holder, + final YoutubeSabrFormat format, + final Localization localization, + final boolean prependInit) { + this.holder = holder; + this.format = format; + this.localization = localization; + this.prependInit = prependInit; + } + + @Override + public void addTransferListener(final TransferListener transferListener) { + // Bandwidth metering not wired for the SABR source. + } + + @Override + public long open(final DataSpec dataSpec) throws IOException { + this.uri = dataSpec.uri; + this.canceled = false; + this.pos = (int) Math.max(0, dataSpec.position); + final SabrSegmentRequest request = requestFromUri(dataSpec.uri); + if (prependInit && !request.isInitializationSegment()) { + final byte[] init = awaitSegment(SabrSegmentRequest.initialization(format)); + final byte[] media = awaitSegment(request); + final byte[] both = new byte[init.length + media.length]; + System.arraycopy(init, 0, both, 0, init.length); + System.arraycopy(media, 0, both, init.length, media.length); + this.data = both; + } else { + this.data = awaitSegment(request); + } + this.opened = true; + final int remaining = data.length - pos; + return dataSpec.length == C.LENGTH_UNSET ? remaining : Math.min(dataSpec.length, remaining); + } + + @Override + public int read(final byte[] target, final int offset, final int length) { + if (length == 0) { + return 0; + } + if (data == null || pos >= data.length) { + return C.RESULT_END_OF_INPUT; + } + final int toCopy = Math.min(length, data.length - pos); + System.arraycopy(data, pos, target, offset, toCopy); + pos += toCopy; + return toCopy; + } + + private SabrSegmentRequest requestFromUri(final Uri u) throws IOException { + // sabrseg:/// + final String seg = u.getLastPathSegment(); + if (seg == null) { + throw new IOException("Bad SABR segment uri: " + u); + } + if ("init".equals(seg)) { + return SabrSegmentRequest.initialization(format); + } + try { + return SabrSegmentRequest.media(format, Integer.parseInt(seg)); + } catch (final NumberFormatException e) { + throw new IOException("Bad SABR segment uri: " + u, e); + } + } + + /** Block until the pump has cached this segment, or give up on a real stall / cancellation. */ + private byte[] awaitSegment(final SabrSegmentRequest request) throws IOException { + final SabrStreamPump pump = holder.getPump(localization); + final long waitStart = System.currentTimeMillis(); + long lastRefetchMs = 0; + while (true) { + if (canceled) { + throw new IOException("SABR segment read canceled"); + } + pump.ensureStarted(); + final SabrMediaSegment segment = pump.getCached(request); + if (segment != null) { + if (!segment.getHeader().isInitSegment()) { + // Tell the pump how far this track has been loaded so it keeps feeding ahead + // (and repositions after a seek). Without this readerHead stayed 0 and the pump + // throttled forever after the initial fill. + holder.setReaderPositionMs(format.getItag(), + segment.getHeader().getStartMs() + segment.getHeader().getDurationMs()); + } + return segment.getData(); + } + if (pump.isFatal()) { + throw new IOException("SABR pump fatal for itag=" + format.getItag()); + } + // Backward seek to an evicted segment behind the buffered edge: the forward pump never + // re-fetches it, so it would never arrive. Drop our read position onto it (so eviction + + // pacing follow the rewind, not the stale pre-seek position) and ask the pump to + // reposition the session there. The edge check leaves a merely-slow forward fetch (the + // segment is still ahead of the edge) to the normal pump, so forward playback is untouched. + if (!request.isInitializationSegment()) { + final long now = System.currentTimeMillis(); + if (now - waitStart > REFETCH_AFTER_MS && now - lastRefetchMs > REFETCH_AFTER_MS) { + final long edgeMs = holder.session.getStreamState().getMinBufferedEndMs(); + final long segStartMs = holder.session.getStreamState() + .getSegmentStartMs(format, request.getSequenceNumber()); + if (segStartMs < edgeMs) { + holder.setReaderPositionMs(format.getItag(), segStartMs); + pump.requestRefetchFrom(request); + lastRefetchMs = now; + } + } + } + // Stall = THIS segment hasn't arrived within STALL_MS of us actually waiting for it. Do + // NOT use the pump's "time since it last produced a segment": the pump legitimately stops + // producing while throttled (buffer full, edge far ahead), so that clock goes stale and + // the first cache miss after a long throttle false-stalls at ~STALL_MS. That was the + // recurring ~2min freeze on longer/higher-bitrate streams. + if (System.currentTimeMillis() - waitStart > STALL_MS) { + throw new IOException("SABR segment stalled for itag=" + format.getItag()); + } + try { + Thread.sleep(WAIT_MS); + } catch (final InterruptedException ie) { + Thread.currentThread().interrupt(); + throw new IOException("Interrupted awaiting SABR segment", ie); + } + } + } + + @Nullable + @Override + public Uri getUri() { + return uri; + } + + @Override + public void close() { + canceled = true; + data = null; + opened = false; + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/SabrSessionStore.java b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrSessionStore.java new file mode 100644 index 0000000000..34918fe075 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrSessionStore.java @@ -0,0 +1,371 @@ +package org.schabi.newpipe.player.datasource; + +import android.content.Context; +import android.media.MediaCodecInfo; +import android.media.MediaCodecList; + +import androidx.annotation.NonNull; + +import org.schabi.newpipe.extractor.exceptions.ExtractionException; +import org.schabi.newpipe.extractor.localization.ContentCountry; +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrPoTokenProvider; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrSegmentRequest; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrClientProfile; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrFormat; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrInfo; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrSession; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Caches one shared {@link YoutubeSabrSession} per videoId so the audio and video + * {@link SabrSegmentDataSource}s drive the same session (a single SABR response carries both formats, so + * the session's segment cache serves both without doubling bandwidth). + * + *

v1: uses the best audio/video formats from the player response and a fixed en/US locale.

+ */ +public final class SabrSessionStore { + + private static final Map SESSIONS = new ConcurrentHashMap<>(); + // Current video plus one (next-item prefetch). Keeping more let abandoned sessions' pump threads + // linger and bleed into the new playback on a switch, leaving the decoder with no usable frame + // (black screen). Evicting the superseded session promptly (and stopping its pump) fixes that. + // Mutated only under the class lock. + private static final int MAX_SESSIONS = 2; + private static final java.util.Deque ORDER = new java.util.ArrayDeque<>(); + // Shared across videos so the PO-token cache (videoId-keyed, ~6h) is reused and a single + // WebView is held instead of one per video. + private static volatile WebViewPoTokenProvider sharedProvider; + + private SabrSessionStore() { + } + + @NonNull + private static WebViewPoTokenProvider provider(@NonNull final Context context) { + WebViewPoTokenProvider p = sharedProvider; + if (p == null) { + synchronized (SabrSessionStore.class) { + p = sharedProvider; + if (p == null) { + p = new WebViewPoTokenProvider(context.getApplicationContext()); + sharedProvider = p; + } + } + } + return p; + } + + /** Bundle of the session and its selected formats for a given video. */ + public static final class Holder { + @NonNull public final String videoId; + @NonNull public final YoutubeSabrInfo info; + @NonNull public final YoutubeSabrSession session; + @NonNull public final YoutubeSabrFormat audioFormat; + @NonNull public final YoutubeSabrFormat videoFormat; + + // Real playback position (ms); written by the player loop. Kept for reference but NOT used to + // drive the pump/eviction: it freezes when the player buffers, which deadlocked everything. + private volatile long playerTimeMs; + // What each track's data source has actually read (segment end ms). This is the truth the pump + // and eviction run on: it never goes stale (a stalled reader sits on its last segment, so the + // pump sees edge ~= readerHead and keeps feeding instead of pacing off a frozen play head). + private final Map readerPositions = new ConcurrentHashMap<>(); + private volatile SabrStreamPump pump; + + Holder(@NonNull final String videoId, + @NonNull final YoutubeSabrInfo info, + @NonNull final YoutubeSabrSession session, + @NonNull final YoutubeSabrFormat audioFormat, + @NonNull final YoutubeSabrFormat videoFormat) { + this.videoId = videoId; + this.info = info; + this.session = session; + this.audioFormat = audioFormat; + this.videoFormat = videoFormat; + } + + public long getPlayerTimeMs() { + return playerTimeMs; + } + + void setPlayerTimeMs(final long playerTimeMs) { + this.playerTimeMs = playerTimeMs; + } + + /** A data source reports how far it has read (last served segment end, ms). */ + public void setReaderPositionMs(final int itag, final long ms) { + readerPositions.put(itag, ms); + } + + /** Furthest-read track: the pump keeps the buffered edge a cushion ahead of THIS. */ + public long getReaderHeadMs() { + long head = 0; + final Long a = readerPositions.get(audioFormat.getItag()); + final Long v = readerPositions.get(videoFormat.getItag()); + if (a != null) { + head = Math.max(head, a); + } + if (v != null) { + head = Math.max(head, v); + } + return head; + } + + /** Slowest-read track: nothing before this is needed any more, so eviction starts here. Zero + * until BOTH tracks have read something (else we'd evict the other track's unread segments). */ + public long getReaderTailMs() { + final Long a = readerPositions.get(audioFormat.getItag()); + final Long v = readerPositions.get(videoFormat.getItag()); + if (a == null || v == null) { + return 0; + } + return Math.min(a, v); + } + + /** Lazily create the single background pump that feeds both data sources for this video. */ + synchronized SabrStreamPump getPump(@NonNull final Localization localization) { + if (pump == null) { + pump = new SabrStreamPump(session, this, localization); + } + return pump; + } + + boolean isBeyondEnd(@NonNull final SabrSegmentRequest request) { + return session.isBeyondEnd(request); + } + } + + // Report the real playback position; no-op when the video has no live SABR session. + public static void updatePlayerTime(@NonNull final String videoId, final long playerTimeMs) { + final Holder holder = SESSIONS.get(videoId); + if (holder != null && playerTimeMs >= 0) { + holder.setPlayerTimeMs(playerTimeMs); + } + } + + // <=0 = audio-only / no preference -> any cached session is fine. Otherwise the session matches + // when the requested itag RESOLVES to the same format the session already holds. Comparing the + // raw itag is wrong: pickVideoFormat falls back when the requested itag isn't hw-decodable, so + // the session's format legitimately differs from the requested itag and we'd rebuild on every + // normal resolve (-> evict/rebuild loop -> endless buffering). Only a real quality change, which + // resolves to a different format, triggers a rebuild. + private static boolean sessionMatchesItag(@NonNull final Holder holder, + final int preferredVideoItag) { + if (preferredVideoItag <= 0) { + return true; + } + final YoutubeSabrFormat wanted = pickVideoFormat(holder.info, preferredVideoItag); + return wanted != null && wanted.getItag() == holder.videoFormat.getItag(); + } + + @NonNull + public static Holder getOrCreate(@NonNull final Context context, + @NonNull final String videoId, + final int preferredVideoItag) + throws IOException, ExtractionException { + final Holder existing = SESSIONS.get(videoId); + if (existing != null && sessionMatchesItag(existing, preferredVideoItag)) { + return existing; + } + synchronized (SabrSessionStore.class) { + final Holder current = SESSIONS.get(videoId); + if (current != null) { + if (sessionMatchesItag(current, preferredVideoItag)) { + return current; + } + // Quality/codec change: the resolver re-asks with a different video itag for the same + // video. The cached session is locked to its formats, so returning it would re-prepare + // the player on the old codec and dead-buffer. Drop it (stops the pump) + rebuild below. + evict(videoId); + } + final Localization localization = new Localization("en", "US"); + final ContentCountry contentCountry = new ContentCountry("US"); + final YoutubeSabrInfo info = YoutubeSabrProbeFetch(videoId, localization, contentCountry); + final YoutubeSabrFormat audioFormat = pickAudioFormat(info); + final YoutubeSabrFormat videoFormat = pickVideoFormat(info, preferredVideoItag); + if (audioFormat == null || videoFormat == null) { + throw new IOException("SABR: could not select audio/video formats for " + videoId); + } + final SabrPoTokenProvider provider = provider(context); + final YoutubeSabrSession session = + new YoutubeSabrSession(info, audioFormat, videoFormat, provider); + final Holder holder = new Holder(videoId, info, session, audioFormat, videoFormat); + SESSIONS.put(videoId, holder); + // LRU bound: evict the oldest sessions (their pumps are stopped, caches freed). + ORDER.remove(videoId); + ORDER.addLast(videoId); + while (ORDER.size() > MAX_SESSIONS) { + final String old = ORDER.pollFirst(); + if (old != null && !old.equals(videoId)) { + evict(old); + } + } + // Pre-warm the PO token off-thread so the ~45s WebView mint overlaps the initial probe + // and buffering instead of stalling the pump on its first protected response. + final Thread warm = new Thread(() -> { + try { + provider.getPoToken(info, session.getStreamState()); + } catch (final Exception ignored) { + // Best-effort; the pump mints on demand if this fails. + } + }, "SabrTokenPrewarm"); + warm.setDaemon(true); + warm.start(); + return holder; + } + } + + @NonNull + private static YoutubeSabrInfo YoutubeSabrProbeFetch(@NonNull final String videoId, + @NonNull final Localization localization, + @NonNull final ContentCountry contentCountry) + throws IOException, ExtractionException { + return org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrProbe.fetchSabrInfo( + videoId, YoutubeSabrClientProfile.WEB, localization, contentCountry); + } + + // Force AAC (mp4) audio instead of the "best" (Opus/webm). honestly: Opus/webm audio just does + // NOT work through this chunk pipeline. it under-supplies the audio renderer -> AudioTrack + // underruns -> constant rebuffering (hundreds vs ~2 on AAC, phone cooks). re-confirmed on media3 + // 1.10 AFTER fixing the separate ~2min pump false-stall, so it's its own bug, not that one. i + // spent ~2h on it: ruled out fetch, cache, chunk timing, the media3 loading contract, buffer + // size... the data IS cached fine, so it's somewhere inside media3's Opus/webm extract->render + // with the way we chunk it, and i still have no fucking idea how to fix it. AAC (itag 140) is + // mp4, hardware-decoded, ~same bitrate (130 vs 136 kbps) and plays perfectly smooth. so: AAC + // until someone cracks the Opus path. (audio codec isn't user-facing, so this isn't a band-aid + // on a user setting, just an internal pick.) + private static YoutubeSabrFormat pickAudioFormat(@NonNull final YoutubeSabrInfo info) { + YoutubeSabrFormat aac = null; + for (final YoutubeSabrFormat f : info.getFormats()) { + if (!f.isAudio()) { + continue; + } + final String mime = f.getMimeType(); + if (mime != null && mime.contains("mp4") && (aac == null + || f.getBitrate() > aac.getBitrate())) { + aac = f; + } + } + return aac != null ? aac : info.findBestAudioFormat(); + } + + /** Honour the user-selected quality when that format is present and hardware-decodable; + * otherwise fall back to the best hardware-friendly one. */ + private static YoutubeSabrFormat pickVideoFormat(@NonNull final YoutubeSabrInfo info, + final int preferredItag) { + final boolean hwVp9 = hasHardwareDecoder("video/x-vnd.on2.vp9"); + final boolean hwAv1 = hasHardwareDecoder("video/av01"); + int preferredHeight = 0; + if (preferredItag > 0) { + for (final YoutubeSabrFormat f : info.getFormats()) { + if (f.isVideo() && f.getItag() == preferredItag) { + if (isDecodable(f, hwVp9, hwAv1)) { + return f; + } + // Right resolution, wrong codec for this device (e.g. AV1 1080p with no HW AV1): + // remember the height so we fall back to a decodable codec at the SAME resolution. + preferredHeight = f.getHeight(); + break; + } + } + } + // Fall back to the highest decodable format AT the user's chosen resolution, not the absolute + // highest: otherwise an undecodable AV1 1080p pick would jump to VP9 4K (heavier, and on the + // Pixel it claims HW it can't sustain). preferredHeight 0 (no preference) = no cap. + return pickHardwareFriendlyVideo(info, preferredHeight); + } + + private static boolean isDecodable(@NonNull final YoutubeSabrFormat f, + final boolean hwVp9, final boolean hwAv1) { + final String codec = codecFamily(f.getMimeType()); + return "avc".equals(codec) + || ("vp9".equals(codec) && hwVp9) + || ("av1".equals(codec) && hwAv1); + } + + /** + * Pick the highest-resolution video format the device can decode in HARDWARE. The decoder is + * chosen by ExoPlayer from the container bytes, so a codec the device only decodes in software + * (e.g. AV1 on most phones, or VP9 where there's no HW VP9) melts the CPU and overheats. So we + * allow AVC always (universally HW), VP9 only when a HW VP9 decoder exists, AV1 only when a HW + * AV1 decoder exists; otherwise fall back to the overall best (better some playback than none). + */ + private static YoutubeSabrFormat pickHardwareFriendlyVideo(@NonNull final YoutubeSabrInfo info, + final int maxHeight) { + final boolean hwVp9 = hasHardwareDecoder("video/x-vnd.on2.vp9"); + final boolean hwAv1 = hasHardwareDecoder("video/av01"); + YoutubeSabrFormat best = null; + for (final YoutubeSabrFormat f : info.getFormats()) { + if (!f.isVideo()) { + continue; + } + if (!isDecodable(f, hwVp9, hwAv1)) { + continue; + } + if (maxHeight > 0 && f.getHeight() > maxHeight) { + continue; // don't exceed the user's chosen resolution + } + if (best == null || f.getHeight() > best.getHeight() + || (f.getHeight() == best.getHeight() && f.getBitrate() > best.getBitrate())) { + best = f; + } + } + return best != null ? best : info.findBestVideoFormat(); + } + + /** Normalise a SABR format mimeType ({@code codecs="..."}) to a codec family, or null. */ + @NonNull + private static String codecFamily(final String mimeType) { + if (mimeType == null) { + return ""; + } + if (mimeType.contains("avc1") || mimeType.contains("avc3")) { + return "avc"; + } + if (mimeType.contains("vp9") || mimeType.contains("vp09")) { + return "vp9"; + } + if (mimeType.contains("av01")) { + return "av1"; + } + return ""; + } + + /** True if the device exposes a non-software (hardware) decoder for the given mime type. */ + private static boolean hasHardwareDecoder(@NonNull final String mimeType) { + try { + for (final MediaCodecInfo codec + : new MediaCodecList(MediaCodecList.ALL_CODECS).getCodecInfos()) { + if (codec.isEncoder()) { + continue; + } + final String name = codec.getName().toLowerCase(); + // Software decoders on Android are named c2.android.* / c2.google.* / omx.google.*. + if (name.startsWith("c2.android.") || name.startsWith("c2.google.") + || name.startsWith("omx.google.")) { + continue; + } + for (final String type : codec.getSupportedTypes()) { + if (type.equalsIgnoreCase(mimeType)) { + return true; + } + } + } + } catch (final Exception e) { + // If capability probing fails, be conservative (treat as no HW decoder). + return false; + } + return false; + } + + /** Evict a cached session, stopping its pump so the thread + buffers are released. */ + public static void evict(@NonNull final String videoId) { + final Holder holder = SESSIONS.remove(videoId); + if (holder != null && holder.pump != null) { + holder.pump.stop(); + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/SabrStreamPump.java b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrStreamPump.java new file mode 100644 index 0000000000..9ff39c4248 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/SabrStreamPump.java @@ -0,0 +1,193 @@ +package org.schabi.newpipe.player.datasource; + +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import org.schabi.newpipe.extractor.exceptions.ExtractionException; +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrMediaSegment; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrSegmentRequest; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrSession; + +import java.io.IOException; +import java.util.List; + +/** + * Single consumer of a {@link YoutubeSabrSession}: one daemon thread pumps the server-driven SABR + * stream and fills the session's (concurrent) segment cache ahead of the play head. The server + * paces us with policy-only responses once we are far enough ahead. Both the audio and video + * {@link SabrSegmentDataSource}s only read the cache, so they never fight over the session or block each + * other on a network round-trip, which is exactly what starved a track in the old on-demand approach. + */ +final class SabrStreamPump { + + private static final String TAG = "SabrStreamPump"; + private static final long IDLE_POLL_MS = 400; // server paced us / nothing new this round + private static final long ERROR_RETRY_MS = 1000; // transient network error + // no reads for this long -> playback is gone. MUST stay above READAHEAD_CUSHION_MS: once the + // player buffer is full it stops reading us for ~cushion seconds, and killing the pump in that + // window left the cache to drain dry -> periodic rebuffering. + private static final long IDLE_STOP_MS = 90_000; + // Margin the buffered edge stays ahead of the furthest-read track. Driven off the reader (not the + // play head) it only needs to cover a few segments, so it stays small -> bounded memory even at 4K. + private static final long READAHEAD_CUSHION_MS = 30_000; + // Hard byte ceiling on read-ahead so a high-bitrate (4K) stream can't OOM the heap: 50s of 4K is + // ~160MB and crashed. ~100MB still covers the player's ~30s read-ahead, well under the OOM line. + private static final long MAX_AHEAD_BYTES = 100L * 1024 * 1024; + // Keep this much already-played video in the cache so a short backward seek lands on cached + // segments instead of a hole (eviction used to drop everything the reader passed, so any rewind + // hit an evicted segment the pump never re-fetches -> dead buffer). Bounded, same order as the + // forward cushion. Rewinds beyond this still need a session re-request (separate follow-up). + private static final long BACK_BUFFER_MS = 30_000; + // Fallback back-buffer used when the cache is already over the byte budget: at high bitrate (4K) + // a 30s back-buffer + readahead exceeds MAX_AHEAD_BYTES, and since eviction can't drop segments + // within the back-buffer window the cache can't drain -> the pump throttles forever and stalls. + // Shrinking the back-buffer when over budget lets eviction free bytes so playback keeps fetching. + private static final long MIN_BACK_BUFFER_MS = 5_000; + + private final YoutubeSabrSession session; + private final SabrSessionStore.Holder holder; + private final Localization localization; + + private volatile boolean started; + private volatile boolean stopped; + private volatile boolean fatal; + private volatile long lastReadMs; + // Set by a reader blocked on an evicted segment behind the edge (backward seek); the loop + // repositions the session onto it next round. Single-slot: the latest rewind target wins. + private volatile SabrSegmentRequest pendingRefetch; + private Thread thread; + + SabrStreamPump(@NonNull final YoutubeSabrSession session, + @NonNull final SabrSessionStore.Holder holder, + @NonNull final Localization localization) { + this.session = session; + this.holder = holder; + this.localization = localization; + } + + /** Start (or restart, if it idled out) the pump thread, and mark the session as actively read. */ + void ensureStarted() { + lastReadMs = System.currentTimeMillis(); + if (fatal || (started && !stopped)) { + return; + } + synchronized (this) { + if (fatal || (started && !stopped)) { + return; + } + stopped = false; + started = true; + thread = new Thread(this::loop, "SabrStreamPump"); + thread.setDaemon(true); + thread.start(); + } + } + + /** Stop the pump thread and release it (called on eviction / playback teardown). */ + void stop() { + synchronized (this) { + stopped = true; + // Don't self-interrupt: stop() is also reached from the pump thread itself via + // evict-on-fatal, and setting our own interrupt flag could break a later blocking call. + if (thread != null && thread != Thread.currentThread()) { + thread.interrupt(); + } + } + } + + @Nullable + SabrMediaSegment getCached(@NonNull final SabrSegmentRequest request) { + // revive the pump if it idled out: any read means playback is live again. + ensureStarted(); + return session.getCachedSegment(request); + } + + boolean isFatal() { + return fatal; + } + + /** A reader is blocked on an evicted segment behind the buffered edge (backward seek). Ask the + * loop to reposition the session onto it so the server re-sends from there. */ + void requestRefetchFrom(@NonNull final SabrSegmentRequest request) { + pendingRefetch = request; + ensureStarted(); + } + + private void loop() { + try { + while (!stopped) { + if (System.currentTimeMillis() - lastReadMs > IDLE_STOP_MS || session.isComplete()) { + break; + } + try { + // Drive off what the player has ACTUALLY read, not the play head: the play head + // freezes while buffering and that deadlocked the pump. readerHead = furthest + // track read; readerTail = slowest track read (safe to evict below). + final long readerHeadMs = holder.getReaderHeadMs(); + // Evict what both tracks have read past, EVERY round (or a full cache never drains + // and the throttle latches forever -> freeze), keeping BACK_BUFFER_MS behind the + // reader so a short backward seek finds its segments cached. But when the cache is + // already over the byte budget (high bitrate), shrink the back-buffer so eviction + // can actually drain it, otherwise the pump throttles forever and playback stalls. + final long backBufferMs = session.getCachedBytes() > MAX_AHEAD_BYTES + ? MIN_BACK_BUFFER_MS : BACK_BUFFER_MS; + session.setPlayHeadMs(Math.max(0, holder.getReaderTailMs() - backBufferMs)); + session.evictPlayed(); + final long edgeMs = session.getStreamState().getMinBufferedEndMs(); + // Backward seek beyond the back-buffer: a reader is blocked on an evicted segment + // behind the edge. Reposition the session onto it (prepareForMediaSegment sets + // buffered=up-to-(seg-1) + playerTime=seg start, so the server re-sends from there) + // instead of fetching forward this round. Bypasses the throttle by design. + final SabrSegmentRequest refetch = pendingRefetch; + if (refetch != null) { + pendingRefetch = null; + session.prepareForRewind(refetch); + session.pumpOnce(localization); + continue; + } + final boolean throttled = edgeMs - readerHeadMs > READAHEAD_CUSHION_MS + || session.getCachedBytes() > MAX_AHEAD_BYTES; + if (throttled) { + Thread.sleep(IDLE_POLL_MS); + continue; + } + // Report the CONTIGUOUS buffered edge (not readerHead): the server fills from the + // reported position, so reporting readerHead (ahead of a laggard track) made it + // skip past the gap and the slow track's edge never advanced. Pace on readerHead, + // report on edge. + session.getStreamState().setPlayerTimeMs(edgeMs); + final List segments = session.pumpOnce(localization); + if (segments.isEmpty()) { + Thread.sleep(IDLE_POLL_MS); + } + } catch (final InterruptedException e) { + Thread.currentThread().interrupt(); + break; + } catch (final IOException e) { + sleepQuietly(ERROR_RETRY_MS); + } catch (final ExtractionException e) { + Log.i(TAG, "SABR pump fatal: " + e.getMessage()); + fatal = true; + // Drop the dead session so a re-open rebuilds a fresh one (new token, new state). + SabrSessionStore.evict(holder.videoId); + break; + } + } + } finally { + synchronized (this) { + stopped = true; + } + } + } + + private static void sleepQuietly(final long ms) { + try { + Thread.sleep(ms); + } catch (final InterruptedException e) { + Thread.currentThread().interrupt(); + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/WebViewPoTokenProvider.java b/app/src/main/java/org/schabi/newpipe/player/datasource/WebViewPoTokenProvider.java new file mode 100644 index 0000000000..6f9358dc21 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/WebViewPoTokenProvider.java @@ -0,0 +1,329 @@ +package org.schabi.newpipe.player.datasource; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.os.Handler; +import android.os.Looper; +import android.util.Log; +import android.webkit.JavascriptInterface; +import android.webkit.WebResourceRequest; +import android.webkit.WebResourceResponse; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; + +import androidx.annotation.Nullable; + +import org.json.JSONObject; +import org.schabi.newpipe.extractor.services.youtube.sabr.SabrPoTokenProvider; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrInfo; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrStreamState; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + +/** + * Generates YouTube SABR PO tokens by running the official BotGuard challenge inside a headless + * WebView (the legitimate attestation runtime), then handing the minted, videoId-bound token to the + * extractor's SABR session via {@link SabrPoTokenProvider}. + * + *

Validated end to end (emulator + Pixel 8 / GrapheneOS Vanadium): the WebView produces a token + * GenerateIT accepts and that flips SABR protection status 2 -> 1.

+ * + *

The provider blocks the calling (loading) thread on a latch while the WebView, driven on the + * main thread, runs the pipeline. Tokens are cached per videoId (~6h, well under the measured ~7-8h + * lifetime).

+ */ +public final class WebViewPoTokenProvider implements SabrPoTokenProvider { + + private static final String TAG = "WebViewPoToken"; + private static final String ASSET = "sabr_potoken_poc.js"; + private static final String DESKTOP_UA = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 " + + "(KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36"; + private static final long TOKEN_TTL_MS = 6L * 60L * 60L * 1000L; // 6 hours + // The WebView BotGuard mint can occasionally run long; a single 45s shot timing out returned a + // null token -> token-less SABR -> cold-start failure. 60s + one retry (in getPoToken) is robust. + private static final long PIPELINE_TIMEOUT_MS = 60_000L; + // Persist minted tokens across process restarts so an app cold-start doesn't pay the ~45s mint + // again while the videoId-bound token is still valid (<6h). + private static final String PREFS = "sabr_potoken_cache"; + private static final int READY_RETRIES = 20; + private static final long READY_POLL_MS = 250L; + + private static final class CachedToken { + private final byte[] token; + private final long mintedAtMs; + + CachedToken(final byte[] token, final long mintedAtMs) { + this.token = token; + this.mintedAtMs = mintedAtMs; + } + } + + private final Context appContext; + private final Handler mainHandler; + private final android.content.SharedPreferences prefs; + private final Map cache = new ConcurrentHashMap<>(); + // one lock per videoId so two callers (pre-warm + pump) don't both fire the ~45s WebView mint + // for the same video. second one just waits and takes the cached token. + private final Map mintLocks = new ConcurrentHashMap<>(); + + public WebViewPoTokenProvider(final Context context) { + this.appContext = context.getApplicationContext(); + this.mainHandler = new Handler(Looper.getMainLooper()); + this.prefs = this.appContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE); + } + + @Nullable + @Override + public byte[] getPoToken(final YoutubeSabrInfo info, final YoutubeSabrStreamState streamState) { + return getPoToken(info, streamState, false); + } + + @Nullable + @Override + public byte[] getPoToken(final YoutubeSabrInfo info, final YoutubeSabrStreamState streamState, + final boolean forceRefresh) { + final String videoId = info.getVideoId(); + if (forceRefresh) { + // Server rejected the cached token (expired): drop it (memory + disk) and mint fresh. + cache.remove(videoId); + prefs.edit().remove(videoId).apply(); + } + synchronized (mintLocks.computeIfAbsent(videoId, k -> new Object())) { + final long now = System.currentTimeMillis(); + CachedToken cached = cache.get(videoId); + if (cached == null) { + cached = diskLoad(videoId); // survive process restart, skip the ~45s mint + if (cached != null) { + cache.put(videoId, cached); + } + } + if (cached != null && now - cached.mintedAtMs < TOKEN_TTL_MS) { + return cached.token; + } + // One retry: the BotGuard mint occasionally times out, and a single null killed playback. + String tokenB64 = mintBlocking(videoId); + if (tokenB64 == null || tokenB64.isEmpty()) { + Log.w(TAG, "PO token mint returned null, retrying once for " + videoId); + tokenB64 = mintBlocking(videoId); + } + if (tokenB64 == null || tokenB64.isEmpty()) { + return null; + } + final byte[] token; + try { + token = Base64.getUrlDecoder().decode(tokenB64); + } catch (final IllegalArgumentException e) { + Log.e(TAG, "could not decode PO token", e); + return null; + } + cache.put(videoId, new CachedToken(token, now)); + diskSave(videoId, tokenB64, now); + return token; + } + } + + @Nullable + private CachedToken diskLoad(final String videoId) { + final String v = prefs.getString(videoId, null); + if (v == null) { + return null; + } + final int sep = v.indexOf('|'); + if (sep <= 0) { + return null; + } + try { + final long mintedAt = Long.parseLong(v.substring(0, sep)); + if (System.currentTimeMillis() - mintedAt >= TOKEN_TTL_MS) { + prefs.edit().remove(videoId).apply(); + return null; + } + return new CachedToken(Base64.getUrlDecoder().decode(v.substring(sep + 1)), mintedAt); + } catch (final IllegalArgumentException e) { + return null; + } + } + + private void diskSave(final String videoId, final String tokenB64, final long mintedAt) { + // commit() (sync) not apply(): the token must hit disk before a fast force-stop/process kill, + // else an app cold-start re-mints (~45s) even though a valid token was just minted. + prefs.edit().putString(videoId, mintedAt + "|" + tokenB64).commit(); + } + + @Nullable + private String mintBlocking(final String videoId) { + final CountDownLatch latch = new CountDownLatch(1); + final AtomicReference tokenRef = new AtomicReference<>(); + final AtomicReference webViewRef = new AtomicReference<>(); + + mainHandler.post(() -> { + try { + webViewRef.set(createWebView(videoId, tokenRef, latch)); + } catch (final Exception e) { + Log.e(TAG, "failed to start WebView pipeline", e); + latch.countDown(); + } + }); + + try { + if (!latch.await(PIPELINE_TIMEOUT_MS, TimeUnit.MILLISECONDS)) { + Log.w(TAG, "PO token pipeline timed out for " + videoId); + } + } catch (final InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + mainHandler.post(() -> destroyWebView(webViewRef.getAndSet(null))); + } + return tokenRef.get(); + } + + @SuppressLint("SetJavaScriptEnabled") + private WebView createWebView(final String videoId, + final AtomicReference tokenRef, + final CountDownLatch latch) { + final WebView webView = new WebView(appContext); + final WebSettings settings = webView.getSettings(); + settings.setJavaScriptEnabled(true); + settings.setDomStorageEnabled(true); + settings.setUserAgentString(DESKTOP_UA); + webView.addJavascriptInterface(new Bridge(tokenRef, latch), "SabrPocBridge"); + webView.setWebViewClient(new WebViewClient() { + private boolean injected = false; + + @Override + public WebResourceResponse shouldInterceptRequest(final WebView view, + final WebResourceRequest request) { + final String url = request.getUrl().toString(); + if (url.contains("/js/th/")) { + return fetchWithCors(url); + } + return super.shouldInterceptRequest(view, request); + } + + @Override + public void onPageFinished(final WebView view, final String url) { + super.onPageFinished(view, url); + if (injected || url == null || !url.contains("youtube.com")) { + return; + } + injected = true; + waitForReadyThenInject(view, videoId, 0); + } + }); + webView.loadUrl("https://www.youtube.com/"); + return webView; + } + + private void waitForReadyThenInject(final WebView view, final String videoId, final int attempt) { + view.evaluateJavascript("document.readyState", value -> { + final boolean complete = value != null && value.contains("complete"); + if (complete || attempt >= READY_RETRIES) { + view.evaluateJavascript( + "window.__SABR_POC_VIDEO_ID=" + jsString(videoId) + ";", null); + view.evaluateJavascript(loadPipelineScript(), null); + } else { + mainHandler.postDelayed( + () -> waitForReadyThenInject(view, videoId, attempt + 1), READY_POLL_MS); + } + }); + } + + private static void destroyWebView(@Nullable final WebView webView) { + if (webView == null) { + return; + } + try { + webView.stopLoading(); + webView.loadUrl("about:blank"); + webView.removeAllViews(); + webView.destroy(); + } catch (final Exception ignored) { + // best effort + } + } + + private static String jsString(final String value) { + return "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\""; + } + + private String loadPipelineScript() { + try (InputStream in = appContext.getAssets().open(ASSET); + ByteArrayOutputStream out = new ByteArrayOutputStream()) { + final byte[] chunk = new byte[8192]; + int read; + while ((read = in.read(chunk)) != -1) { + out.write(chunk, 0, read); + } + return out.toString("UTF-8"); + } catch (final Exception e) { + Log.e(TAG, "could not read pipeline asset", e); + return ""; + } + } + + @Nullable + private static WebResourceResponse fetchWithCors(final String url) { + try { + final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); + connection.setRequestProperty("User-Agent", DESKTOP_UA); + connection.setConnectTimeout(15000); + connection.setReadTimeout(15000); + final int code = connection.getResponseCode(); + final InputStream body = code >= 400 + ? connection.getErrorStream() : connection.getInputStream(); + final String contentType = connection.getContentType(); + String mime = "application/javascript"; + if (contentType != null) { + final int sep = contentType.indexOf(';'); + mime = sep > 0 ? contentType.substring(0, sep).trim() : contentType.trim(); + } + final Map headers = new HashMap<>(); + headers.put("Access-Control-Allow-Origin", "*"); + final WebResourceResponse response = new WebResourceResponse(mime, "UTF-8", body); + response.setStatusCodeAndReasonPhrase(code, code >= 400 ? "ERROR" : "OK"); + response.setResponseHeaders(headers); + return response; + } catch (final Exception e) { + Log.e(TAG, "interpreter native fetch failed", e); + return null; + } + } + + private static final class Bridge { + private final AtomicReference tokenRef; + private final CountDownLatch latch; + + Bridge(final AtomicReference tokenRef, final CountDownLatch latch) { + this.tokenRef = tokenRef; + this.latch = latch; + } + + @JavascriptInterface + public void onResult(final String json) { + try { + final JSONObject obj = new JSONObject(json); + if (obj.optBoolean("ok", false)) { + tokenRef.set(obj.optString("poToken", null)); + } else { + Log.w(TAG, "PO token pipeline failed: " + obj.optString("error", "unknown")); + } + } catch (final Exception e) { + Log.e(TAG, "could not parse pipeline result", e); + } finally { + latch.countDown(); + } + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java b/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java index 6cb23953d3..5417ddd51c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java @@ -7,11 +7,11 @@ package org.schabi.newpipe.player.datasource; -import static com.google.android.exoplayer2.upstream.DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS; -import static com.google.android.exoplayer2.upstream.DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS; -import static com.google.android.exoplayer2.upstream.HttpUtil.buildRangeRequestHeader; -import static com.google.android.exoplayer2.util.Assertions.checkNotNull; -import static com.google.android.exoplayer2.util.Util.castNonNull; +import static androidx.media3.datasource.DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS; +import static androidx.media3.datasource.DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS; +import static androidx.media3.datasource.HttpUtil.buildRangeRequestHeader; +import static androidx.media3.common.util.Assertions.checkNotNull; +import static androidx.media3.common.util.Util.castNonNull; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getAndroidUserAgent; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getIosUserAgent; import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isAndroidStreamingUrl; @@ -26,20 +26,20 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.PlaybackException; -import com.google.android.exoplayer2.metadata.icy.IcyHeaders; -import com.google.android.exoplayer2.upstream.BaseDataSource; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSourceException; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.DataSpec.HttpMethod; -import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; -import com.google.android.exoplayer2.upstream.HttpDataSource; -import com.google.android.exoplayer2.upstream.HttpUtil; -import com.google.android.exoplayer2.upstream.TransferListener; -import com.google.android.exoplayer2.util.Log; -import com.google.android.exoplayer2.util.Util; +import androidx.media3.common.C; +import androidx.media3.common.PlaybackException; +import androidx.media3.extractor.metadata.icy.IcyHeaders; +import androidx.media3.datasource.BaseDataSource; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.DataSourceException; +import androidx.media3.datasource.DataSpec; +import androidx.media3.datasource.DataSpec.HttpMethod; +import androidx.media3.datasource.DefaultHttpDataSource; +import androidx.media3.datasource.HttpDataSource; +import androidx.media3.datasource.HttpUtil; +import androidx.media3.datasource.TransferListener; +import androidx.media3.common.util.Log; +import androidx.media3.common.util.Util; import com.google.common.base.Predicate; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; @@ -66,7 +66,7 @@ /** * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}, based on - * {@link com.google.android.exoplayer2.upstream.DefaultHttpDataSource}, for YouTube streams. + * {@link androidx.media3.datasource.DefaultHttpDataSource}, for YouTube streams. * *

* It adds more headers to {@code videoplayback} URLs, such as {@code Origin}, {@code Referer} @@ -182,7 +182,7 @@ public Factory setAllowCrossProtocolRedirects( * *

* Note that it must be not enabled on streams which are using a {@link - * com.google.android.exoplayer2.source.ProgressiveMediaSource}, as it will break playback + * androidx.media3.exoplayer.source.ProgressiveMediaSource}, as it will break playback * for them (some exceptions may be thrown). *

* diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerEventListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerEventListener.java index b5520e8bee..553b12c81f 100644 --- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerEventListener.java +++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerEventListener.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.event; -import com.google.android.exoplayer2.PlaybackParameters; +import androidx.media3.common.PlaybackParameters; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.player.playqueue.PlayQueue; diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceEventListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceEventListener.java index 359eab8b28..5b52455bf5 100644 --- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceEventListener.java +++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceEventListener.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.player.event; -import com.google.android.exoplayer2.PlaybackException; +import androidx.media3.common.PlaybackException; public interface PlayerServiceEventListener extends PlayerEventListener { void onFullscreenStateChanged(boolean fullscreen); diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java index 8613ef57bc..d880e6aed3 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java @@ -15,8 +15,8 @@ import androidx.media.AudioManagerCompat; import androidx.preference.PreferenceManager; -import com.google.android.exoplayer2.ExoPlayer; -import com.google.android.exoplayer2.analytics.AnalyticsListener; +import androidx.media3.exoplayer.ExoPlayer; +import androidx.media3.exoplayer.analytics.AnalyticsListener; import org.schabi.newpipe.R; public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, AnalyticsListener { diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java index 202ff85412..dc5e520978 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java @@ -6,16 +6,16 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.database.StandaloneDatabaseProvider; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DefaultDataSource; -import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; -import com.google.android.exoplayer2.upstream.FileDataSource; -import com.google.android.exoplayer2.upstream.TransferListener; -import com.google.android.exoplayer2.upstream.cache.CacheDataSink; -import com.google.android.exoplayer2.upstream.cache.CacheDataSource; -import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor; -import com.google.android.exoplayer2.upstream.cache.SimpleCache; +import androidx.media3.database.StandaloneDatabaseProvider; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.DefaultDataSource; +import androidx.media3.datasource.DefaultHttpDataSource; +import androidx.media3.datasource.FileDataSource; +import androidx.media3.datasource.TransferListener; +import androidx.media3.datasource.cache.CacheDataSink; +import androidx.media3.datasource.cache.CacheDataSource; +import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor; +import androidx.media3.datasource.cache.SimpleCache; import org.schabi.newpipe.player.datasource.YoutubeHttpDataSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CustomMediaCodecVideoRenderer.java b/app/src/main/java/org/schabi/newpipe/player/helper/CustomMediaCodecVideoRenderer.java index 66ac6d50bc..5769346cd2 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/CustomMediaCodecVideoRenderer.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/CustomMediaCodecVideoRenderer.java @@ -5,10 +5,10 @@ import androidx.annotation.Nullable; -import com.google.android.exoplayer2.mediacodec.MediaCodecAdapter; -import com.google.android.exoplayer2.mediacodec.MediaCodecSelector; -import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; -import com.google.android.exoplayer2.video.VideoRendererEventListener; +import androidx.media3.exoplayer.mediacodec.MediaCodecAdapter; +import androidx.media3.exoplayer.mediacodec.MediaCodecSelector; +import androidx.media3.exoplayer.video.MediaCodecVideoRenderer; +import androidx.media3.exoplayer.video.VideoRendererEventListener; /** * A {@link MediaCodecVideoRenderer} which always enable the output surface workaround that diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java index 668b48c306..d7f4066a2c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/CustomRenderersFactory.java @@ -3,10 +3,10 @@ import android.content.Context; import android.os.Handler; -import com.google.android.exoplayer2.DefaultRenderersFactory; -import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.mediacodec.MediaCodecSelector; -import com.google.android.exoplayer2.video.VideoRendererEventListener; +import androidx.media3.exoplayer.DefaultRenderersFactory; +import androidx.media3.exoplayer.Renderer; +import androidx.media3.exoplayer.mediacodec.MediaCodecSelector; +import androidx.media3.exoplayer.video.VideoRendererEventListener; import java.util.ArrayList; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java b/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java index ec0e4e4a72..fa9abca983 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java @@ -1,12 +1,42 @@ package org.schabi.newpipe.player.helper; -import com.google.android.exoplayer2.DefaultLoadControl; +import androidx.media3.common.C; +import androidx.media3.exoplayer.DefaultLoadControl; +import androidx.media3.exoplayer.upstream.DefaultAllocator; public class LoadController extends DefaultLoadControl { public static final String TAG = "LoadController"; + + // Keep the player's buffer target well BELOW the SABR pump's read-ahead cushion (50s). The player + // reads ahead to fill maxBuffer (plus up to one whole segment, ~10s for audio), and if that runs + // past what the pump has fed it blocks on a segment the pump won't fetch yet (pump paces off the + // play head): cold start deadlocked, and the longer-segment track (audio) dropped out mid-play. + // 20s target -> ~30s real read-ahead, comfortably inside the 50s cushion. Fine for DASH/HLS. + private static final int MIN_BUFFER_MS = 12_000; + private static final int MAX_BUFFER_MS = 20_000; + private static final int BUFFER_FOR_PLAYBACK_MS = 2_000; + private static final int BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS = 3_000; + private boolean preloadingEnabled = true; + public LoadController() { + // media3 1.10 split every buffer param into a normal + a "ForLocalPlayback" variant; we use + // the same value for both so behaviour is unchanged whether the source is local or remote. + super(new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE), + MIN_BUFFER_MS, MIN_BUFFER_MS, + MAX_BUFFER_MS, MAX_BUFFER_MS, + BUFFER_FOR_PLAYBACK_MS, BUFFER_FOR_PLAYBACK_MS, + BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS, BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS, + C.LENGTH_UNSET, // no byte cap: the SABR cache bounds memory, time bounds the player + // MUST be true: with false, media3 prioritises its (huge, ~128MB) default byte target + // and ignores maxBufferMs, reading ~50s ahead = right at the pump cushion, so it + // starved at the edge. true makes maxBufferMs (time) the real limit. + true, true, + DEFAULT_BACK_BUFFER_DURATION_MS, + DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME); + } + @Override public void onPrepared() { preloadingEnabled = true; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java index 72c1be0362..fa231b28c3 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java @@ -2,6 +2,7 @@ import android.content.Context; import android.content.Intent; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -15,38 +16,54 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.media.session.MediaButtonReceiver; - -import com.google.android.exoplayer2.ForwardingPlayer; -import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; -import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer; +import androidx.media3.common.Player; +import androidx.media3.common.util.Util; import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; import org.schabi.newpipe.player.NotificationUtil; import org.schabi.newpipe.player.mediasession.MediaSessionCallback; -import org.schabi.newpipe.player.mediasession.PlayQueueNavigator; +import org.schabi.newpipe.player.mediasession.PlaybackPreparer; import org.schabi.newpipe.player.playback.PlayerMediaSession; import org.schabi.newpipe.util.StreamTypeUtil; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Optional; -import static org.schabi.newpipe.player.PlayerService.*; +import static org.schabi.newpipe.player.PlayerService.ACTION_CHANGE_PLAY_MODE; +import static org.schabi.newpipe.player.PlayerService.ACTION_CLOSE; public class MediaSessionManager { private static final String TAG = MediaSessionManager.class.getSimpleName(); public static final boolean DEBUG = MainActivity.DEBUG; + private static final int MAX_QUEUE_SIZE = 10; + + private static final long PLAYBACK_ACTIONS = PlaybackStateCompat.ACTION_SEEK_TO + | PlaybackStateCompat.ACTION_PLAY + | PlaybackStateCompat.ACTION_PAUSE + | PlaybackStateCompat.ACTION_PLAY_PAUSE + | PlaybackStateCompat.ACTION_SKIP_TO_NEXT + | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS + | PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM + | PlaybackStateCompat.ACTION_SET_REPEAT_MODE + | PlaybackStateCompat.ACTION_STOP + | PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID; + @NonNull private final MediaSessionCompat mediaSession; @NonNull - private final MediaSessionConnector sessionConnector; + private final Player exoPlayer; + @NonNull + private final MediaSessionCallback callback; + @Nullable + private final PlaybackPreparer playbackPreparer; private final boolean isExternalSession; - private int lastTitleHashCode; - private int lastArtistHashCode; - private long lastDuration; - private int lastAlbumArtHashCode; + @Nullable + private PlaybackStateCompat.CustomAction errorAction; private org.schabi.newpipe.player.Player player; @@ -68,90 +85,205 @@ public MediaSessionManager(@NonNull final Context context, @NonNull final MediaSessionCallback callback, @Nullable final MediaSessionCompat existingSession, @Nullable final PlaybackPreparer playbackPreparer) { - if (DEBUG) { - Log.d(TAG, "MediaSessionManager called"); - } - mediaSession = existingSession != null ? existingSession : new MediaSessionCompat(context, TAG); + this.exoPlayer = player; + this.callback = callback; + this.playbackPreparer = playbackPreparer; + mediaSession = existingSession != null ? existingSession + : new MediaSessionCompat(context, TAG); isExternalSession = existingSession != null; mediaSession.setActive(true); - mediaSession.setPlaybackState(new PlaybackStateCompat.Builder() - .setState(PlaybackStateCompat.STATE_NONE, -1, 1) - .setActions(PlaybackStateCompat.ACTION_SEEK_TO - | PlaybackStateCompat.ACTION_PLAY - | PlaybackStateCompat.ACTION_PAUSE // was play and pause now play/pause - | PlaybackStateCompat.ACTION_SKIP_TO_NEXT - | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS - | PlaybackStateCompat.ACTION_SET_REPEAT_MODE - | PlaybackStateCompat.ACTION_STOP - | PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID) - .build()); - - sessionConnector = new MediaSessionConnector(mediaSession); - sessionConnector.setQueueNavigator(new PlayQueueNavigator(mediaSession, callback)); - sessionConnector.setPlayer(new ForwardingPlayer(player) { - @Override - public void play() { - callback.play(); + mediaSession.setCallback(sessionCallback); + + exoPlayer.addListener(playerListener); + updatePlaybackState(); + } + + private final Player.Listener playerListener = new Player.Listener() { + @Override + public void onEvents(@NonNull final Player p, @NonNull final Player.Events events) { + if (events.containsAny( + Player.EVENT_PLAYBACK_STATE_CHANGED, + Player.EVENT_PLAY_WHEN_READY_CHANGED, + Player.EVENT_IS_PLAYING_CHANGED, + Player.EVENT_POSITION_DISCONTINUITY, + Player.EVENT_REPEAT_MODE_CHANGED, + Player.EVENT_PLAYBACK_PARAMETERS_CHANGED)) { + updatePlaybackState(); + } + if (events.containsAny( + Player.EVENT_MEDIA_ITEM_TRANSITION, + Player.EVENT_MEDIA_METADATA_CHANGED, + Player.EVENT_TIMELINE_CHANGED)) { + updateMetadata(); + publishQueue(); } + } + }; + + private final MediaSessionCompat.Callback sessionCallback = new MediaSessionCompat.Callback() { + @Override + public void onPlay() { + callback.play(); + } - @Override - public void pause() { - callback.pause(); + @Override + public void onPause() { + callback.pause(); + } + + @Override + public void onSkipToNext() { + callback.playNext(); + } + + @Override + public void onSkipToPrevious() { + callback.playPrevious(); + } + + @Override + public void onSkipToQueueItem(final long id) { + callback.playItemAtIndex((int) id); + } + + @Override + public void onSeekTo(final long pos) { + exoPlayer.seekTo(pos); + } + + @Override + public void onStop() { + callback.close(); + } + + @Override + public void onCustomAction(final String action, final Bundle extras) { + if (ACTION_CHANGE_PLAY_MODE.equals(action)) { + callback.changePlayMode(); + } else if (ACTION_CLOSE.equals(action)) { + callback.close(); } - }); - MediaSessionConnector.CustomActionProvider[] providers = new MediaSessionConnector.CustomActionProvider[2]; - providers[0] = new MediaSessionConnector.CustomActionProvider() { - @Override - public void onCustomAction(@NonNull Player player, @NonNull String action, @Nullable Bundle extras) { - if (action.equals(ACTION_CHANGE_PLAY_MODE)) { - callback.changePlayMode(); - } + } + + @Override + public void onPrepare() { + if (playbackPreparer != null) { + playbackPreparer.onPrepare(false); } + } - @Nullable - @Override - public PlaybackStateCompat.CustomAction getCustomAction(Player player) { - switch (((PlayerMediaSession)callback).mode){ - case 0: - default: - return new android.support.v4.media.session.PlaybackStateCompat.CustomAction.Builder( - ACTION_CHANGE_PLAY_MODE, "Shuffle", R.drawable.shuffle_disabled).build(); - case 1: - return new android.support.v4.media.session.PlaybackStateCompat.CustomAction.Builder( - ACTION_CHANGE_PLAY_MODE, "Repeat all", R.drawable.exo_controls_shuffle_on).build(); - case 2: - return new android.support.v4.media.session.PlaybackStateCompat.CustomAction.Builder( - ACTION_CHANGE_PLAY_MODE, "Repeat none", R.drawable.exo_controls_repeat_one).build(); - case 3: - return new android.support.v4.media.session.PlaybackStateCompat.CustomAction.Builder( - ACTION_CHANGE_PLAY_MODE, "Repeat one", R.drawable.exo_controls_repeat_all).build(); - } + @Override + public void onPlayFromMediaId(final String mediaId, final Bundle extras) { + if (playbackPreparer != null) { + playbackPreparer.onPrepareFromMediaId(mediaId, true, extras); } - }; - providers[1] = new MediaSessionConnector.CustomActionProvider() { - @Override - public void onCustomAction(@NonNull Player player, @NonNull String action, @Nullable Bundle extras) { - if (action.equals(ACTION_CLOSE)) { - callback.close(); - } + } + + @Override + public void onPrepareFromMediaId(final String mediaId, final Bundle extras) { + if (playbackPreparer != null) { + playbackPreparer.onPrepareFromMediaId(mediaId, false, extras); } + } - @Nullable - @Override - public PlaybackStateCompat.CustomAction getCustomAction(Player player) { - // Close - return new android.support.v4.media.session.PlaybackStateCompat.CustomAction.Builder( - ACTION_CLOSE, "Close", R.drawable.ic_close).build(); + @Override + public void onPlayFromSearch(final String query, final Bundle extras) { + if (playbackPreparer != null) { + playbackPreparer.onPrepareFromSearch(query, true, extras); } - }; - sessionConnector.setCustomActionProviders(providers); - sessionConnector.setMetadataDeduplicationEnabled(true); - sessionConnector.setMediaMetadataProvider(exoPlayer -> buildMediaMetadata()); - - // Set PlaybackPreparer if provided (for Android Auto support) - if (playbackPreparer != null) { - sessionConnector.setPlaybackPreparer(playbackPreparer); } + + @Override + public void onPlayFromUri(final Uri uri, final Bundle extras) { + if (playbackPreparer != null) { + playbackPreparer.onPrepareFromUri(uri, true, extras); + } + } + }; + + private void updatePlaybackState() { + final PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder() + .setActions(PLAYBACK_ACTIONS + | (playbackPreparer != null + ? playbackPreparer.getSupportedPrepareActions() : 0)) + .setState(toPlaybackStateCompat(), exoPlayer.getCurrentPosition(), + exoPlayer.getPlaybackParameters().speed); + builder.addCustomAction(changePlayModeAction()); + builder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder( + ACTION_CLOSE, "Close", R.drawable.ic_close).build()); + if (errorAction != null) { + builder.addCustomAction(errorAction); + } + mediaSession.setPlaybackState(builder.build()); + } + + @PlaybackStateCompat.State + private int toPlaybackStateCompat() { + switch (exoPlayer.getPlaybackState()) { + case Player.STATE_BUFFERING: + return PlaybackStateCompat.STATE_BUFFERING; + case Player.STATE_READY: + return exoPlayer.getPlayWhenReady() + ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED; + case Player.STATE_ENDED: + return PlaybackStateCompat.STATE_STOPPED; + case Player.STATE_IDLE: + default: + return PlaybackStateCompat.STATE_NONE; + } + } + + @NonNull + private PlaybackStateCompat.CustomAction changePlayModeAction() { + final int mode = callback instanceof PlayerMediaSession + ? ((PlayerMediaSession) callback).mode : 0; + switch (mode) { + case 1: + return new PlaybackStateCompat.CustomAction.Builder(ACTION_CHANGE_PLAY_MODE, + "Repeat all", R.drawable.exo_icon_shuffle_on).build(); + case 2: + return new PlaybackStateCompat.CustomAction.Builder(ACTION_CHANGE_PLAY_MODE, + "Repeat none", R.drawable.exo_icon_repeat_one).build(); + case 3: + return new PlaybackStateCompat.CustomAction.Builder(ACTION_CHANGE_PLAY_MODE, + "Repeat one", R.drawable.exo_icon_repeat_all).build(); + case 0: + default: + return new PlaybackStateCompat.CustomAction.Builder(ACTION_CHANGE_PLAY_MODE, + "Shuffle", R.drawable.shuffle_disabled).build(); + } + } + + private void publishQueue() { + final int windowCount = callback.getQueueSize(); + if (windowCount == 0) { + mediaSession.setQueue(Collections.emptyList()); + return; + } + final int currentWindowIndex = callback.getCurrentPlayingIndex(); + final int queueSize = Math.min(MAX_QUEUE_SIZE, windowCount); + final int startIndex = Util.constrainValue(currentWindowIndex - ((queueSize - 1) / 2), 0, + windowCount - queueSize); + + final List queue = new ArrayList<>(); + for (int i = startIndex; i < startIndex + queueSize; i++) { + queue.add(new MediaSessionCompat.QueueItem(callback.getQueueMetadata(i), i)); + } + mediaSession.setQueue(queue); + } + + /** Show an error on the session (used by the Android Auto media browser preparer). */ + public void setCustomErrorMessage(@Nullable final CharSequence message, final int code) { + errorAction = null; + final PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder() + .setActions(PLAYBACK_ACTIONS) + .setState(PlaybackStateCompat.STATE_ERROR, 0, 1) + .setErrorMessage(code, message == null ? "" : message); + mediaSession.setPlaybackState(builder.build()); + } + + public void clearCustomErrorMessage() { + updatePlaybackState(); } @Nullable @@ -164,8 +296,13 @@ public MediaSessionCompat.Token getSessionToken() { return mediaSession.getSessionToken(); } - public void setPlayer(org.schabi.newpipe.player.Player player) { + public void setPlayer(final org.schabi.newpipe.player.Player player) { this.player = player; + updateMetadata(); + } + + private void updateMetadata() { + mediaSession.setMetadata(buildMediaMetadata()); } private MediaMetadataCompat buildMediaMetadata() { @@ -173,7 +310,7 @@ private MediaMetadataCompat buildMediaMetadata() { Log.d(TAG, "buildMediaMetadata called"); } - if(player == null) { + if (player == null) { return new MediaMetadataCompat.Builder() .putString(MediaMetadataCompat.METADATA_KEY_TITLE, "") .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, "") @@ -219,8 +356,8 @@ private MediaMetadataCompat buildMediaMetadata() { * Should be called on player destruction to prevent leakage. */ public void dispose() { - sessionConnector.setPlayer(null); - sessionConnector.setQueueNavigator(null); + exoPlayer.removeListener(playerListener); + mediaSession.setCallback(null); if (!isExternalSession) { mediaSession.setActive(false); mediaSession.release(); diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveDataSource.java index 608196fc44..124237678c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveDataSource.java @@ -20,19 +20,19 @@ import android.net.Uri; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.upstream.AssetDataSource; -import com.google.android.exoplayer2.upstream.ContentDataSource; -import com.google.android.exoplayer2.upstream.DataSchemeDataSource; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.FileDataSource; -import com.google.android.exoplayer2.upstream.HttpDataSource; -import com.google.android.exoplayer2.upstream.RawResourceDataSource; -import com.google.android.exoplayer2.upstream.TransferListener; -import com.google.android.exoplayer2.upstream.UdpDataSource; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Log; -import com.google.android.exoplayer2.util.Util; +import androidx.media3.datasource.AssetDataSource; +import androidx.media3.datasource.ContentDataSource; +import androidx.media3.datasource.DataSchemeDataSource; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.DataSpec; +import androidx.media3.datasource.FileDataSource; +import androidx.media3.datasource.HttpDataSource; +import androidx.media3.datasource.RawResourceDataSource; +import androidx.media3.datasource.TransferListener; +import androidx.media3.datasource.UdpDataSource; +import androidx.media3.common.util.Assertions; +import androidx.media3.common.util.Log; +import androidx.media3.common.util.Util; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -331,7 +331,7 @@ private DataSource getContentDataSource() { private DataSource getRtmpDataSource() { if (rtmpDataSource == null) { try { - Class clazz = Class.forName("com.google.android.exoplayer2.ext.rtmp.RtmpDataSource"); + Class clazz = Class.forName("androidx.media3.datasource.rtmp.RtmpDataSource"); rtmpDataSource = (DataSource) clazz.getConstructor().newInstance(); addListenersToDataSource(rtmpDataSource); } catch (ClassNotFoundException e) { diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveHttpDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveHttpDataSource.java index 6f8a0c8893..62c71d4b5d 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveHttpDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/NiconicoLiveHttpDataSource.java @@ -1,24 +1,14 @@ package org.schabi.newpipe.player.helper; -import android.net.Uri; - import androidx.annotation.Nullable; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.HttpDataSource; -import com.google.android.exoplayer2.upstream.TransferListener; +import androidx.media3.datasource.DataSpec; +import androidx.media3.datasource.DefaultHttpDataSource; +import androidx.media3.datasource.HttpDataSource; +import androidx.media3.datasource.TransferListener; import com.google.common.base.Predicate; -import com.grack.nanojson.JsonParserException; - -import org.schabi.newpipe.extractor.exceptions.ParsingException; -import org.schabi.newpipe.extractor.exceptions.ReCaptchaException; -import java.io.IOException; -import java.util.Arrays; -import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; public class NiconicoLiveHttpDataSource extends PurifiedHttpDataSource { @@ -29,156 +19,73 @@ public class NiconicoLiveHttpDataSource extends PurifiedHttpDataSource { private boolean isFetching = false; public static class Factory implements HttpDataSource.Factory { - - private final RequestProperties defaultRequestProperties; + private final DefaultHttpDataSource.Factory inner = new DefaultHttpDataSource.Factory(); private final String url; - @Nullable - private TransferListener transferListener; - @Nullable private Predicate contentTypePredicate; - @Nullable private String userAgent; - private int connectTimeoutMs; - private int readTimeoutMs; - private boolean allowCrossProtocolRedirects; - private boolean keepPostFor302Redirects; - /** Creates an instance. */ - public Factory(String url) { - if(url.equals("")){ - throw(new RuntimeException("Build NicoNico live source failed. This should never happen.")); + public Factory(final String url) { + if (url.equals("")) { + throw new RuntimeException( + "Build NicoNico live source failed. This should never happen."); } - defaultRequestProperties = new RequestProperties(); - connectTimeoutMs = DEFAULT_CONNECT_TIMEOUT_MILLIS; - readTimeoutMs = DEFAULT_READ_TIMEOUT_MILLIS; this.url = url; } @Override - public final NiconicoLiveHttpDataSource.Factory setDefaultRequestProperties(Map defaultRequestProperties) { - this.defaultRequestProperties.clearAndSet(defaultRequestProperties); + public final Factory setDefaultRequestProperties( + final Map defaultRequestProperties) { + inner.setDefaultRequestProperties(defaultRequestProperties); return this; } - /** - * Sets the user agent that will be used. - * - *

The default is {@code null}, which causes the default user agent of the underlying - * platform to be used. - * - * @param userAgent The user agent that will be used, or {@code null} to use the default user - * agent of the underlying platform. - * @return This factory. - */ - public NiconicoLiveHttpDataSource.Factory setUserAgent(@Nullable String userAgent) { - this.userAgent = userAgent; + public Factory setUserAgent(@Nullable final String userAgent) { + inner.setUserAgent(userAgent); return this; } - /** - * Sets the connect timeout, in milliseconds. - * - *

The default is {@link PurifiedHttpDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS}. - * - * @param connectTimeoutMs The connect timeout, in milliseconds, that will be used. - * @return This factory. - */ - public NiconicoLiveHttpDataSource.Factory setConnectTimeoutMs(int connectTimeoutMs) { - this.connectTimeoutMs = connectTimeoutMs; + public Factory setConnectTimeoutMs(final int connectTimeoutMs) { + inner.setConnectTimeoutMs(connectTimeoutMs); return this; } - /** - * Sets the read timeout, in milliseconds. - * - *

The default is {@link PurifiedHttpDataSource#DEFAULT_READ_TIMEOUT_MILLIS}. - * - * @param readTimeoutMs The connect timeout, in milliseconds, that will be used. - * @return This factory. - */ - public NiconicoLiveHttpDataSource.Factory setReadTimeoutMs(int readTimeoutMs) { - this.readTimeoutMs = readTimeoutMs; + public Factory setReadTimeoutMs(final int readTimeoutMs) { + inner.setReadTimeoutMs(readTimeoutMs); return this; } - /** - * Sets whether to allow cross protocol redirects. - * - *

The default is {@code false}. - * - * @param allowCrossProtocolRedirects Whether to allow cross protocol redirects. - * @return This factory. - */ - public NiconicoLiveHttpDataSource.Factory setAllowCrossProtocolRedirects(boolean allowCrossProtocolRedirects) { - this.allowCrossProtocolRedirects = allowCrossProtocolRedirects; + public Factory setAllowCrossProtocolRedirects(final boolean allowCrossProtocolRedirects) { + inner.setAllowCrossProtocolRedirects(allowCrossProtocolRedirects); return this; } - /** - * Sets a content type {@link Predicate}. If a content type is rejected by the predicate then a - * {@link HttpDataSource.InvalidContentTypeException} is thrown from {@link - * PurifiedHttpDataSource#open(DataSpec)}. - * - *

The default is {@code null}. - * - * @param contentTypePredicate The content type {@link Predicate}, or {@code null} to clear a - * predicate that was previously set. - * @return This factory. - */ - public NiconicoLiveHttpDataSource.Factory setContentTypePredicate(@Nullable Predicate contentTypePredicate) { - this.contentTypePredicate = contentTypePredicate; + public Factory setContentTypePredicate(@Nullable final Predicate predicate) { + inner.setContentTypePredicate(predicate); return this; } - /** - * Sets the {@link TransferListener} that will be used. - * - *

The default is {@code null}. - * - *

See {@link DataSource#addTransferListener(TransferListener)}. - * - * @param transferListener The listener that will be used. - * @return This factory. - */ - public NiconicoLiveHttpDataSource.Factory setTransferListener(@Nullable TransferListener transferListener) { - this.transferListener = transferListener; + public Factory setTransferListener(@Nullable final TransferListener transferListener) { + inner.setTransferListener(transferListener); return this; } - /** - * Sets whether we should keep the POST method and body when we have HTTP 302 redirects for a - * POST request. - */ - public NiconicoLiveHttpDataSource.Factory setKeepPostFor302Redirects(boolean keepPostFor302Redirects) { - this.keepPostFor302Redirects = keepPostFor302Redirects; + public Factory setKeepPostFor302Redirects(final boolean keepPostFor302Redirects) { + inner.setKeepPostFor302Redirects(keepPostFor302Redirects); return this; } @Override public NiconicoLiveHttpDataSource createDataSource() { - NiconicoLiveHttpDataSource dataSource = - new NiconicoLiveHttpDataSource( - userAgent, - connectTimeoutMs, - readTimeoutMs, - allowCrossProtocolRedirects, - defaultRequestProperties, - contentTypePredicate, - keepPostFor302Redirects, - url); - if (transferListener != null) { - dataSource.addTransferListener(transferListener); - } - return dataSource; + return new NiconicoLiveHttpDataSource(inner.createDataSource(), url); } } - NiconicoLiveHttpDataSource(@Nullable String userAgent, int connectTimeoutMillis, int readTimeoutMillis, boolean allowCrossProtocolRedirects, @Nullable RequestProperties defaultRequestProperties - , @Nullable Predicate contentTypePredicate, boolean keepPostFor302Redirects, String liveUrl) { - super(userAgent, connectTimeoutMillis, readTimeoutMillis, allowCrossProtocolRedirects, defaultRequestProperties, contentTypePredicate, keepPostFor302Redirects); + + NiconicoLiveHttpDataSource(final HttpDataSource delegate, final String liveUrl) { + super(delegate); this.liveUrl = liveUrl; } + @Override - public long open(DataSpec dataSpec) throws HttpDataSourceException - { + public long open(final DataSpec dataSpec) throws HttpDataSourceException { // String fetchUrl = dataSpec.uri.toString(); // int type = 0; // List anonStrings = Arrays.asList("anonymous-user-", "anonymous_user_", "ht2_nicolive="); diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java index a3a25fd1df..aee0d5ff46 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java @@ -5,11 +5,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist; -import com.google.android.exoplayer2.source.hls.playlist.HlsMultivariantPlaylist; -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist; -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParserFactory; -import com.google.android.exoplayer2.upstream.ParsingLoadable; +import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist; +import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist; +import androidx.media3.exoplayer.hls.playlist.HlsPlaylist; +import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParserFactory; +import androidx.media3.exoplayer.upstream.ParsingLoadable; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java index 0217153e3f..fa9c4d1039 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java @@ -3,24 +3,24 @@ import android.content.Context; import android.net.Uri; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.ProgressiveMediaSource; -import com.google.android.exoplayer2.source.SingleSampleMediaSource; -import com.google.android.exoplayer2.source.dash.DashMediaSource; -import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource; -import com.google.android.exoplayer2.source.hls.HlsMediaSource; -import com.google.android.exoplayer2.source.hls.DefaultHlsExtractorFactory; -import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistTracker; -import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource; -import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource; -import com.google.android.exoplayer2.extractor.ts.DefaultTsPayloadReaderFactory; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DefaultDataSource; -import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; -import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy; -import com.google.android.exoplayer2.upstream.ResolvingDataSource; -import com.google.android.exoplayer2.upstream.TransferListener; -import com.google.android.exoplayer2.upstream.cache.CacheDataSource; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.source.ProgressiveMediaSource; +import androidx.media3.exoplayer.source.SingleSampleMediaSource; +import androidx.media3.exoplayer.dash.DashMediaSource; +import androidx.media3.exoplayer.dash.DefaultDashChunkSource; +import androidx.media3.exoplayer.hls.HlsMediaSource; +import androidx.media3.exoplayer.hls.DefaultHlsExtractorFactory; +import androidx.media3.exoplayer.hls.playlist.DefaultHlsPlaylistTracker; +import androidx.media3.exoplayer.smoothstreaming.DefaultSsChunkSource; +import androidx.media3.exoplayer.smoothstreaming.SsMediaSource; +import androidx.media3.extractor.ts.DefaultTsPayloadReaderFactory; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.DefaultDataSource; +import androidx.media3.datasource.DefaultHttpDataSource; +import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy; +import androidx.media3.datasource.ResolvingDataSource; +import androidx.media3.datasource.TransferListener; +import androidx.media3.datasource.cache.CacheDataSource; import com.grack.nanojson.JsonObject; import com.grack.nanojson.JsonParser; import com.grack.nanojson.JsonParserException; @@ -48,7 +48,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParserFactory; +import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParserFactory; import org.schabi.newpipe.extractor.services.youtube.dashmanifestcreators.YoutubeOtfDashManifestCreator; import org.schabi.newpipe.extractor.services.youtube.dashmanifestcreators.YoutubePostLiveStreamDvrDashManifestCreator; @@ -117,10 +117,11 @@ public HlsMediaSource.Factory getLiveHlsMediaSourceFactory() { return new HlsMediaSource.Factory(cachelessDataSourceFactory) .setAllowChunklessPreparation(true) .setPlaylistTrackerFactory((dataSourceFactory, loadErrorHandlingPolicy, - playlistParserFactory) -> + playlistParserFactory, cmcdConfiguration, + downloadExecutorSupplier) -> new DefaultHlsPlaylistTracker(dataSourceFactory, loadErrorHandlingPolicy, - playlistParserFactory, - PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT)); + playlistParserFactory, cmcdConfiguration, + PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT, downloadExecutorSupplier)); } public DashMediaSource.Factory getLiveDashMediaSourceFactory() { @@ -257,10 +258,12 @@ public HlsMediaSource.Factory getNicoLiveHlsMediaSourceFactory(String liveUrl) { return new HlsMediaSource.Factory(newFactory) .setAllowChunklessPreparation(true) .setPlaylistTrackerFactory((dataSourceFactory, loadErrorHandlingPolicy, - playlistParserFactory) -> + playlistParserFactory, cmcdConfiguration, + downloadExecutorSupplier) -> new DefaultHlsPlaylistTracker(dataSourceFactory, loadErrorHandlingPolicy, - playlistParserFactory, - PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT)).setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy()); + playlistParserFactory, cmcdConfiguration, + PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT, downloadExecutorSupplier)) + .setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy()); } // BiliBiliMediaSourceFactories diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java index 91258be878..b2c2778a77 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.player.helper; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE; +import static androidx.media3.common.Player.REPEAT_MODE_ALL; +import static androidx.media3.common.Player.REPEAT_MODE_OFF; +import static androidx.media3.common.Player.REPEAT_MODE_ONE; import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE; import static org.schabi.newpipe.extractor.stream.VideoStream.RESOLUTION_UNKNOWN; import static org.schabi.newpipe.player.Player.IDLE_WINDOW_FLAGS; @@ -33,16 +33,16 @@ import androidx.core.content.ContextCompat; import androidx.preference.PreferenceManager; -import com.google.android.exoplayer2.PlaybackParameters; -import com.google.android.exoplayer2.Player.RepeatMode; -import com.google.android.exoplayer2.SeekParameters; -import com.google.android.exoplayer2.source.ProgressiveMediaSource; -import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; -import com.google.android.exoplayer2.trackselection.ExoTrackSelection; -import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; -import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode; -import com.google.android.exoplayer2.ui.CaptionStyleCompat; -import com.google.android.exoplayer2.util.MimeTypes; +import androidx.media3.common.PlaybackParameters; +import androidx.media3.common.Player.RepeatMode; +import androidx.media3.exoplayer.SeekParameters; +import androidx.media3.exoplayer.source.ProgressiveMediaSource; +import androidx.media3.exoplayer.trackselection.AdaptiveTrackSelection; +import androidx.media3.exoplayer.trackselection.ExoTrackSelection; +import androidx.media3.ui.AspectRatioFrameLayout; +import androidx.media3.ui.AspectRatioFrameLayout.ResizeMode; +import androidx.media3.ui.CaptionStyleCompat; +import androidx.media3.common.MimeTypes; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.InfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java index b853cb37f6..33390b078b 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java @@ -8,8 +8,8 @@ import android.util.Log; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.PlaybackException; -import com.google.android.exoplayer2.PlaybackParameters; +import androidx.media3.common.PlaybackException; +import androidx.media3.common.PlaybackParameters; import org.schabi.newpipe.App; import org.schabi.newpipe.MainActivity; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java index 903405c3af..c76a5163c6 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java @@ -20,19 +20,19 @@ import android.net.Uri; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.upstream.AssetDataSource; -import com.google.android.exoplayer2.upstream.ContentDataSource; -import com.google.android.exoplayer2.upstream.DataSchemeDataSource; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.FileDataSource; -import com.google.android.exoplayer2.upstream.HttpDataSource; -import com.google.android.exoplayer2.upstream.RawResourceDataSource; -import com.google.android.exoplayer2.upstream.TransferListener; -import com.google.android.exoplayer2.upstream.UdpDataSource; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Log; -import com.google.android.exoplayer2.util.Util; +import androidx.media3.datasource.AssetDataSource; +import androidx.media3.datasource.ContentDataSource; +import androidx.media3.datasource.DataSchemeDataSource; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.DataSpec; +import androidx.media3.datasource.FileDataSource; +import androidx.media3.datasource.HttpDataSource; +import androidx.media3.datasource.RawResourceDataSource; +import androidx.media3.datasource.TransferListener; +import androidx.media3.datasource.UdpDataSource; +import androidx.media3.common.util.Assertions; +import androidx.media3.common.util.Log; +import androidx.media3.common.util.Util; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -331,7 +331,7 @@ private DataSource getContentDataSource() { private DataSource getRtmpDataSource() { if (rtmpDataSource == null) { try { - Class clazz = Class.forName("com.google.android.exoplayer2.ext.rtmp.RtmpDataSource"); + Class clazz = Class.forName("androidx.media3.datasource.rtmp.RtmpDataSource"); rtmpDataSource = (DataSource) clazz.getConstructor().newInstance(); addListenersToDataSource(rtmpDataSource); } catch (ClassNotFoundException e) { diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java index 6fc957fcc5..162145dc9f 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java @@ -1,182 +1,139 @@ package org.schabi.newpipe.player.helper; +import android.net.Uri; + import androidx.annotation.Nullable; -import com.google.android.exoplayer2.metadata.icy.IcyHeaders; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; -import com.google.android.exoplayer2.upstream.HttpDataSource; -import com.google.android.exoplayer2.upstream.TransferListener; +import androidx.media3.datasource.DataSpec; +import androidx.media3.datasource.DefaultHttpDataSource; +import androidx.media3.datasource.HttpDataSource; +import androidx.media3.datasource.TransferListener; +import androidx.media3.extractor.metadata.icy.IcyHeaders; import com.google.common.base.Predicate; import java.util.HashMap; +import java.util.List; import java.util.Map; -public class PurifiedHttpDataSource extends DefaultHttpDataSource { - public static class Factory implements HttpDataSource.Factory { +/** + * media3 makes {@link DefaultHttpDataSource}'s constructor private, so we can no longer subclass it. + * We wrap one instead and only intercept {@link #open(DataSpec)} to drop the ICY metadata-enable + * header. Subclasses (NiconicoLive) override {@code open} and call {@code super.open}. + */ +public class PurifiedHttpDataSource implements HttpDataSource { + public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = + DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS; + public static final int DEFAULT_READ_TIMEOUT_MILLIS = + DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS; + + protected final HttpDataSource delegate; + + protected PurifiedHttpDataSource(final HttpDataSource delegate) { + this.delegate = delegate; + } - private final RequestProperties defaultRequestProperties; - - @Nullable - private TransferListener transferListener; - @Nullable private Predicate contentTypePredicate; - @Nullable private String userAgent; - private int connectTimeoutMs; - private int readTimeoutMs; - private boolean allowCrossProtocolRedirects; - private boolean keepPostFor302Redirects; - - /** Creates an instance. */ - public Factory() { - defaultRequestProperties = new RequestProperties(); - connectTimeoutMs = DEFAULT_CONNECT_TIMEOUT_MILLIS; - readTimeoutMs = DEFAULT_READ_TIMEOUT_MILLIS; - } + @Override + public long open(final DataSpec dataSpec) throws HttpDataSourceException { + final Map headers = new HashMap<>(dataSpec.httpRequestHeaders); + headers.remove(IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_NAME); + return delegate.open(dataSpec.withRequestHeaders(headers)); + } + + @Override + public int read(final byte[] buffer, final int offset, final int length) + throws HttpDataSourceException { + return delegate.read(buffer, offset, length); + } + + @Override + public void addTransferListener(final TransferListener transferListener) { + delegate.addTransferListener(transferListener); + } + + @Nullable + @Override + public Uri getUri() { + return delegate.getUri(); + } + + @Override + public Map> getResponseHeaders() { + return delegate.getResponseHeaders(); + } + + @Override + public void close() throws HttpDataSourceException { + delegate.close(); + } + + @Override + public void setRequestProperty(final String name, final String value) { + delegate.setRequestProperty(name, value); + } + + @Override + public void clearRequestProperty(final String name) { + delegate.clearRequestProperty(name); + } + + @Override + public void clearAllRequestProperties() { + delegate.clearAllRequestProperties(); + } + + @Override + public int getResponseCode() { + return delegate.getResponseCode(); + } + + public static class Factory implements HttpDataSource.Factory { + protected final DefaultHttpDataSource.Factory inner = new DefaultHttpDataSource.Factory(); @Override - public final PurifiedHttpDataSource.Factory setDefaultRequestProperties(Map defaultRequestProperties) { - this.defaultRequestProperties.clearAndSet(defaultRequestProperties); + public final Factory setDefaultRequestProperties( + final Map defaultRequestProperties) { + inner.setDefaultRequestProperties(defaultRequestProperties); return this; } - /** - * Sets the user agent that will be used. - * - *

The default is {@code null}, which causes the default user agent of the underlying - * platform to be used. - * - * @param userAgent The user agent that will be used, or {@code null} to use the default user - * agent of the underlying platform. - * @return This factory. - */ - public PurifiedHttpDataSource.Factory setUserAgent(@Nullable String userAgent) { - this.userAgent = userAgent; + public Factory setUserAgent(@Nullable final String userAgent) { + inner.setUserAgent(userAgent); return this; } - /** - * Sets the connect timeout, in milliseconds. - * - *

The default is {@link PurifiedHttpDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS}. - * - * @param connectTimeoutMs The connect timeout, in milliseconds, that will be used. - * @return This factory. - */ - public PurifiedHttpDataSource.Factory setConnectTimeoutMs(int connectTimeoutMs) { - this.connectTimeoutMs = connectTimeoutMs; + public Factory setConnectTimeoutMs(final int connectTimeoutMs) { + inner.setConnectTimeoutMs(connectTimeoutMs); return this; } - /** - * Sets the read timeout, in milliseconds. - * - *

The default is {@link PurifiedHttpDataSource#DEFAULT_READ_TIMEOUT_MILLIS}. - * - * @param readTimeoutMs The connect timeout, in milliseconds, that will be used. - * @return This factory. - */ - public PurifiedHttpDataSource.Factory setReadTimeoutMs(int readTimeoutMs) { - this.readTimeoutMs = readTimeoutMs; + public Factory setReadTimeoutMs(final int readTimeoutMs) { + inner.setReadTimeoutMs(readTimeoutMs); return this; } - /** - * Sets whether to allow cross protocol redirects. - * - *

The default is {@code false}. - * - * @param allowCrossProtocolRedirects Whether to allow cross protocol redirects. - * @return This factory. - */ - public PurifiedHttpDataSource.Factory setAllowCrossProtocolRedirects(boolean allowCrossProtocolRedirects) { - this.allowCrossProtocolRedirects = allowCrossProtocolRedirects; + public Factory setAllowCrossProtocolRedirects(final boolean allowCrossProtocolRedirects) { + inner.setAllowCrossProtocolRedirects(allowCrossProtocolRedirects); return this; } - /** - * Sets a content type {@link Predicate}. If a content type is rejected by the predicate then a - * {@link HttpDataSource.InvalidContentTypeException} is thrown from {@link - * PurifiedHttpDataSource#open(DataSpec)}. - * - *

The default is {@code null}. - * - * @param contentTypePredicate The content type {@link Predicate}, or {@code null} to clear a - * predicate that was previously set. - * @return This factory. - */ - public PurifiedHttpDataSource.Factory setContentTypePredicate(@Nullable Predicate contentTypePredicate) { - this.contentTypePredicate = contentTypePredicate; + public Factory setContentTypePredicate(@Nullable final Predicate predicate) { + inner.setContentTypePredicate(predicate); return this; } - /** - * Sets the {@link TransferListener} that will be used. - * - *

The default is {@code null}. - * - *

See {@link DataSource#addTransferListener(TransferListener)}. - * - * @param transferListener The listener that will be used. - * @return This factory. - */ - public PurifiedHttpDataSource.Factory setTransferListener(@Nullable TransferListener transferListener) { - this.transferListener = transferListener; + public Factory setTransferListener(@Nullable final TransferListener transferListener) { + inner.setTransferListener(transferListener); return this; } - /** - * Sets whether we should keep the POST method and body when we have HTTP 302 redirects for a - * POST request. - */ - public PurifiedHttpDataSource.Factory setKeepPostFor302Redirects(boolean keepPostFor302Redirects) { - this.keepPostFor302Redirects = keepPostFor302Redirects; + public Factory setKeepPostFor302Redirects(final boolean keepPostFor302Redirects) { + inner.setKeepPostFor302Redirects(keepPostFor302Redirects); return this; } @Override public PurifiedHttpDataSource createDataSource() { - PurifiedHttpDataSource dataSource = - new PurifiedHttpDataSource( - userAgent, - connectTimeoutMs, - readTimeoutMs, - allowCrossProtocolRedirects, - defaultRequestProperties, - contentTypePredicate, - keepPostFor302Redirects); - if (transferListener != null) { - dataSource.addTransferListener(transferListener); - } - return dataSource; + return new PurifiedHttpDataSource(inner.createDataSource()); } } - PurifiedHttpDataSource( - @Nullable String userAgent, - int connectTimeoutMillis, - int readTimeoutMillis, - boolean allowCrossProtocolRedirects, - @Nullable RequestProperties defaultRequestProperties, - @Nullable Predicate contentTypePredicate, - boolean keepPostFor302Redirects) { - super( - userAgent, - connectTimeoutMillis, - readTimeoutMillis, - allowCrossProtocolRedirects, - defaultRequestProperties - ); - } - - @Override - public long open(DataSpec dataSpec) throws HttpDataSourceException - { - final Map m1 = dataSpec.httpRequestHeaders; - final Map m2 = new HashMap<>(); - for (Map.Entry entry : m1.entrySet()) - if(!entry.getKey().equals(IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_NAME)) - m2.put(entry.getKey(), entry.getValue()); - - return super.open(dataSpec.withRequestHeaders(m2)); - } } diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java b/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java index 00f5de071c..efaf5c91d7 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java @@ -5,12 +5,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.source.dash.manifest.DashManifest; -import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser; -import com.google.android.exoplayer2.source.dash.manifest.Period; -import com.google.android.exoplayer2.source.dash.manifest.ProgramInformation; -import com.google.android.exoplayer2.source.dash.manifest.ServiceDescriptionElement; -import com.google.android.exoplayer2.source.dash.manifest.UtcTimingElement; +import androidx.media3.exoplayer.dash.manifest.DashManifest; +import androidx.media3.exoplayer.dash.manifest.DashManifestParser; +import androidx.media3.exoplayer.dash.manifest.Period; +import androidx.media3.exoplayer.dash.manifest.ProgramInformation; +import androidx.media3.exoplayer.dash.manifest.ServiceDescriptionElement; +import androidx.media3.exoplayer.dash.manifest.UtcTimingElement; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt index 129f248875..044e7b4b4c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt +++ b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt @@ -3,11 +3,9 @@ package org.schabi.newpipe.player.mediabrowser import android.content.Context import android.net.Uri import android.os.Bundle -import android.os.ResultReceiver import android.support.v4.media.session.PlaybackStateCompat import android.util.Log -import com.google.android.exoplayer2.Player -import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer +import org.schabi.newpipe.player.mediasession.PlaybackPreparer import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.Disposable @@ -94,15 +92,6 @@ class MediaBrowserPlaybackPreparer( override fun onPrepareFromUri(uri: Uri, playWhenReady: Boolean, extras: Bundle?) { onUnsupportedError() } - - override fun onCommand( - player: Player, - command: String, - extras: Bundle?, - cb: ResultReceiver? - ): Boolean { - return false - } //endregion //region Errors diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java index d23dd4574c..1e00e2b8f8 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java @@ -2,10 +2,10 @@ import android.net.Uri; -import com.google.android.exoplayer2.MediaItem; -import com.google.android.exoplayer2.MediaItem.RequestMetadata; -import com.google.android.exoplayer2.MediaMetadata; -import com.google.android.exoplayer2.Player; +import androidx.media3.common.MediaItem; +import androidx.media3.common.MediaItem.RequestMetadata; +import androidx.media3.common.MediaMetadata; +import androidx.media3.common.Player; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamType; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java index 4095f2bc88..f2ed6dc138 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.player.mediaitem; -import com.google.android.exoplayer2.MediaItem; +import androidx.media3.common.MediaItem; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamType; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java deleted file mode 100644 index 92cd425c5f..0000000000 --- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.schabi.newpipe.player.mediasession; - -import android.os.Bundle; -import android.os.ResultReceiver; -import android.support.v4.media.session.MediaSessionCompat; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; -import com.google.android.exoplayer2.util.Util; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static android.support.v4.media.session.PlaybackStateCompat.ACTION_SKIP_TO_NEXT; -import static android.support.v4.media.session.PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS; -import static android.support.v4.media.session.PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM; - -public class PlayQueueNavigator implements MediaSessionConnector.QueueNavigator { - public static final int DEFAULT_MAX_QUEUE_SIZE = 10; - - private final MediaSessionCompat mediaSession; - private final MediaSessionCallback callback; - private final int maxQueueSize; - - private long activeQueueItemId; - - public PlayQueueNavigator(@NonNull final MediaSessionCompat mediaSession, - @NonNull final MediaSessionCallback callback) { - this.mediaSession = mediaSession; - this.callback = callback; - this.maxQueueSize = DEFAULT_MAX_QUEUE_SIZE; - - this.activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID; - } - - @Override - public long getSupportedQueueNavigatorActions(@Nullable final Player player) { - return ACTION_SKIP_TO_NEXT | ACTION_SKIP_TO_PREVIOUS | ACTION_SKIP_TO_QUEUE_ITEM; - } - - @Override - public void onTimelineChanged(@NonNull final Player player) { - publishFloatingQueueWindow(); - } - - @Override - public void onCurrentMediaItemIndexChanged(@NonNull final Player player) { - if (activeQueueItemId == MediaSessionCompat.QueueItem.UNKNOWN_ID - || player.getCurrentTimeline().getWindowCount() > maxQueueSize) { - publishFloatingQueueWindow(); - } else if (!player.getCurrentTimeline().isEmpty()) { - activeQueueItemId = player.getCurrentMediaItemIndex(); - } - } - - @Override - public long getActiveQueueItemId(@Nullable final Player player) { - return callback.getCurrentPlayingIndex(); - } - - @Override - public void onSkipToPrevious(@NonNull final Player player) { - callback.playPrevious(); - } - - @Override - public void onSkipToQueueItem(@NonNull final Player player, final long id) { - callback.playItemAtIndex((int) id); - } - - @Override - public void onSkipToNext(@NonNull final Player player) { - callback.playNext(); - } - - private void publishFloatingQueueWindow() { - if (callback.getQueueSize() == 0) { - mediaSession.setQueue(Collections.emptyList()); - activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID; - return; - } - - // Yes this is almost a copypasta, got a problem with that? =\ - final int windowCount = callback.getQueueSize(); - final int currentWindowIndex = callback.getCurrentPlayingIndex(); - final int queueSize = Math.min(maxQueueSize, windowCount); - final int startIndex = Util.constrainValue(currentWindowIndex - ((queueSize - 1) / 2), 0, - windowCount - queueSize); - - final List queue = new ArrayList<>(); - for (int i = startIndex; i < startIndex + queueSize; i++) { - queue.add(new MediaSessionCompat.QueueItem(callback.getQueueMetadata(i), i)); - } - mediaSession.setQueue(queue); - activeQueueItemId = currentWindowIndex; - } - - @Override - public boolean onCommand(@NonNull final Player player, - @NonNull final String command, - @Nullable final Bundle extras, - @Nullable final ResultReceiver cb) { - return false; - } -} diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlaybackPreparer.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlaybackPreparer.java new file mode 100644 index 0000000000..8be402b782 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlaybackPreparer.java @@ -0,0 +1,22 @@ +package org.schabi.newpipe.player.mediasession; + +import android.net.Uri; +import android.os.Bundle; + +import androidx.annotation.Nullable; + +/** + * Replacement for ExoPlayer's removed {@code MediaSessionConnector.PlaybackPreparer}: lets the + * media browser (Android Auto) turn a media id / search / uri into actual playback. + */ +public interface PlaybackPreparer { + long getSupportedPrepareActions(); + + void onPrepare(boolean playWhenReady); + + void onPrepareFromMediaId(String mediaId, boolean playWhenReady, @Nullable Bundle extras); + + void onPrepareFromSearch(String query, boolean playWhenReady, @Nullable Bundle extras); + + void onPrepareFromUri(Uri uri, boolean playWhenReady, @Nullable Bundle extras); +} diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java index 8aad356d0a..9e00cf3a7d 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java @@ -2,15 +2,15 @@ import android.util.Log; -import com.google.android.exoplayer2.MediaItem; -import com.google.android.exoplayer2.PlaybackException; -import com.google.android.exoplayer2.Timeline; -import com.google.android.exoplayer2.source.BaseMediaSource; -import com.google.android.exoplayer2.source.MediaPeriod; -import com.google.android.exoplayer2.source.SilenceMediaSource; -import com.google.android.exoplayer2.source.SinglePeriodTimeline; -import com.google.android.exoplayer2.upstream.Allocator; -import com.google.android.exoplayer2.upstream.TransferListener; +import androidx.media3.common.MediaItem; +import androidx.media3.common.PlaybackException; +import androidx.media3.common.Timeline; +import androidx.media3.exoplayer.source.BaseMediaSource; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.SilenceMediaSource; +import androidx.media3.exoplayer.source.SinglePeriodTimeline; +import androidx.media3.exoplayer.upstream.Allocator; +import androidx.media3.datasource.TransferListener; import org.schabi.newpipe.player.mediaitem.ExceptionTag; import org.schabi.newpipe.player.playqueue.PlayQueueItem; @@ -120,10 +120,10 @@ protected void prepareSourceInternal(@Nullable final TransferListener mediaTrans * If the error is not known, e.g. network issue, then the exception is not swallowed here in * {@link FailedMediaSource}. The exception is then propagated to the player, which * {@link org.schabi.newpipe.player.Player Player} can react to inside - * {@link com.google.android.exoplayer2.Player.Listener#onPlayerError(PlaybackException)}. + * {@link androidx.media3.common.Player.Listener#onPlayerError(PlaybackException)}. * * @throws IOException An error which will always result in - * {@link com.google.android.exoplayer2.PlaybackException#ERROR_CODE_IO_UNSPECIFIED}. + * {@link androidx.media3.common.PlaybackException#ERROR_CODE_IO_UNSPECIFIED}. */ @Override public void maybeThrowSourceInfoRefreshError() throws IOException { diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java index 95524cf692..2832be7fa6 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java @@ -1,12 +1,12 @@ package org.schabi.newpipe.player.mediasource; -import com.google.android.exoplayer2.MediaItem; -import com.google.android.exoplayer2.Timeline; -import com.google.android.exoplayer2.source.CompositeMediaSource; -import com.google.android.exoplayer2.source.MediaPeriod; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.upstream.Allocator; -import com.google.android.exoplayer2.upstream.TransferListener; +import androidx.media3.common.MediaItem; +import androidx.media3.common.Timeline; +import androidx.media3.exoplayer.source.CompositeMediaSource; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.upstream.Allocator; +import androidx.media3.datasource.TransferListener; import org.schabi.newpipe.player.mediaitem.MediaItemTag; import org.schabi.newpipe.player.playqueue.PlayQueueItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java index 9d6b948937..f60bd49815 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java @@ -2,7 +2,7 @@ import androidx.annotation.NonNull; -import com.google.android.exoplayer2.source.MediaSource; +import androidx.media3.exoplayer.source.MediaSource; import org.schabi.newpipe.player.playqueue.PlayQueueItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java index 4c03807672..46335fd075 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java @@ -5,8 +5,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.source.ConcatenatingMediaSource; -import com.google.android.exoplayer2.source.ShuffleOrder; +import androidx.media3.exoplayer.source.ConcatenatingMediaSource; +import androidx.media3.exoplayer.source.ShuffleOrder; import org.schabi.newpipe.player.mediaitem.MediaItemTag; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java index 92d4403c8b..4e18edf6f1 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java @@ -1,11 +1,11 @@ package org.schabi.newpipe.player.mediasource; -import com.google.android.exoplayer2.MediaItem; -import com.google.android.exoplayer2.Timeline; -import com.google.android.exoplayer2.source.CompositeMediaSource; -import com.google.android.exoplayer2.source.MediaPeriod; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.upstream.Allocator; +import androidx.media3.common.MediaItem; +import androidx.media3.common.Timeline; +import androidx.media3.exoplayer.source.CompositeMediaSource; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.upstream.Allocator; import org.schabi.newpipe.player.mediaitem.PlaceholderTag; import org.schabi.newpipe.player.playqueue.PlayQueueItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java index f984668276..5269771b36 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java @@ -8,7 +8,7 @@ import androidx.annotation.Nullable; import androidx.collection.ArraySet; -import com.google.android.exoplayer2.source.MediaSource; +import androidx.media3.exoplayer.source.MediaSource; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -477,7 +477,7 @@ private void onMediaSourceReceived(@NonNull final PlayQueueItem item, /** * Checks if the corresponding MediaSource in - * {@link com.google.android.exoplayer2.source.ConcatenatingMediaSource} + * {@link androidx.media3.exoplayer.source.ConcatenatingMediaSource} * for a given {@link PlayQueueItem} needs replacement, either due to gapless playback * readiness or playlist desynchronization. *

diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java index 7376070015..e482646026 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java @@ -3,7 +3,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.source.MediaSource; +import androidx.media3.exoplayer.source.MediaSource; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.player.playqueue.PlayQueueItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java index cd0f377155..265c50a1c7 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java @@ -9,15 +9,15 @@ import org.schabi.newpipe.player.mediasession.MediaSessionCallback; import org.schabi.newpipe.player.playqueue.PlayQueueItem; -import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF; +import static androidx.media3.common.Player.REPEAT_MODE_OFF; import static org.schabi.newpipe.player.helper.PlayerHelper.nextRepeatMode; public class PlayerMediaSession implements MediaSessionCallback { public final Player player; - private final com.google.android.exoplayer2.Player exoPlayer; + private final androidx.media3.common.Player exoPlayer; public int mode = 0; - public PlayerMediaSession(final Player player, final com.google.android.exoplayer2.Player exoPlayer) { + public PlayerMediaSession(final Player player, final androidx.media3.common.Player exoPlayer) { this.player = player; this.exoPlayer = exoPlayer; refresh(); @@ -114,10 +114,10 @@ public void changePlayMode() { player.onShuffleClicked(); break; case 1: // repeat_one - player.setRepeatMode(com.google.android.exoplayer2.Player.REPEAT_MODE_ONE); + player.setRepeatMode(androidx.media3.common.Player.REPEAT_MODE_ONE); break; case 2: // repeat_all - player.setRepeatMode(com.google.android.exoplayer2.Player.REPEAT_MODE_ALL); + player.setRepeatMode(androidx.media3.common.Player.REPEAT_MODE_ALL); break; case 3: // repeat_none default: @@ -132,9 +132,9 @@ public void close(){ public void refresh(){ if (exoPlayer.getShuffleModeEnabled()) { this.mode = 1; - } else if (exoPlayer.getRepeatMode() == com.google.android.exoplayer2.Player.REPEAT_MODE_ONE) { + } else if (exoPlayer.getRepeatMode() == androidx.media3.common.Player.REPEAT_MODE_ONE) { this.mode = 2; - } else if (exoPlayer.getRepeatMode() == com.google.android.exoplayer2.Player.REPEAT_MODE_ALL) { + } else if (exoPlayer.getRepeatMode() == androidx.media3.common.Player.REPEAT_MODE_ALL) { this.mode = 3; } else { this.mode = 0; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java b/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java index da6cb36d4f..b02a9240d3 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java @@ -3,8 +3,8 @@ import android.content.Context; import android.view.SurfaceHolder; -import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.video.PlaceholderSurface; +import androidx.media3.common.Player; +import androidx.media3.exoplayer.video.PlaceholderSurface; /** * Prevent error message: 'Unrecoverable player error occurred' diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java index 7e3f590078..d44b64b556 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.source.MediaSource; +import androidx.media3.exoplayer.source.MediaSource; import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.StreamInfo; diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java b/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java index 82dff6ec9b..06fe0b3656 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java @@ -4,9 +4,9 @@ import androidx.annotation.Nullable; -import com.google.android.exoplayer2.upstream.ByteArrayDataSource; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.TransferListener; +import androidx.media3.datasource.ByteArrayDataSource; +import androidx.media3.datasource.DataSource; +import androidx.media3.datasource.TransferListener; public class CustomDataSourceFactory implements DataSource.Factory { private final Context context; diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java index d8d9ecb0d6..fbd6334f01 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java @@ -6,19 +6,19 @@ import android.net.Uri; import android.util.Log; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.MediaItem; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.ProgressiveMediaSource; -import com.google.android.exoplayer2.source.dash.DashMediaSource; -import com.google.android.exoplayer2.source.dash.manifest.DashManifest; -import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser; -import com.google.android.exoplayer2.source.hls.HlsMediaSource; -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist; -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser; -import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource; -import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest; -import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser; +import androidx.media3.common.C; +import androidx.media3.common.MediaItem; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.source.ProgressiveMediaSource; +import androidx.media3.exoplayer.dash.DashMediaSource; +import androidx.media3.exoplayer.dash.manifest.DashManifest; +import androidx.media3.exoplayer.dash.manifest.DashManifestParser; +import androidx.media3.exoplayer.hls.HlsMediaSource; +import androidx.media3.exoplayer.hls.playlist.HlsPlaylist; +import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParser; +import androidx.media3.exoplayer.smoothstreaming.SsMediaSource; +import androidx.media3.exoplayer.smoothstreaming.manifest.SsManifest; +import androidx.media3.exoplayer.smoothstreaming.manifest.SsManifestParser; import com.grack.nanojson.JsonObject; import com.grack.nanojson.JsonParser; import com.grack.nanojson.JsonParserException; @@ -47,6 +47,12 @@ import org.schabi.newpipe.player.mediaitem.MediaItemTag; import org.schabi.newpipe.player.mediaitem.StreamInfoTag; import org.schabi.newpipe.util.StreamTypeUtil; +import org.schabi.newpipe.App; +import org.schabi.newpipe.extractor.exceptions.ExtractionException; +import org.schabi.newpipe.extractor.localization.Localization; +import org.schabi.newpipe.extractor.services.youtube.sabr.YoutubeSabrFormat; +import org.schabi.newpipe.player.datasource.SabrMediaSource; +import org.schabi.newpipe.player.datasource.SabrSessionStore; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -437,12 +443,42 @@ private static MediaSource createYoutubeMediaSourceOfVideoStr .setUri(Uri.parse(stream.getContent())) .setCustomCacheKey(cacheKey) .build()); + case SABR: + return buildSabrMediaSource(stream, streamInfo, cacheKey, metadata); default: throw new IOException("Unsupported delivery method for YouTube contents: " + deliveryMethod); } } + @NonNull + private static MediaSource buildSabrMediaSource(@NonNull final Stream stream, + @NonNull final StreamInfo streamInfo, + @NonNull final String cacheKey, + @NonNull final MediaItemTag metadata) + throws IOException { + final String videoId = streamInfo.getId(); + // Honour the user-selected video quality instead of forcing the highest (4K is heavy and + // hits the device VP9 decoder wall); audio-only playback passes 0 and keeps the best audio. + final int preferredVideoItag = + (stream instanceof VideoStream) ? ((VideoStream) stream).getItag() : 0; + final SabrSessionStore.Holder holder; + try { + holder = SabrSessionStore.getOrCreate(App.getApp(), videoId, preferredVideoItag); + } catch (final ExtractionException e) { + throw new IOException("Could not start SABR session for " + videoId, e); + } + // One source carries both tracks; media3 track selection picks audio-only when there's no + // video renderer (background/popup). Seeking is real because it's chunk-based, not a byte + // stream. The audio resolver path skips its own SABR source (see VideoPlaybackResolver). + final MediaItem mediaItem = new MediaItem.Builder() + .setTag(metadata) + .setUri(Uri.parse("sabr://" + videoId)) + .setCustomCacheKey(cacheKey) + .build(); + return new SabrMediaSource(mediaItem, holder, new Localization("en", "US")); + } + @NonNull private static DashMediaSource buildYoutubeManualDashMediaSource( @NonNull final PlayerDataSource dataSource, diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java index 9c9324081c..222d51ff59 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java @@ -7,11 +7,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.MediaItem; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.MergingMediaSource; -import com.google.android.exoplayer2.source.SingleSampleMediaSource; +import androidx.media3.common.C; +import androidx.media3.common.MediaItem; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.source.MergingMediaSource; +import androidx.media3.exoplayer.source.SingleSampleMediaSource; import org.schabi.newpipe.extractor.MediaFormat; import org.schabi.newpipe.extractor.stream.AudioStream; @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static com.google.android.exoplayer2.C.TIME_UNSET; +import static androidx.media3.common.C.TIME_UNSET; import static org.schabi.newpipe.util.ListHelper.*; public class VideoPlaybackResolver implements PlaybackResolver { @@ -147,9 +147,12 @@ public MediaSource resolve(@NonNull final StreamInfo info) { // Use the audio stream if there is no video stream, or // merge with audio stream in case if video does not contain audio + // SABR carries audio + video in one MediaSource, so don't add a separate audio source. + final boolean videoIsSabr = video != null && video.getDeliveryMethod() + == org.schabi.newpipe.extractor.stream.DeliveryMethod.SABR; final boolean videoHasMatchingAudio = video != null && !video.isVideoOnly() && audioTrack != null && audioTrack.equals(video.getAudioTrackId()); - if (audio != null && !videoHasMatchingAudio + if (audio != null && !videoHasMatchingAudio && !videoIsSabr && (video == null || video.isVideoOnly() || audioTrack != null)) { try { final MediaSource audioSource = PlaybackResolver.buildMediaSource( diff --git a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java index 010e1be56f..a6f43415f2 100644 --- a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java +++ b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java @@ -5,10 +5,10 @@ import android.util.AttributeSet; import android.view.SurfaceView; -import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; +import androidx.media3.ui.AspectRatioFrameLayout; -import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT; -import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM; +import static androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT; +import static androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM; public class ExpandableSurfaceView extends SurfaceView { private int resizeMode = RESIZE_MODE_FIT; diff --git a/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt b/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt index 49590671a6..5174924acb 100644 --- a/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt +++ b/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt @@ -1,13 +1,13 @@ package us.shandian.giga.hls.manifest import android.net.Uri -import com.google.android.exoplayer2.C -import com.google.android.exoplayer2.Format -import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist as ExoHlsMediaPlaylist -import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment as ExoHlsSegment -import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.SegmentBase as ExoHlsSegmentBase -import com.google.android.exoplayer2.source.hls.playlist.HlsMultivariantPlaylist as ExoHlsMultivariantPlaylist -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser as ExoHlsPlaylistParser +import androidx.media3.common.C +import androidx.media3.common.Format +import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist as ExoHlsMediaPlaylist +import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist.Segment as ExoHlsSegment +import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist.SegmentBase as ExoHlsSegmentBase +import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist as ExoHlsMultivariantPlaylist +import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParser as ExoHlsPlaylistParser import java.io.ByteArrayInputStream import java.io.IOException import java.net.URI diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml new file mode 100644 index 0000000000..4b86e109e9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml new file mode 100644 index 0000000000..db11f299be --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml new file mode 100644 index 0000000000..782d9ff34d --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_next.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_next.xml new file mode 100644 index 0000000000..6305bcbc90 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_next.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml new file mode 100644 index 0000000000..45cd68bed6 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_play.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_play.xml new file mode 100644 index 0000000000..c8c4cdb127 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_play.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml new file mode 100644 index 0000000000..9564a2a350 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml new file mode 100644 index 0000000000..dad37fa1f0 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml new file mode 100644 index 0000000000..132eae0d76 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml new file mode 100644 index 0000000000..d51010566a --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml new file mode 100644 index 0000000000..976b706170 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml new file mode 100644 index 0000000000..283ce30c3c --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml new file mode 100644 index 0000000000..123c06c43e --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml new file mode 100644 index 0000000000..2e1e40cbb5 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml new file mode 100644 index 0000000000..dad37fa1f0 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml new file mode 100644 index 0000000000..132eae0d76 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml new file mode 100644 index 0000000000..d51010566a --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_circular_play.png new file mode 100644 index 0000000000..ecf3df3cb1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_circular_play.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_fastforward.png new file mode 100644 index 0000000000..5699614c6b Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_fastforward.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_enter.png new file mode 100644 index 0000000000..9b8131124d Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_enter.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_exit.png new file mode 100644 index 0000000000..159bea7fd8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_exit.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_next.png new file mode 100644 index 0000000000..303e896187 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_next.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_pause.png new file mode 100644 index 0000000000..f49aed7571 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_pause.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_play.png new file mode 100644 index 0000000000..5a3e037ae9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_play.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_previous.png new file mode 100644 index 0000000000..2c3b3af982 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_previous.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_all.png new file mode 100644 index 0000000000..2824e7847c Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_all.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_off.png new file mode 100644 index 0000000000..0b92f583da Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_off.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_one.png new file mode 100644 index 0000000000..232aa2b1cd Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_one.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_rewind.png new file mode 100644 index 0000000000..d9e279231a Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_rewind.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_off.png new file mode 100644 index 0000000000..b693422db7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_off.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_on.png new file mode 100644 index 0000000000..52a805aac1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_on.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_stop.png new file mode 100644 index 0000000000..3ad2c9c4e3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_stop.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_vr.png new file mode 100644 index 0000000000..90948eb44f Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_vr.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_all.png new file mode 100644 index 0000000000..2824e7847c Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_all.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_off.png new file mode 100644 index 0000000000..0b92f583da Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_off.png differ diff --git a/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_one.png new file mode 100644 index 0000000000..232aa2b1cd Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_one.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_circular_play.png new file mode 100644 index 0000000000..e5104fcd62 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_circular_play.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_fastforward.png new file mode 100644 index 0000000000..e63921abe6 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_fastforward.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_enter.png new file mode 100644 index 0000000000..1af1f68a02 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_enter.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_exit.png new file mode 100644 index 0000000000..db03f46435 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_exit.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_next.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_next.png new file mode 100644 index 0000000000..78f9bed762 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_next.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_pause.png new file mode 100644 index 0000000000..1818039e51 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_pause.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_play.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_play.png new file mode 100644 index 0000000000..f0b0570d0b Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_play.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_previous.png new file mode 100644 index 0000000000..4d2eccfe9a Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_previous.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_all.png new file mode 100644 index 0000000000..5c91a47519 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_all.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_off.png new file mode 100644 index 0000000000..a94abd864f Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_off.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_one.png new file mode 100644 index 0000000000..a59a985239 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_one.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_rewind.png new file mode 100644 index 0000000000..8cd1daa810 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_rewind.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_off.png new file mode 100644 index 0000000000..2353dd4289 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_off.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_on.png new file mode 100644 index 0000000000..80ec43a119 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_on.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_stop.png new file mode 100644 index 0000000000..836f4dbb55 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_stop.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_vr.png new file mode 100644 index 0000000000..6e21960ed6 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_vr.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_all.png new file mode 100644 index 0000000000..5c91a47519 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_all.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_off.png new file mode 100644 index 0000000000..a94abd864f Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_off.png differ diff --git a/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_one.png new file mode 100644 index 0000000000..a59a985239 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_one.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_circular_play.png new file mode 100644 index 0000000000..7242e1f5c8 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_circular_play.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_fastforward.png new file mode 100644 index 0000000000..1b42a5315f Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_fastforward.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_enter.png new file mode 100644 index 0000000000..4423c7ce99 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_enter.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_exit.png new file mode 100644 index 0000000000..364bad0b84 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_exit.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_next.png new file mode 100644 index 0000000000..a93aae0f34 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_next.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_pause.png new file mode 100644 index 0000000000..3e150b5a45 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_pause.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_play.png new file mode 100644 index 0000000000..692d8c2ad9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_play.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_previous.png new file mode 100644 index 0000000000..ea83907d8e Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_previous.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_all.png new file mode 100644 index 0000000000..97f7e1cc75 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_all.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_off.png new file mode 100644 index 0000000000..6a02321702 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_off.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_one.png new file mode 100644 index 0000000000..59bac33705 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_one.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_rewind.png new file mode 100644 index 0000000000..231bcee4ca Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_rewind.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_off.png new file mode 100644 index 0000000000..a55d716cce Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_off.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_on.png new file mode 100644 index 0000000000..0924b2cb69 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_on.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_stop.png new file mode 100644 index 0000000000..2aeffbb6cf Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_stop.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_vr.png new file mode 100644 index 0000000000..02063a79a9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_vr.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_all.png new file mode 100644 index 0000000000..97f7e1cc75 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_all.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_off.png new file mode 100644 index 0000000000..6a02321702 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_off.png differ diff --git a/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_one.png new file mode 100644 index 0000000000..59bac33705 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_one.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_circular_play.png new file mode 100644 index 0000000000..dd31d608d4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_circular_play.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fastforward.png new file mode 100644 index 0000000000..ab7e1fd334 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fastforward.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_enter.png new file mode 100644 index 0000000000..c1dcfb2902 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_enter.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_exit.png new file mode 100644 index 0000000000..ef360fe40c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_exit.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_next.png new file mode 100644 index 0000000000..f3552d7216 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_next.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_pause.png new file mode 100644 index 0000000000..1c868f1831 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_pause.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_play.png new file mode 100644 index 0000000000..381eabdccf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_play.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_previous.png new file mode 100644 index 0000000000..0a2ddd5e90 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_previous.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_all.png new file mode 100644 index 0000000000..2baaedecbf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_all.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_off.png new file mode 100644 index 0000000000..2468f92f9f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_off.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_one.png new file mode 100644 index 0000000000..4e1d53db77 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_one.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_rewind.png new file mode 100644 index 0000000000..a798fee30e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_rewind.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_off.png new file mode 100644 index 0000000000..2b67cabf5a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_off.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_on.png new file mode 100644 index 0000000000..ede80c9341 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_on.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_stop.png new file mode 100644 index 0000000000..8727a93480 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_stop.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_vr.png new file mode 100644 index 0000000000..ff243ef56a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_vr.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_all.png new file mode 100644 index 0000000000..2baaedecbf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_all.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_off.png new file mode 100644 index 0000000000..2468f92f9f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_off.png differ diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_one.png new file mode 100644 index 0000000000..4e1d53db77 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_one.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_circular_play.png new file mode 100644 index 0000000000..56ed071b2f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_circular_play.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fastforward.png new file mode 100644 index 0000000000..1e8db0ec23 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fastforward.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_enter.png new file mode 100644 index 0000000000..a0a1b4d4f3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_enter.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_exit.png new file mode 100644 index 0000000000..b7f4133fd9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_exit.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_next.png new file mode 100644 index 0000000000..131a531b37 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_next.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_pause.png new file mode 100644 index 0000000000..ac8d4fcad5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_pause.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_play.png new file mode 100644 index 0000000000..365b3dfee5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_play.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_previous.png new file mode 100644 index 0000000000..884cbdd407 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_previous.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_all.png new file mode 100644 index 0000000000..d7207ebc0d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_all.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_off.png new file mode 100644 index 0000000000..4d6253ead6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_off.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_one.png new file mode 100644 index 0000000000..d577f4ebcd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_one.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_rewind.png new file mode 100644 index 0000000000..4bab545714 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_rewind.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_off.png new file mode 100644 index 0000000000..22209d1f88 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_off.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_on.png new file mode 100644 index 0000000000..4c5e141a3f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_on.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_stop.png new file mode 100644 index 0000000000..5239336671 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_stop.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_vr.png new file mode 100644 index 0000000000..7c0338842d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_vr.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_all.png new file mode 100644 index 0000000000..d7207ebc0d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_all.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_off.png new file mode 100644 index 0000000000..4d6253ead6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_off.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_one.png new file mode 100644 index 0000000000..d577f4ebcd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_one.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_circular_play.png new file mode 100644 index 0000000000..eabf12f38a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_circular_play.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fastforward.png new file mode 100644 index 0000000000..cb7d89cd32 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fastforward.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_enter.png new file mode 100644 index 0000000000..172fe0db5e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_enter.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_exit.png new file mode 100644 index 0000000000..0db7b8f8b4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_exit.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_next.png new file mode 100644 index 0000000000..7cb2bd1b5b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_next.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_pause.png new file mode 100644 index 0000000000..c623c94267 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_pause.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_play.png new file mode 100644 index 0000000000..1f0f6818a8 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_play.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_previous.png new file mode 100644 index 0000000000..50cf727a02 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_previous.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_all.png new file mode 100644 index 0000000000..b847d068d2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_all.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_off.png new file mode 100644 index 0000000000..64324b3fdc Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_off.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_one.png new file mode 100644 index 0000000000..bd4fc75657 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_one.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_rewind.png new file mode 100644 index 0000000000..709611c568 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_rewind.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_off.png new file mode 100644 index 0000000000..ab42a5ad6b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_off.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_on.png new file mode 100644 index 0000000000..f6d3ac445d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_on.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_stop.png new file mode 100644 index 0000000000..06c99c9b59 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_stop.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_all.png new file mode 100644 index 0000000000..b847d068d2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_all.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_off.png new file mode 100644 index 0000000000..64324b3fdc Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_off.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_one.png new file mode 100644 index 0000000000..bd4fc75657 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_one.png differ diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml index a055ad7acf..b77e1b6aae 100644 --- a/app/src/main/res/layout-land/activity_player_queue_control.xml +++ b/app/src/main/res/layout-land/activity_player_queue_control.xml @@ -121,7 +121,7 @@ android:clickable="true" android:focusable="true" android:scaleType="fitCenter" - android:src="@drawable/exo_controls_rewind" + android:src="@drawable/exo_icon_rewind" android:tint="?attr/colorAccent" tools:ignore="ContentDescription" /> @@ -171,7 +171,7 @@ android:clickable="true" android:focusable="true" android:scaleType="fitCenter" - android:src="@drawable/exo_controls_fastforward" + android:src="@drawable/exo_icon_fastforward" android:tint="?attr/colorAccent" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml index 2cb9922093..48c7787ccb 100644 --- a/app/src/main/res/layout/activity_player_queue_control.xml +++ b/app/src/main/res/layout/activity_player_queue_control.xml @@ -204,7 +204,7 @@ android:clickable="true" android:focusable="true" android:scaleType="fitCenter" - android:src="@drawable/exo_controls_rewind" + android:src="@drawable/exo_icon_rewind" android:tint="?attr/colorAccent" /> -