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
b6317837
authored
Feb 14, 2022
by
olly
Committed by
Ian Baker
Feb 17, 2022
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Rewrite AnalyticsCollector to use new track APIs
PiperOrigin-RevId: 428455848
parent
748e2a5f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
25 deletions
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java
library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
View file @
b6317837
...
...
@@ -54,10 +54,8 @@ import com.google.android.exoplayer2.metadata.MetadataOutput;
import
com.google.android.exoplayer2.source.LoadEventInfo
;
import
com.google.android.exoplayer2.source.MediaLoadData
;
import
com.google.android.exoplayer2.source.MediaSource.MediaPeriodId
;
import
com.google.android.exoplayer2.source.TrackGroupArray
;
import
com.google.android.exoplayer2.text.Cue
;
import
com.google.android.exoplayer2.trackselection.TrackSelection
;
import
com.google.android.exoplayer2.trackselection.TrackSelectionArray
;
import
com.google.android.exoplayer2.trackselection.TrackSelectionParameters
;
import
com.google.android.exoplayer2.util.FlagSet
;
import
com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer
;
...
...
@@ -238,10 +236,7 @@ public interface AnalyticsListener {
* {@link Player#getCurrentMediaItem()} changed or the player started repeating the current item.
*/
int
EVENT_MEDIA_ITEM_TRANSITION
=
Player
.
EVENT_MEDIA_ITEM_TRANSITION
;
/**
* {@link Player#getCurrentTracksInfo()}, {@link Player#getCurrentTrackGroups()} or {@link
* Player#getCurrentTrackSelections()} changed.
*/
/** {@link Player#getCurrentTracksInfo()} changed. */
int
EVENT_TRACKS_CHANGED
=
Player
.
EVENT_TRACKS_CHANGED
;
/** {@link Player#isLoading()} ()} changed. */
int
EVENT_IS_LOADING_CHANGED
=
Player
.
EVENT_IS_LOADING_CHANGED
;
...
...
@@ -707,18 +702,6 @@ public interface AnalyticsListener {
default
void
onPlayerErrorChanged
(
EventTime
eventTime
,
@Nullable
PlaybackException
error
)
{}
/**
* Called when the available or selected tracks for the renderers changed.
*
* @param eventTime The event time.
* @param trackGroups The available tracks. May be empty.
* @param trackSelections The track selections for each renderer. May contain null elements.
* @deprecated Use {@link #onTracksInfoChanged}.
*/
@Deprecated
default
void
onTracksChanged
(
EventTime
eventTime
,
TrackGroupArray
trackGroups
,
TrackSelectionArray
trackSelections
)
{}
/**
* Called when the available or selected tracks change.
*
* @param eventTime The event time.
...
...
library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java
View file @
b6317837
...
...
@@ -482,15 +482,11 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector {
listener
->
listener
.
onMediaItemTransition
(
eventTime
,
mediaItem
,
reason
));
}
@SuppressWarnings
(
"deprecation"
)
// Implementing deprecated method.
@Override
@SuppressWarnings
(
"deprecation"
)
// Implementing and calling deprecate listener method
public
final
void
onTracksChanged
(
TrackGroupArray
trackGroups
,
TrackSelectionArray
trackSelections
)
{
EventTime
eventTime
=
generateCurrentPlayerMediaPeriodEventTime
();
sendEvent
(
eventTime
,
AnalyticsListener
.
EVENT_TRACKS_CHANGED
,
listener
->
listener
.
onTracksChanged
(
eventTime
,
trackGroups
,
trackSelections
));
// Do nothing. Handled by non-deprecated onTracksInfoChanged.
}
@Override
...
...
library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java
View file @
b6317837
...
...
@@ -1721,7 +1721,7 @@ public final class DefaultAnalyticsCollectorTest {
ArgumentCaptor
<
AnalyticsListener
.
EventTime
>
individualTracksChangedEventTimes
=
ArgumentCaptor
.
forClass
(
AnalyticsListener
.
EventTime
.
class
);
verify
(
listener
,
atLeastOnce
())
.
onTracks
Changed
(
individualTracksChangedEventTimes
.
capture
(),
any
(),
any
());
.
onTracks
InfoChanged
(
individualTracksChangedEventTimes
.
capture
(),
any
());
ArgumentCaptor
<
AnalyticsListener
.
EventTime
>
individualPlayWhenReadyChangedEventTimes
=
ArgumentCaptor
.
forClass
(
AnalyticsListener
.
EventTime
.
class
);
verify
(
listener
,
atLeastOnce
())
...
...
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