loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce tunneling checkbox in test app

Browse Source 
It makes observing differences without and with tunneling
much faster than recompiling.

PiperOrigin-RevId: 275216567
This commit is contained in:
krocard 2019-10-17 10:41:04 +01:00 committed by Oliver Woodman
parent 0d5b3c0fa4
commit 9af8511aef
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View File

@ -114,6 +114,7 @@ public class PlayerActivity extends AppCompatActivity
public static final String DRM_KEY_REQUEST_PROPERTIES_EXTRA = "drm_key_request_properties"; public static final String DRM_KEY_REQUEST_PROPERTIES_EXTRA = "drm_key_request_properties";
public static final String DRM_MULTI_SESSION_EXTRA = "drm_multi_session"; public static final String DRM_MULTI_SESSION_EXTRA = "drm_multi_session";
public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders"; public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders";
public static final String TUNNELING = "tunneling";
public static final String AD_TAG_URI_EXTRA = "ad_tag_uri"; public static final String AD_TAG_URI_EXTRA = "ad_tag_uri";
// For backwards compatibility only. // For backwards compatibility only.
public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid"; public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
@ -201,7 +202,13 @@ public class PlayerActivity extends AppCompatActivity
startWindow = savedInstanceState.getInt(KEY_WINDOW); startWindow = savedInstanceState.getInt(KEY_WINDOW);
startPosition = savedInstanceState.getLong(KEY_POSITION); startPosition = savedInstanceState.getLong(KEY_POSITION);
} else { } else {
trackSelectorParameters = DefaultTrackSelector.Parameters.getDefaults(/* context= */ this); DefaultTrackSelector.ParametersBuilder builder =
new DefaultTrackSelector.ParametersBuilder(/* context= */ this);
boolean tunneling = intent.getBooleanExtra(TUNNELING, false);
if (tunneling) {
builder.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(/* context= */ this));
}
trackSelectorParameters = builder.build();
clearStartPosition(); clearStartPosition();
} }
} }

3
demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
View File

@ -68,6 +68,7 @@ public class SampleChooserActivity extends AppCompatActivity
private SampleAdapter sampleAdapter; private SampleAdapter sampleAdapter;
private MenuItem preferExtensionDecodersMenuItem; private MenuItem preferExtensionDecodersMenuItem;
private MenuItem randomAbrMenuItem; private MenuItem randomAbrMenuItem;
private MenuItem tunnelingMenuItem;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -125,6 +126,7 @@ public class SampleChooserActivity extends AppCompatActivity
preferExtensionDecodersMenuItem = menu.findItem(R.id.prefer_extension_decoders); preferExtensionDecodersMenuItem = menu.findItem(R.id.prefer_extension_decoders);
preferExtensionDecodersMenuItem.setVisible(useExtensionRenderers); preferExtensionDecodersMenuItem.setVisible(useExtensionRenderers);
randomAbrMenuItem = menu.findItem(R.id.random_abr); randomAbrMenuItem = menu.findItem(R.id.random_abr);
tunnelingMenuItem = menu.findItem(R.id.tunneling);
return true; return true;
} }
@ -173,6 +175,7 @@ public class SampleChooserActivity extends AppCompatActivity
? PlayerActivity.ABR_ALGORITHM_RANDOM ? PlayerActivity.ABR_ALGORITHM_RANDOM
: PlayerActivity.ABR_ALGORITHM_DEFAULT; : PlayerActivity.ABR_ALGORITHM_DEFAULT;
intent.putExtra(PlayerActivity.ABR_ALGORITHM_EXTRA, abrAlgorithm); intent.putExtra(PlayerActivity.ABR_ALGORITHM_EXTRA, abrAlgorithm);
intent.putExtra(PlayerActivity.TUNNELING, isNonNullAndChecked(tunnelingMenuItem));
sample.addToIntent(intent); sample.addToIntent(intent);
startActivity(intent); startActivity(intent);
return true; return true;

4
demos/main/src/main/res/menu/sample_chooser_menu.xml
View File

@ -23,4 +23,8 @@
android:title="@string/random_abr" android:title="@string/random_abr"
android:checkable="true" android:checkable="true"
app:showAsAction="never"/> app:showAsAction="never"/>
<item android:id="@+id/tunneling"
android:title="@string/tunneling"
android:checkable="true"
app:showAsAction="never"/>
</menu> </menu>

2
demos/main/src/main/res/values/strings.xml
View File

@ -71,4 +71,6 @@
<string name="random_abr">Enable random ABR</string> <string name="random_abr">Enable random ABR</string>
<string name="tunneling">Request multimedia tunneling</string>
</resources> </resources>