mirror of
https://github.com/samsonjs/media.git
synced 2026-04-27 15:07:40 +00:00
Remove Media Tunneling support in demo app
- Removed Tunneling option from popup menu - Removed intent parameter regarding tunneling - Removed string definition regarding tunneling PiperOrigin-RevId: 322123578
This commit is contained in:
parent
b7b3f4ea45
commit
72728ba054
5 changed files with 0 additions and 17 deletions
|
|
@ -93,7 +93,6 @@ public class IntentUtil {
|
||||||
public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
|
public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
|
||||||
|
|
||||||
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_EXTRA = "tunneling";
|
|
||||||
|
|
||||||
/** Creates a list of {@link MediaItem media items} from an {@link Intent}. */
|
/** Creates a list of {@link MediaItem media items} from an {@link Intent}. */
|
||||||
public static List<MediaItem> createMediaItemsFromIntent(
|
public static List<MediaItem> createMediaItemsFromIntent(
|
||||||
|
|
|
||||||
|
|
@ -155,10 +155,6 @@ public class PlayerActivity extends AppCompatActivity
|
||||||
} else {
|
} else {
|
||||||
DefaultTrackSelector.ParametersBuilder builder =
|
DefaultTrackSelector.ParametersBuilder builder =
|
||||||
new DefaultTrackSelector.ParametersBuilder(/* context= */ this);
|
new DefaultTrackSelector.ParametersBuilder(/* context= */ this);
|
||||||
boolean tunneling = intent.getBooleanExtra(IntentUtil.TUNNELING_EXTRA, false);
|
|
||||||
if (Util.SDK_INT >= 21 && tunneling) {
|
|
||||||
builder.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(/* context= */ this));
|
|
||||||
}
|
|
||||||
trackSelectorParameters = builder.build();
|
trackSelectorParameters = builder.build();
|
||||||
clearStartPosition();
|
clearStartPosition();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,6 @@ 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;
|
|
||||||
private ExpandableListView sampleListView;
|
private ExpandableListView sampleListView;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -138,10 +137,6 @@ 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);
|
|
||||||
if (Util.SDK_INT < 21) {
|
|
||||||
tunnelingMenuItem.setEnabled(false);
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -240,7 +235,6 @@ public class SampleChooserActivity extends AppCompatActivity
|
||||||
? IntentUtil.ABR_ALGORITHM_RANDOM
|
? IntentUtil.ABR_ALGORITHM_RANDOM
|
||||||
: IntentUtil.ABR_ALGORITHM_DEFAULT;
|
: IntentUtil.ABR_ALGORITHM_DEFAULT;
|
||||||
intent.putExtra(IntentUtil.ABR_ALGORITHM_EXTRA, abrAlgorithm);
|
intent.putExtra(IntentUtil.ABR_ALGORITHM_EXTRA, abrAlgorithm);
|
||||||
intent.putExtra(IntentUtil.TUNNELING_EXTRA, isNonNullAndChecked(tunnelingMenuItem));
|
|
||||||
IntentUtil.addToIntent(playlistHolder.mediaItems, intent);
|
IntentUtil.addToIntent(playlistHolder.mediaItems, intent);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,4 @@
|
||||||
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>
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,4 @@
|
||||||
|
|
||||||
<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>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue