mirror of
https://github.com/samsonjs/media.git
synced 2026-04-27 15:07:40 +00:00
Fix parameter names on overridden methods
The dokka javadoc generation tool complains when parameter names don't match between a method and its override. This change updates occurrences where there is currently a mismatch. PiperOrigin-RevId: 387367509
This commit is contained in:
parent
5bc1c4837f
commit
337d5aa9b6
6 changed files with 21 additions and 20 deletions
|
|
@ -1446,8 +1446,7 @@ public abstract class Timeline implements Bundleable {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Window getWindow(
|
public Window getWindow(int windowIndex, Window window, long defaultPositionProjectionUs) {
|
||||||
int windowIndex, Window window, long ignoredDefaultPositionProjectionUs) {
|
|
||||||
Window w = windows.get(windowIndex);
|
Window w = windows.get(windowIndex);
|
||||||
window.set(
|
window.set(
|
||||||
w.uid,
|
w.uid,
|
||||||
|
|
@ -1524,7 +1523,7 @@ public abstract class Timeline implements Bundleable {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Period getPeriod(int periodIndex, Period period, boolean ignoredSetIds) {
|
public Period getPeriod(int periodIndex, Period period, boolean setIds) {
|
||||||
Period p = periods.get(periodIndex);
|
Period p = periods.get(periodIndex);
|
||||||
period.set(
|
period.set(
|
||||||
p.id,
|
p.id,
|
||||||
|
|
|
||||||
|
|
@ -809,12 +809,13 @@ public class AnalyticsCollector
|
||||||
// BandwidthMeter.EventListener implementation.
|
// BandwidthMeter.EventListener implementation.
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final void onBandwidthSample(int elapsedMs, long bytesTransferred, long bitrate) {
|
public final void onBandwidthSample(int elapsedMs, long bytesTransferred, long bitrateEstimate) {
|
||||||
EventTime eventTime = generateLoadingMediaPeriodEventTime();
|
EventTime eventTime = generateLoadingMediaPeriodEventTime();
|
||||||
sendEvent(
|
sendEvent(
|
||||||
eventTime,
|
eventTime,
|
||||||
AnalyticsListener.EVENT_BANDWIDTH_ESTIMATE,
|
AnalyticsListener.EVENT_BANDWIDTH_ESTIMATE,
|
||||||
listener -> listener.onBandwidthEstimate(eventTime, elapsedMs, bytesTransferred, bitrate));
|
listener ->
|
||||||
|
listener.onBandwidthEstimate(eventTime, elapsedMs, bytesTransferred, bitrateEstimate));
|
||||||
}
|
}
|
||||||
|
|
||||||
// DrmSessionEventListener implementation.
|
// DrmSessionEventListener implementation.
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSourceInfoRefreshed(MediaSource mediaSource, Timeline timeline) {
|
public void onSourceInfoRefreshed(MediaSource source, Timeline timeline) {
|
||||||
this.contentTimeline = timeline;
|
this.contentTimeline = timeline;
|
||||||
if (AdPlaybackState.NONE.equals(adPlaybackState)) {
|
if (AdPlaybackState.NONE.equals(adPlaybackState)) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -209,7 +209,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long positionUs) {
|
public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator, long startPositionUs) {
|
||||||
SharedMediaPeriod sharedPeriod;
|
SharedMediaPeriod sharedPeriod;
|
||||||
if (lastUsedMediaPeriod != null) {
|
if (lastUsedMediaPeriod != null) {
|
||||||
sharedPeriod = lastUsedMediaPeriod;
|
sharedPeriod = lastUsedMediaPeriod;
|
||||||
|
|
@ -219,16 +219,17 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource
|
||||||
@Nullable
|
@Nullable
|
||||||
SharedMediaPeriod lastExistingPeriod =
|
SharedMediaPeriod lastExistingPeriod =
|
||||||
Iterables.getLast(mediaPeriods.get(id.windowSequenceNumber), /* defaultValue= */ null);
|
Iterables.getLast(mediaPeriods.get(id.windowSequenceNumber), /* defaultValue= */ null);
|
||||||
if (lastExistingPeriod != null && lastExistingPeriod.canReuseMediaPeriod(id, positionUs)) {
|
if (lastExistingPeriod != null
|
||||||
|
&& lastExistingPeriod.canReuseMediaPeriod(id, startPositionUs)) {
|
||||||
sharedPeriod = lastExistingPeriod;
|
sharedPeriod = lastExistingPeriod;
|
||||||
} else {
|
} else {
|
||||||
long startPositionUs = getStreamPositionUs(positionUs, id, adPlaybackState);
|
long streamPositionUs = getStreamPositionUs(startPositionUs, id, adPlaybackState);
|
||||||
sharedPeriod =
|
sharedPeriod =
|
||||||
new SharedMediaPeriod(
|
new SharedMediaPeriod(
|
||||||
mediaSource.createPeriod(
|
mediaSource.createPeriod(
|
||||||
new MediaPeriodId(id.periodUid, id.windowSequenceNumber),
|
new MediaPeriodId(id.periodUid, id.windowSequenceNumber),
|
||||||
allocator,
|
allocator,
|
||||||
startPositionUs),
|
streamPositionUs),
|
||||||
adPlaybackState);
|
adPlaybackState);
|
||||||
mediaPeriods.put(id.windowSequenceNumber, sharedPeriod);
|
mediaPeriods.put(id.windowSequenceNumber, sharedPeriod);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,18 +73,18 @@ public final class AesCipherDataSink implements DataSink {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(byte[] data, int offset, int length) throws IOException {
|
public void write(byte[] buffer, int offset, int length) throws IOException {
|
||||||
if (scratch == null) {
|
if (scratch == null) {
|
||||||
// In-place mode. Writes over the input data.
|
// In-place mode. Writes over the input data.
|
||||||
castNonNull(cipher).updateInPlace(data, offset, length);
|
castNonNull(cipher).updateInPlace(buffer, offset, length);
|
||||||
wrappedDataSink.write(data, offset, length);
|
wrappedDataSink.write(buffer, offset, length);
|
||||||
} else {
|
} else {
|
||||||
// Use scratch space. The original data remains intact.
|
// Use scratch space. The original data remains intact.
|
||||||
int bytesProcessed = 0;
|
int bytesProcessed = 0;
|
||||||
while (bytesProcessed < length) {
|
while (bytesProcessed < length) {
|
||||||
int bytesToProcess = min(length - bytesProcessed, scratch.length);
|
int bytesToProcess = min(length - bytesProcessed, scratch.length);
|
||||||
castNonNull(cipher)
|
castNonNull(cipher)
|
||||||
.update(data, offset + bytesProcessed, bytesToProcess, scratch, /* outOffset= */ 0);
|
.update(buffer, offset + bytesProcessed, bytesToProcess, scratch, /* outOffset= */ 0);
|
||||||
wrappedDataSink.write(scratch, /* offset= */ 0, bytesToProcess);
|
wrappedDataSink.write(scratch, /* offset= */ 0, bytesToProcess);
|
||||||
bytesProcessed += bytesToProcess;
|
bytesProcessed += bytesToProcess;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1249,10 +1249,10 @@ public final class DashMediaSource extends BaseMediaSource {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Period getPeriod(int periodIndex, Period period, boolean setIdentifiers) {
|
public Period getPeriod(int periodIndex, Period period, boolean setIds) {
|
||||||
Assertions.checkIndex(periodIndex, 0, getPeriodCount());
|
Assertions.checkIndex(periodIndex, 0, getPeriodCount());
|
||||||
Object id = setIdentifiers ? manifest.getPeriod(periodIndex).id : null;
|
Object id = setIds ? manifest.getPeriod(periodIndex).id : null;
|
||||||
Object uid = setIdentifiers ? (firstPeriodId + periodIndex) : null;
|
Object uid = setIds ? (firstPeriodId + periodIndex) : null;
|
||||||
return period.set(
|
return period.set(
|
||||||
id,
|
id,
|
||||||
uid,
|
uid,
|
||||||
|
|
|
||||||
|
|
@ -471,9 +471,9 @@ public final class SsMediaSource extends BaseMediaSource
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void releasePeriod(MediaPeriod period) {
|
public void releasePeriod(MediaPeriod mediaPeriod) {
|
||||||
((SsMediaPeriod) period).release();
|
((SsMediaPeriod) mediaPeriod).release();
|
||||||
mediaPeriods.remove(period);
|
mediaPeriods.remove(mediaPeriod);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue