Skip to content

Bump Exoplayer #3515

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
abelgardep merged 10 commits into from
Apr 25, 2022
Merged

Bump Exoplayer #3515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2809537
Bump Exoplayer
hannesa2 Jan 24, 2022
6448777
update of exoplayer things
Apr 18, 2022
e3088ba
ExoPlayer updated (PlayerView and SimpleExoPlayer deprecated)
Apr 19, 2022
fe3094c
ExoPlayer updated (PlayerView and SimpleExoPlayer deprecated)
Apr 19, 2022
88da9e1
listener and ExoPlayer instead of SimpleExoPlayer
Apr 19, 2022
5ae1d59
exoplayer methods below the listener instead inside
Apr 20, 2022
d88642a
useless methods deleted
Apr 20, 2022
5869b08
removed unused imports
Apr 21, 2022
d1a8063
exoplayer 15 to check bitrise error
Apr 21, 2022
dc6b3ae
exoplayer v16 because v17 fails in bitrise
Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion owncloudApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation "androidx.annotation:annotation:1.3.0"
implementation 'com.google.android.material:material:1.4.0'
implementation 'com.jakewharton:disklrucache:2.0.2'
implementation 'com.google.android.exoplayer:exoplayer:2.15.0'
implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
implementation 'com.github.aritraroy.PatternLockView:patternlockview:a90b0d4bf0'
implementation "androidx.appcompat:appcompat:$appCompat"
implementation 'com.getbase:floatingactionbutton:1.10.1'
Expand Down
19 changes: 8 additions & 11 deletions owncloudApp/src/main/java/com/owncloud/android/ui/preview/PrepareVideoPlayerAsyncTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import android.content.Context;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Handler;
import android.util.Base64;

import com.google.android.exoplayer2.MediaItem;
Expand All @@ -35,7 +34,7 @@
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.owncloud.android.MainApp;
import com.owncloud.android.datamodel.OCFile;
Expand All @@ -55,15 +54,14 @@
*/
public class PrepareVideoPlayerAsyncTask extends AsyncTask<Object, Void, MediaSource> {

private Context mContext;
private final Context mContext;
private final WeakReference<OnPrepareVideoPlayerTaskListener> mListener;
private OCFile mFile;
private Account mAccount;
private final OCFile mFile;
private final Account mAccount;

private static final DefaultBandwidthMeter BANDWIDTH_METER = new DefaultBandwidthMeter();

public PrepareVideoPlayerAsyncTask(Context context, OnPrepareVideoPlayerTaskListener listener,
OCFile file, Account account) {
public PrepareVideoPlayerAsyncTask(Context context, OnPrepareVideoPlayerTaskListener listener, OCFile file, Account account) {
mContext = context;
mListener = new WeakReference<>(listener);
mFile = file;
Expand Down Expand Up @@ -129,18 +127,17 @@ private HttpDataSource.Factory buildHttpDataSourceFactory(

if (file.isDown()) {

return new DefaultHttpDataSourceFactory(MainApp.Companion.getUserAgent(), bandwidthMeter);
return new DefaultHttpDataSource.Factory();

} else {

try {
OwnCloudCredentials credentials = AccountUtils.
getCredentialsForAccount(MainApp.Companion.getAppContext(), account);
OwnCloudCredentials credentials = AccountUtils.getCredentialsForAccount(MainApp.Companion.getAppContext(), account);

String login = credentials.getUsername();
String password = credentials.getAuthToken();

Map<String, String> params = new HashMap<String, String>(1);
Map<String, String> params = new HashMap<>(1);

if (credentials instanceof OwnCloudBasicCredentials) { // Basic auth
String cred = login + ":" + password;
Expand Down
9 changes: 5 additions & 4 deletions owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.TrackGroupArray;
Expand All @@ -46,9 +47,9 @@
import timber.log.Timber;

/**
* An activity that plays media using {@link SimpleExoPlayer}.
* An activity that plays media using {@link ExoPlayer}.
*/
public class PreviewVideoActivity extends FileActivity implements ExoPlayer.EventListener,
public class PreviewVideoActivity extends FileActivity implements Player.Listener,
PrepareVideoPlayerAsyncTask.OnPrepareVideoPlayerTaskListener {

/**
Expand All @@ -64,7 +65,7 @@ public class PreviewVideoActivity extends FileActivity implements ExoPlayer.Even
private PlayerView exoPlayerView;

private boolean mExoPlayerBooted = false;
private SimpleExoPlayer player;
private ExoPlayer player;
private DefaultTrackSelector trackSelector;

private boolean mAutoplay; // when 'true', the playback starts immediately with the activity
Expand Down Expand Up @@ -151,7 +152,7 @@ private void preparePlayer() {
// Create a default TrackSelector
AdaptiveTrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory();
trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
player = new SimpleExoPlayer.Builder(this).setTrackSelector(trackSelector).setLoadControl(new DefaultLoadControl()).build();
player = new ExoPlayer.Builder(this).setTrackSelector(trackSelector).setLoadControl(new DefaultLoadControl()).build();
player.addListener(this);
exoPlayerView.setPlayer(player);
// Prepare video player asynchronously
Expand Down
11 changes: 4 additions & 7 deletions owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
Expand All @@ -67,7 +66,7 @@
* produce an {@link IllegalStateException}.
*/
public class PreviewVideoFragment extends FileFragment implements View.OnClickListener,
ExoPlayer.EventListener, PrepareVideoPlayerAsyncTask.OnPrepareVideoPlayerTaskListener {
Player.Listener, PrepareVideoPlayerAsyncTask.OnPrepareVideoPlayerTaskListener {

public static final String EXTRA_FILE = "FILE";
public static final String EXTRA_ACCOUNT = "ACCOUNT";
Expand All @@ -88,7 +87,7 @@ public class PreviewVideoFragment extends FileFragment implements View.OnClickLi

private PlayerView exoPlayerView;

private SimpleExoPlayer player;
private ExoPlayer player;
private DefaultTrackSelector trackSelector;

private ImageButton fullScreenButton;
Expand All @@ -97,8 +96,6 @@ public class PreviewVideoFragment extends FileFragment implements View.OnClickLi
private boolean mAutoplay;
private long mPlaybackPosition;

private static final DefaultBandwidthMeter BANDWIDTH_METER = new DefaultBandwidthMeter();

/**
* Public factory method to create new PreviewVideoFragment instances.
*
Expand Down Expand Up @@ -401,7 +398,7 @@ private void preparePlayer() {
// Video streaming is only supported at Jelly Bean or higher Android versions (>= API 16)

// Create the player
player = new SimpleExoPlayer.Builder(requireContext()).setTrackSelector(trackSelector).setLoadControl(new DefaultLoadControl()).build();
player = new ExoPlayer.Builder(requireContext()).setTrackSelector(trackSelector).setLoadControl(new DefaultLoadControl()).build();

player.addListener(this);

Expand Down