Skip to content

Commit

Permalink
Remove direct path option from external player (#2342)
Browse files Browse the repository at this point in the history 
* Remove direct path option from external player

Direct paths have been deprecated in the server a while back (and is pending removal). Now that it broke in 0.15 it's easier to remove then to fix it.

* Update app/src/main/java/org/jellyfin/androidtv/ui/playback/ExternalPlayerActivity.java

Co-authored-by: Cody Robibero <[email protected]>

Co-authored-by: Cody Robibero <[email protected]>
  • Loading branch information
@nielsvanvelzen @crobibero
nielsvanvelzen and crobibero authored Dec 14, 2022
1 parent f0b86e4 commit aca0c45
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 117 deletions.
5 changes: 0 additions & 5 deletions app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
*/
var refreshRateSwitchingBehavior = enumPreference("refresh_rate_switching_behavior", RefreshRateSwitchingBehavior.DISABLED)

/**
* Send a path instead to the external player
*/
var externalVideoPlayerSendPath = booleanPreference("pref_send_path_external", false)

/* Playback - Audio related */
/**
* Preferred behavior for audio streaming.
Expand Down
148 changes: 61 additions & 87 deletions app/src/main/java/org/jellyfin/androidtv/ui/playback/ExternalPlayerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.jellyfin.apiclient.interaction.Response;
import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
import org.jellyfin.apiclient.model.dto.UserItemDataDto;
import org.jellyfin.apiclient.model.session.PlayMethod;
import org.jellyfin.sdk.model.api.BaseItemKind;
import org.koin.java.KoinJavaComponent;

Expand Down Expand Up @@ -80,16 +79,13 @@ public class ExternalPlayerActivity extends FragmentActivity {
static final String API_MX_RESULT_ID = "com.mxtech.intent.result.VIEW";
static final String API_MX_RESULT_POSITION = "position";
static final String API_MX_RESULT_END_BY = "end_by";
static final String API_MX_RESULT_END_BY_USER = "user";
static final String API_MX_RESULT_END_BY_PLAYBACK_COMPLETION = "playback_completion";
static final String API_MX_SUBS = "subs";
static final String API_MX_SUBS_NAME = "subs.name";
static final String API_MX_SUBS_FILENAME = "subs.filename";
static final String API_MX_SUBS_ENABLE = "subs.enable";

// https://wiki.videolan.org/Android_Player_Intents/
static final String API_VLC_TITLE = "title";
static final String API_VLC_SEEK_POSITION = "position";
static final String API_VLC_FROM_START = "from_start";
static final String API_VLC_RESULT_ID = "org.videolan.vlc.player.result";
static final String API_VLC_RESULT_POSITION = "extra_position";
Expand All @@ -101,7 +97,6 @@ public class ExternalPlayerActivity extends FragmentActivity {
static final String API_VIMU_RESUME = "forceresume";
static final String API_VIMU_RESULT_POSITION = "position";
static final int API_VIMU_RESULT_PLAYBACK_COMPLETED = 1;
static final int API_VIMU_RESULT_PLAYBACK_INTERRUPTED = 0;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -137,30 +132,28 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
long runtime = item.getRunTimeTicks() != null ? item.getRunTimeTicks() / RUNTIME_TICKS_TO_MS : 0;
int pos = 0;
// look for result position in API's
if (data != null) {
if (data.hasExtra(API_MX_RESULT_POSITION)) {
pos = data.getIntExtra(API_MX_RESULT_POSITION, 0);
} else if (data.hasExtra(API_VLC_RESULT_POSITION)) {
pos = data.getIntExtra(API_VLC_RESULT_POSITION, 0);
} else if (data.hasExtra(API_VIMU_RESULT_POSITION)) {
pos = data.getIntExtra(API_VIMU_RESULT_POSITION, 0);
}
}
if (data != null) {
if (data.hasExtra(API_MX_RESULT_POSITION)) {
pos = data.getIntExtra(API_MX_RESULT_POSITION, 0);
} else if (data.hasExtra(API_VLC_RESULT_POSITION)) {
pos = data.getIntExtra(API_VLC_RESULT_POSITION, 0);
} else if (data.hasExtra(API_VIMU_RESULT_POSITION)) {
pos = data.getIntExtra(API_VIMU_RESULT_POSITION, 0);
}
}
// check for playback completion in API's
if (pos == 0 && data != null) {
if (Objects.equals(data.getAction(), API_MX_RESULT_ID)) {
if (resultCode == Activity.RESULT_OK && data.getStringExtra(API_MX_RESULT_END_BY).equals(API_MX_RESULT_END_BY_PLAYBACK_COMPLETION)) {
pos = (int) runtime;
Timber.i("Detected playback completion for MX player.");
}
}
else if (Objects.equals(data.getAction(), API_VLC_RESULT_ID)) {
} else if (Objects.equals(data.getAction(), API_VLC_RESULT_ID)) {
if (resultCode == Activity.RESULT_OK) {
pos = (int) runtime;
Timber.i("Detected playback completion for VLC player.");
}
}
else if (resultCode == API_VIMU_RESULT_PLAYBACK_COMPLETED) {
} else if (resultCode == API_VIMU_RESULT_PLAYBACK_COMPLETED) {
pos = (int) runtime;
Timber.i("Detected playback completion for Vimu player.");
}
Expand Down Expand Up @@ -221,7 +214,8 @@ public void onClick(DialogInterface dialog, int which) {
}

private void handlePlayerError() {
if (!mediaManager.getValue().isVideoQueueModified()) mediaManager.getValue().clearVideoQueue();
if (!mediaManager.getValue().isVideoQueueModified())
mediaManager.getValue().clearVideoQueue();

new AlertDialog.Builder(this)
.setTitle(R.string.no_player)
Expand Down Expand Up @@ -307,66 +301,46 @@ protected void launchExternalPlayer(int ndx) {
org.jellyfin.sdk.model.api.BaseItemDto item = mItemsToPlay.get(mCurrentNdx);
isLiveTv = item.getType() == BaseItemKind.TV_CHANNEL;

if (!isLiveTv && userPreferences.getValue().get(UserPreferences.Companion.getExternalVideoPlayerSendPath())) {
// Just pass the path directly
mCurrentStreamInfo = new StreamInfo();
mCurrentStreamInfo.setPlayMethod(PlayMethod.DirectPlay);
startExternalActivity(preparePath(item.getPath()), item.getContainer() != null ? item.getContainer() : "*");
} else {
//Build options for player
VideoOptions options = new VideoOptions();
options.setItemId(item.getId().toString());
options.setMediaSources(item.getMediaSources());
options.setMaxBitrate(Utils.getMaxBitrate());
options.setProfile(new ExternalPlayerProfile());

// Get playback info for each player and then decide on which one to use
KoinJavaComponent.<PlaybackManager>get(PlaybackManager.class).getVideoStreamInfo(api.getValue().getDeviceInfo(), options, JavaCompat.getResumePositionTicks(item), apiClient.getValue(), new Response<StreamInfo>() {
@Override
public void onResponse(StreamInfo response) {
mCurrentStreamInfo = response;

//Construct a static URL to sent to player
//String url = KoinJavaComponent.<ApiClient>get(ApiClient.class).getApiUrl() + "/videos/" + response.getItemId() + "/stream?static=true&mediaSourceId=" + response.getMediaSourceId();

String url = response.getMediaUrl();
//And request an activity to play it
startExternalActivity(url, response.getMediaSource().getContainer() != null ? response.getMediaSource().getContainer() : "*");
}

@Override
public void onError(Exception exception) {
Timber.e(exception, "Error getting playback stream info");
if (exception instanceof PlaybackException) {
PlaybackException ex = (PlaybackException) exception;
switch (ex.getErrorCode()) {
case NotAllowed:
Utils.showToast(ExternalPlayerActivity.this, getString(R.string.msg_playback_not_allowed));
break;
case NoCompatibleStream:
Utils.showToast(ExternalPlayerActivity.this, getString(R.string.msg_playback_incompatible));
break;
case RateLimitExceeded:
Utils.showToast(ExternalPlayerActivity.this, getString(R.string.msg_playback_restricted));
break;
}
}
}
//Build options for player
VideoOptions options = new VideoOptions();
options.setItemId(item.getId().toString());
options.setMediaSources(item.getMediaSources());
options.setMaxBitrate(Utils.getMaxBitrate());
options.setProfile(new ExternalPlayerProfile());

});
}
}
// Get playback info for each player and then decide on which one to use
KoinJavaComponent.<PlaybackManager>get(PlaybackManager.class).getVideoStreamInfo(api.getValue().getDeviceInfo(), options, JavaCompat.getResumePositionTicks(item), apiClient.getValue(), new Response<StreamInfo>() {
@Override
public void onResponse(StreamInfo response) {
mCurrentStreamInfo = response;

//Construct a static URL to sent to player
//String url = KoinJavaComponent.<ApiClient>get(ApiClient.class).getApiUrl() + "/videos/" + response.getItemId() + "/stream?static=true&mediaSourceId=" + response.getMediaSourceId();

protected String preparePath(String rawPath) {
if (rawPath == null || rawPath.isEmpty() || rawPath.trim().isEmpty()) return "";
if (!rawPath.contains("://")) {
rawPath = rawPath.replace("\\\\",""); // remove UNC prefix if there
//prefix with smb
rawPath = "smb://"+rawPath;
}
String url = response.getMediaUrl();
//And request an activity to play it
startExternalActivity(url, response.getMediaSource().getContainer() != null ? response.getMediaSource().getContainer() : "*");
}

return rawPath.replaceAll("\\\\","/");
@Override
public void onError(Exception exception) {
Timber.e(exception, "Error getting playback stream info");
if (exception instanceof PlaybackException) {
PlaybackException ex = (PlaybackException) exception;
switch (ex.getErrorCode()) {
case NotAllowed:
Utils.showToast(ExternalPlayerActivity.this, getString(R.string.msg_playback_not_allowed));
break;
case NoCompatibleStream:
Utils.showToast(ExternalPlayerActivity.this, getString(R.string.msg_playback_incompatible));
break;
case RateLimitExceeded:
Utils.showToast(ExternalPlayerActivity.this, getString(R.string.msg_playback_restricted));
break;
}
}
}
});
}

protected void startExternalActivity(String path, String container) {
Expand All @@ -383,7 +357,7 @@ protected void startExternalActivity(String path, String container) {
}

Intent external = new Intent(Intent.ACTION_VIEW);
external.setDataAndType(Uri.parse(path), "video/"+container);
external.setDataAndType(Uri.parse(path), "video/" + container);

// build full title string
String full_title = "";
Expand All @@ -395,7 +369,7 @@ protected void startExternalActivity(String path, String container) {
full_title = item.getName();
}
if (item.getProductionYear() != null && item.getProductionYear() > 0) {
full_title += " - ("+ item.getProductionYear().toString() +")";
full_title += " - (" + item.getProductionYear().toString() + ")";
}

//Start player API params
Expand Down Expand Up @@ -424,7 +398,7 @@ protected void startExternalActivity(String path, String container) {

//End player API params

Timber.i("Starting external playback of path: %s and mime: video/%s at position/ms: %s",path,container,mPosition);
Timber.i("Starting external playback of path: %s and mime: video/%s at position/ms: %s", path, container, mPosition);

try {
mLastPlayerStart = System.currentTimeMillis();
Expand All @@ -443,14 +417,14 @@ protected void startExternalActivity(String path, String container) {
* External subtitles have higher priority than embedded subtitles.
*
* @param mediaStreamInfo Current media stream info used to get subtitle profiles.
* @param playerIntent Put player API params of sub urls.
* @param playerIntent Put player API params of sub urls.
*/
private void adaptExternalSubtitles(StreamInfo mediaStreamInfo, Intent playerIntent) {

List<SubtitleStreamInfo> externalSubs = mediaStreamInfo.getSubtitleProfiles(false,
apiClient.getValue().getApiUrl(), apiClient.getValue().getAccessToken()).stream()
.filter(stream -> stream.getDeliveryMethod() == SubtitleDeliveryMethod.External && stream.getUrl() != null)
.collect(Collectors.toList());
apiClient.getValue().getApiUrl(), apiClient.getValue().getAccessToken()).stream()
.filter(stream -> stream.getDeliveryMethod() == SubtitleDeliveryMethod.External && stream.getUrl() != null)
.collect(Collectors.toList());

Uri[] subUrls = externalSubs.stream().map(stream -> Uri.parse(stream.getUrl())).toArray(Uri[]::new);
String[] subNames = externalSubs.stream().map(SubtitleStreamInfo::getDisplayTitle).toArray(String[]::new);
Expand All @@ -461,10 +435,10 @@ private void adaptExternalSubtitles(StreamInfo mediaStreamInfo, Intent playerInt
Uri selectedSubUrl = null;
if (selectedSubStreamIndex != null) {
selectedSubUrl = externalSubs.stream()
.filter(stream -> stream.getIndex() == selectedSubStreamIndex)
.map(stream -> Uri.parse(stream.getUrl()))
.findFirst()
.orElse(null);
.filter(stream -> stream.getIndex() == selectedSubStreamIndex)
.map(stream -> Uri.parse(stream.getUrl()))
.findFirst()
.orElse(null);
}
if (selectedSubUrl == null && subUrls.length > 0) {
selectedSubUrl = subUrls[0];
Expand All @@ -475,7 +449,7 @@ private void adaptExternalSubtitles(StreamInfo mediaStreamInfo, Intent playerInt
playerIntent.putExtra(API_MX_SUBS_NAME, subNames);
playerIntent.putExtra(API_MX_SUBS_FILENAME, subLanguages);
if (selectedSubUrl != null) {
playerIntent.putExtra(API_MX_SUBS_ENABLE, new Uri[] {selectedSubUrl});
playerIntent.putExtra(API_MX_SUBS_ENABLE, new Uri[]{selectedSubUrl});
}

// VLC
Expand Down
22 changes: 0 additions & 22 deletions app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.jellyfin.androidtv.ui.preference.screen

import android.app.AlertDialog
import android.os.Build
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.constant.getQualityProfiles
Expand Down Expand Up @@ -103,27 +102,6 @@ class PlaybackPreferencesScreen : OptionsFragment() {
bind(userPreferences, UserPreferences.maxBitrate)
}

checkbox {
setTitle(R.string.pref_use_direct_path_title)
setContent(R.string.pref_use_direct_path_summary)
bind {
get { userPreferences[UserPreferences.externalVideoPlayerSendPath] }
set {
if (it) {
AlertDialog.Builder(activity)
.setTitle(R.string.lbl_warning)
.setMessage(R.string.msg_external_path)
.setPositiveButton(R.string.btn_got_it, null)
.show()
}

userPreferences[UserPreferences.externalVideoPlayerSendPath] = it
}
default { userPreferences.getDefaultValue(UserPreferences.externalVideoPlayerSendPath) }
}
depends { userPreferences[UserPreferences.videoPlayer] == PreferredVideoPlayer.EXTERNAL }
}

enum<RefreshRateSwitchingBehavior> {
setTitle(R.string.lbl_refresh_switching)
bind(userPreferences, UserPreferences.refreshRateSwitchingBehavior)
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@
<string name="lbl_playback_speed">Playback Speed</string>
<string name="lbl_quality_profile">Quality profile</string>
<string name="lbl_subtitle_track">Select subtitle track</string>
<string name="msg_external_path">This feature will only work if you have properly set up your library on the server with network paths or path substitution and the client you are using can directly access these locations over the network.</string>
<string name="btn_got_it">Got it</string>
<string name="lbl_clear_queue">Clear Queue</string>
<string name="lbl_play_next_up">Play Next Up</string>
Expand Down Expand Up @@ -240,8 +239,6 @@
<string name="lbl_next_episode">Next Episode</string>
<string name="lbl_album_name">Album name</string>
<string name="lbl_song_title">Song Title</string>
<string name="pref_use_direct_path_title">Pass Direct Path for external player</string>
<string name="pref_use_direct_path_summary">Pass the file system path instead of streaming URL</string>
<string name="lbl_tv_channel_status">%1$d of %2$d channels</string>
<string name="lbl_tv_filter_status"> for next %1$d hours</string>
<string name="lbl_news">News</string>
Expand Down

0 comments on commit aca0c45

Please sign in to comment.