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
7e070683
authored
Nov 02, 2019
by
olly
Committed by
Oliver Woodman
Nov 05, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Expose getMetrics() in ExoV1 and ExoV2 FrameworkMediaDrm classes.
PiperOrigin-RevId: 278054214
parent
922991da
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
0 deletions
library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java
library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java
View file @
7e070683
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
com
.
google
.
android
.
exoplayer2
.
drm
;
package
com
.
google
.
android
.
exoplayer2
.
drm
;
import
android.media.MediaDrmException
;
import
android.media.MediaDrmException
;
import
android.os.PersistableBundle
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.RequiresApi
;
import
androidx.annotation.RequiresApi
;
import
com.google.android.exoplayer2.util.Util
;
import
com.google.android.exoplayer2.util.Util
;
...
@@ -105,6 +106,12 @@ public final class DummyExoMediaDrm<T extends ExoMediaCrypto> implements ExoMedi
...
@@ -105,6 +106,12 @@ public final class DummyExoMediaDrm<T extends ExoMediaCrypto> implements ExoMedi
}
}
@Override
@Override
@Nullable
public
PersistableBundle
getMetrics
()
{
return
null
;
}
@Override
public
String
getPropertyString
(
String
propertyName
)
{
public
String
getPropertyString
(
String
propertyName
)
{
return
""
;
return
""
;
}
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
View file @
7e070683
...
@@ -21,6 +21,7 @@ import android.media.MediaDrm;
...
@@ -21,6 +21,7 @@ import android.media.MediaDrm;
import
android.media.MediaDrmException
;
import
android.media.MediaDrmException
;
import
android.media.NotProvisionedException
;
import
android.media.NotProvisionedException
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.os.PersistableBundle
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.drm.DrmInitData.SchemeData
;
import
com.google.android.exoplayer2.drm.DrmInitData.SchemeData
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -288,6 +289,14 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
...
@@ -288,6 +289,14 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
void
restoreKeys
(
byte
[]
sessionId
,
byte
[]
keySetId
);
void
restoreKeys
(
byte
[]
sessionId
,
byte
[]
keySetId
);
/**
/**
* Returns drm metrics. May be null if unavailable.
*
* @see MediaDrm#getMetrics()
*/
@Nullable
PersistableBundle
getMetrics
();
/**
* @see MediaDrm#getPropertyString(String)
* @see MediaDrm#getPropertyString(String)
*/
*/
String
getPropertyString
(
String
propertyName
);
String
getPropertyString
(
String
propertyName
);
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
View file @
7e070683
...
@@ -23,6 +23,7 @@ import android.media.MediaDrm;
...
@@ -23,6 +23,7 @@ import android.media.MediaDrm;
import
android.media.MediaDrmException
;
import
android.media.MediaDrmException
;
import
android.media.NotProvisionedException
;
import
android.media.NotProvisionedException
;
import
android.media.UnsupportedSchemeException
;
import
android.media.UnsupportedSchemeException
;
import
android.os.PersistableBundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.RequiresApi
;
import
androidx.annotation.RequiresApi
;
...
@@ -226,6 +227,16 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
...
@@ -226,6 +227,16 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
}
}
@Override
@Override
@Nullable
@TargetApi
(
28
)
public
PersistableBundle
getMetrics
()
{
if
(
Util
.
SDK_INT
<
28
)
{
return
null
;
}
return
mediaDrm
.
getMetrics
();
}
@Override
public
String
getPropertyString
(
String
propertyName
)
{
public
String
getPropertyString
(
String
propertyName
)
{
return
mediaDrm
.
getPropertyString
(
propertyName
);
return
mediaDrm
.
getPropertyString
(
propertyName
);
}
}
...
...
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