Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
bee35ed9
authored
Jul 17, 2019
by
andrewlewis
Committed by
Oliver Woodman
Jul 18, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix DeprecationMismatch errors
PiperOrigin-RevId: 258590215
parent
049f3cf5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletions
library/core/src/main/java/com/google/android/exoplayer2/Format.java
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
library/core/src/main/java/com/google/android/exoplayer2/Format.java
View file @
bee35ed9
...
@@ -179,6 +179,10 @@ public final class Format implements Parcelable {
...
@@ -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 {
...
@@ -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 {
...
@@ -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
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View file @
bee35ed9
...
@@ -58,7 +58,7 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
...
@@ -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> {
...
@@ -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
;
...
...
library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
View file @
bee35ed9
...
@@ -183,18 +183,21 @@ public interface HttpDataSource extends DataSource {
...
@@ -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
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment