sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-29 10:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect Javadoc

Browse source 
PiperOrigin-RevId: 281976465
This commit is contained in:
olly 2019-11-22 16:46:39 +00:00 committed by Oliver Woodman
parent abe3c8ce1d
commit f630ed1ab5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
View file

@ -86,8 +86,8 @@ public interface DrmSessionManager<T extends ExoMediaCrypto> {
* DrmSession#release()} to decrement the reference count.
*
* <p>Placeholder {@link DrmSession DrmSessions} may be used to configure secure decoders for
* playback of clear samples, which reduces the costs of transitioning between clear and encrypted
* content periods.
* playback of clear content periods. This can reduce the cost of transitioning between clear and
* encrypted content periods.
*
* @param playbackLooper The looper associated with the media playback thread.
* @param trackType The type of the track to acquire a placeholder session for. Must be one of the

8
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
View file

@ -332,13 +332,13 @@ public class SampleQueue implements TrackOutput {
/**
* Attempts to read from the queue.
*
* <p>{@link Format Formats} read from the this method may be associated to a {@link DrmSession}
* <p>{@link Format Formats} read from this method may be associated to a {@link DrmSession}
* through {@link FormatHolder#drmSession}, which is populated in two scenarios:
*
* <ul>
* <li>The sample has a {@link Format} with a non-null {@link Format#drmInitData}.
* <li>The {@link DrmSessionManager} is configured to use secure decoders for clear samples. See
* {@link DrmSessionManager#FLAG_PLAY_CLEAR_SAMPLES_WITHOUT_KEYS}.
* <li>The {@link Format} has a non-null {@link Format#drmInitData}.
* <li>The {@link DrmSessionManager} provides placeholder sessions for this queue's track type.
* See {@link DrmSessionManager#acquirePlaceholderSession(Looper, int)}.
* </ul>
*
* @param formatHolder A {@link FormatHolder} to populate in the case of reading a format.