loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DeprecationMismatch errors

Browse Source 
PiperOrigin-RevId: 258590215
This commit is contained in:
andrewlewis 2019-07-17 18:07:28 +01:00 committed by Oliver Woodman
parent 049f3cf5cd
commit bee35ed9d7
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/Format.java
View File

@ -179,6 +179,10 @@ public final class Format implements Parcelable {
// Video. // Video.
/**
* @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String, int,
* int, int, float, List, int, int)} instead.
*/
@Deprecated @Deprecated
public static Format createVideoContainerFormat( public static Format createVideoContainerFormat(
@Nullable String id, @Nullable String id,
@ -358,6 +362,10 @@ public final class Format implements Parcelable {
// Audio. // Audio.
/**
* @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String, int,
* int, int, List, int, int, String)} instead.
*/
@Deprecated @Deprecated
public static Format createAudioContainerFormat( public static Format createAudioContainerFormat(
@Nullable String id, @Nullable String id,
@ -763,6 +771,10 @@ public final class Format implements Parcelable {
// Generic. // Generic.
/**
* @deprecated Use {@link #createContainerFormat(String, String, String, String, String, int, int,
* int, String)} instead.
*/
@Deprecated @Deprecated
public static Format createContainerFormat( public static Format createContainerFormat(
@Nullable String id, @Nullable String id,

5
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View File

@ -58,7 +58,7 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
} }
/** Use {@link ProgressiveMediaSource.Factory} instead. */ /** @deprecated Use {@link ProgressiveMediaSource.Factory} instead. */
@Deprecated @Deprecated
public static final class Factory implements MediaSourceFactory { public static final class Factory implements MediaSourceFactory {
@ -221,6 +221,9 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
} }
} }
/**
* @deprecated Use {@link ProgressiveMediaSource#DEFAULT_LOADING_CHECK_INTERVAL_BYTES} instead.
*/
@Deprecated @Deprecated
public static final int DEFAULT_LOADING_CHECK_INTERVAL_BYTES = public static final int DEFAULT_LOADING_CHECK_INTERVAL_BYTES =
ProgressiveMediaSource.DEFAULT_LOADING_CHECK_INTERVAL_BYTES; ProgressiveMediaSource.DEFAULT_LOADING_CHECK_INTERVAL_BYTES;

3
library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
View File

@ -183,18 +183,21 @@ public interface HttpDataSource extends DataSource {
return defaultRequestProperties; return defaultRequestProperties;
} }
/** @deprecated Use {@link #getDefaultRequestProperties} instead. */
@Deprecated @Deprecated
@Override @Override
public final void setDefaultRequestProperty(String name, String value) { public final void setDefaultRequestProperty(String name, String value) {
defaultRequestProperties.set(name, value); defaultRequestProperties.set(name, value);
} }
/** @deprecated Use {@link #getDefaultRequestProperties} instead. */
@Deprecated @Deprecated
@Override @Override
public final void clearDefaultRequestProperty(String name) { public final void clearDefaultRequestProperty(String name) {
defaultRequestProperties.remove(name); defaultRequestProperties.remove(name);
} }
/** @deprecated Use {@link #getDefaultRequestProperties} instead. */
@Deprecated @Deprecated
@Override @Override
public final void clearAllDefaultRequestProperties() { public final void clearAllDefaultRequestProperties() {