Commit 895ac660 by olly Committed by Oliver Woodman

Default playClearSamplesWithoutKeys consistently to false

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=193942368
parent ddd603a1
...@@ -74,7 +74,12 @@ public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer { ...@@ -74,7 +74,12 @@ public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer {
*/ */
public FfmpegAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener, public FfmpegAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
AudioSink audioSink, boolean enableFloatOutput) { AudioSink audioSink, boolean enableFloatOutput) {
super(eventHandler, eventListener, null, false, audioSink); super(
eventHandler,
eventListener,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false,
audioSink);
this.enableFloatOutput = enableFloatOutput; this.enableFloatOutput = enableFloatOutput;
} }
......
...@@ -169,8 +169,15 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -169,8 +169,15 @@ public class LibvpxVideoRenderer extends BaseRenderer {
public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs, public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs,
Handler eventHandler, VideoRendererEventListener eventListener, Handler eventHandler, VideoRendererEventListener eventListener,
int maxDroppedFramesToNotify) { int maxDroppedFramesToNotify) {
this(scaleToFit, allowedJoiningTimeMs, eventHandler, eventListener, maxDroppedFramesToNotify, this(
null, false, false); scaleToFit,
allowedJoiningTimeMs,
eventHandler,
eventListener,
maxDroppedFramesToNotify,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false,
/* disableLoopFilter= */ false);
} }
/** /**
......
...@@ -199,9 +199,16 @@ public class DefaultRenderersFactory implements RenderersFactory { ...@@ -199,9 +199,16 @@ public class DefaultRenderersFactory implements RenderersFactory {
long allowedVideoJoiningTimeMs, Handler eventHandler, long allowedVideoJoiningTimeMs, Handler eventHandler,
VideoRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode, VideoRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode,
ArrayList<Renderer> out) { ArrayList<Renderer> out) {
out.add(new MediaCodecVideoRenderer(context, MediaCodecSelector.DEFAULT, out.add(
allowedVideoJoiningTimeMs, drmSessionManager, false, eventHandler, eventListener, new MediaCodecVideoRenderer(
MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY)); context,
MediaCodecSelector.DEFAULT,
allowedVideoJoiningTimeMs,
drmSessionManager,
/* playClearSamplesWithoutKeys= */ false,
eventHandler,
eventListener,
MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
if (extensionRendererMode == EXTENSION_RENDERER_MODE_OFF) { if (extensionRendererMode == EXTENSION_RENDERER_MODE_OFF) {
return; return;
...@@ -259,8 +266,15 @@ public class DefaultRenderersFactory implements RenderersFactory { ...@@ -259,8 +266,15 @@ public class DefaultRenderersFactory implements RenderersFactory {
AudioProcessor[] audioProcessors, Handler eventHandler, AudioProcessor[] audioProcessors, Handler eventHandler,
AudioRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode, AudioRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode,
ArrayList<Renderer> out) { ArrayList<Renderer> out) {
out.add(new MediaCodecAudioRenderer(MediaCodecSelector.DEFAULT, drmSessionManager, true, out.add(
eventHandler, eventListener, AudioCapabilities.getCapabilities(context), audioProcessors)); new MediaCodecAudioRenderer(
MediaCodecSelector.DEFAULT,
drmSessionManager,
/* playClearSamplesWithoutKeys= */ false,
eventHandler,
eventListener,
AudioCapabilities.getCapabilities(context),
audioProcessors));
if (extensionRendererMode == EXTENSION_RENDERER_MODE_OFF) { if (extensionRendererMode == EXTENSION_RENDERER_MODE_OFF) {
return; return;
......
...@@ -81,7 +81,10 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -81,7 +81,10 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
* @param mediaCodecSelector A decoder selector. * @param mediaCodecSelector A decoder selector.
*/ */
public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector) { public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector) {
this(mediaCodecSelector, null, true); this(
mediaCodecSelector,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false);
} }
/** /**
...@@ -97,7 +100,12 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -97,7 +100,12 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector, public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
@Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager, @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
boolean playClearSamplesWithoutKeys) { boolean playClearSamplesWithoutKeys) {
this(mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys, null, null); this(
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
/* eventHandler= */ null,
/* eventListener= */ null);
} }
/** /**
...@@ -108,7 +116,12 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -108,7 +116,12 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
*/ */
public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector, public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
@Nullable Handler eventHandler, @Nullable AudioRendererEventListener eventListener) { @Nullable Handler eventHandler, @Nullable AudioRendererEventListener eventListener) {
this(mediaCodecSelector, null, true, eventHandler, eventListener); this(
mediaCodecSelector,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false,
eventHandler,
eventListener);
} }
/** /**
......
...@@ -112,7 +112,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements ...@@ -112,7 +112,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
private boolean waitingForKeys; private boolean waitingForKeys;
public SimpleDecoderAudioRenderer() { public SimpleDecoderAudioRenderer() {
this(null, null); this(/* eventHandler= */ null, /* eventListener= */ null);
} }
/** /**
...@@ -123,7 +123,13 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements ...@@ -123,7 +123,13 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
*/ */
public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener, public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
AudioProcessor... audioProcessors) { AudioProcessor... audioProcessors) {
this(eventHandler, eventListener, null, null, false, audioProcessors); this(
eventHandler,
eventListener,
/* audioCapabilities= */ null,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false,
audioProcessors);
} }
/** /**
...@@ -135,7 +141,12 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements ...@@ -135,7 +141,12 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
*/ */
public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener, public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
AudioCapabilities audioCapabilities) { AudioCapabilities audioCapabilities) {
this(eventHandler, eventListener, audioCapabilities, null, false); this(
eventHandler,
eventListener,
audioCapabilities,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false);
} }
/** /**
......
...@@ -144,7 +144,13 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -144,7 +144,13 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
*/ */
public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector, public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
long allowedJoiningTimeMs) { long allowedJoiningTimeMs) {
this(context, mediaCodecSelector, allowedJoiningTimeMs, null, null, -1); this(
context,
mediaCodecSelector,
allowedJoiningTimeMs,
/* eventHandler= */ null,
/* eventListener= */ null,
-1);
} }
/** /**
...@@ -161,8 +167,15 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -161,8 +167,15 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector, public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
long allowedJoiningTimeMs, @Nullable Handler eventHandler, long allowedJoiningTimeMs, @Nullable Handler eventHandler,
@Nullable VideoRendererEventListener eventListener, int maxDroppedFrameCountToNotify) { @Nullable VideoRendererEventListener eventListener, int maxDroppedFrameCountToNotify) {
this(context, mediaCodecSelector, allowedJoiningTimeMs, null, false, eventHandler, this(
eventListener, maxDroppedFrameCountToNotify); context,
mediaCodecSelector,
allowedJoiningTimeMs,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false,
eventHandler,
eventListener,
maxDroppedFrameCountToNotify);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment