diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md index 8951fff9f51..ef0db8cc591 100644 --- a/packages/video_player/video_player_android/CHANGELOG.md +++ b/packages/video_player/video_player_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.7.16 + +* Updates internal Pigeon API to use newer features. + ## 2.7.15 * Changes the rotation correction calculation for Android API 29+ to use diff --git a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/Messages.java b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/Messages.java index b37b3b098f2..87004551885 100644 --- a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/Messages.java +++ b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/Messages.java @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.4.2), do not edit directly. +// Autogenerated from Pigeon (v22.5.0), do not edit directly. // See also: https://pub.dev/packages/pigeon package io.flutter.plugins.videoplayer; @@ -65,441 +65,6 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { @Retention(CLASS) @interface CanIgnoreReturnValue {} - /** Generated class from Pigeon that represents data sent in messages. */ - public static final class TextureMessage { - private @NonNull Long textureId; - - public @NonNull Long getTextureId() { - return textureId; - } - - public void setTextureId(@NonNull Long setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"textureId\" is null."); - } - this.textureId = setterArg; - } - - /** Constructor is non-public to enforce null safety; use Builder. */ - TextureMessage() {} - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TextureMessage that = (TextureMessage) o; - return textureId.equals(that.textureId); - } - - @Override - public int hashCode() { - return Objects.hash(textureId); - } - - public static final class Builder { - - private @Nullable Long textureId; - - @CanIgnoreReturnValue - public @NonNull Builder setTextureId(@NonNull Long setterArg) { - this.textureId = setterArg; - return this; - } - - public @NonNull TextureMessage build() { - TextureMessage pigeonReturn = new TextureMessage(); - pigeonReturn.setTextureId(textureId); - return pigeonReturn; - } - } - - @NonNull - ArrayList toList() { - ArrayList toListResult = new ArrayList<>(1); - toListResult.add(textureId); - return toListResult; - } - - static @NonNull TextureMessage fromList(@NonNull ArrayList pigeonVar_list) { - TextureMessage pigeonResult = new TextureMessage(); - Object textureId = pigeonVar_list.get(0); - pigeonResult.setTextureId((Long) textureId); - return pigeonResult; - } - } - - /** Generated class from Pigeon that represents data sent in messages. */ - public static final class LoopingMessage { - private @NonNull Long textureId; - - public @NonNull Long getTextureId() { - return textureId; - } - - public void setTextureId(@NonNull Long setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"textureId\" is null."); - } - this.textureId = setterArg; - } - - private @NonNull Boolean isLooping; - - public @NonNull Boolean getIsLooping() { - return isLooping; - } - - public void setIsLooping(@NonNull Boolean setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"isLooping\" is null."); - } - this.isLooping = setterArg; - } - - /** Constructor is non-public to enforce null safety; use Builder. */ - LoopingMessage() {} - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - LoopingMessage that = (LoopingMessage) o; - return textureId.equals(that.textureId) && isLooping.equals(that.isLooping); - } - - @Override - public int hashCode() { - return Objects.hash(textureId, isLooping); - } - - public static final class Builder { - - private @Nullable Long textureId; - - @CanIgnoreReturnValue - public @NonNull Builder setTextureId(@NonNull Long setterArg) { - this.textureId = setterArg; - return this; - } - - private @Nullable Boolean isLooping; - - @CanIgnoreReturnValue - public @NonNull Builder setIsLooping(@NonNull Boolean setterArg) { - this.isLooping = setterArg; - return this; - } - - public @NonNull LoopingMessage build() { - LoopingMessage pigeonReturn = new LoopingMessage(); - pigeonReturn.setTextureId(textureId); - pigeonReturn.setIsLooping(isLooping); - return pigeonReturn; - } - } - - @NonNull - ArrayList toList() { - ArrayList toListResult = new ArrayList<>(2); - toListResult.add(textureId); - toListResult.add(isLooping); - return toListResult; - } - - static @NonNull LoopingMessage fromList(@NonNull ArrayList pigeonVar_list) { - LoopingMessage pigeonResult = new LoopingMessage(); - Object textureId = pigeonVar_list.get(0); - pigeonResult.setTextureId((Long) textureId); - Object isLooping = pigeonVar_list.get(1); - pigeonResult.setIsLooping((Boolean) isLooping); - return pigeonResult; - } - } - - /** Generated class from Pigeon that represents data sent in messages. */ - public static final class VolumeMessage { - private @NonNull Long textureId; - - public @NonNull Long getTextureId() { - return textureId; - } - - public void setTextureId(@NonNull Long setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"textureId\" is null."); - } - this.textureId = setterArg; - } - - private @NonNull Double volume; - - public @NonNull Double getVolume() { - return volume; - } - - public void setVolume(@NonNull Double setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"volume\" is null."); - } - this.volume = setterArg; - } - - /** Constructor is non-public to enforce null safety; use Builder. */ - VolumeMessage() {} - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - VolumeMessage that = (VolumeMessage) o; - return textureId.equals(that.textureId) && volume.equals(that.volume); - } - - @Override - public int hashCode() { - return Objects.hash(textureId, volume); - } - - public static final class Builder { - - private @Nullable Long textureId; - - @CanIgnoreReturnValue - public @NonNull Builder setTextureId(@NonNull Long setterArg) { - this.textureId = setterArg; - return this; - } - - private @Nullable Double volume; - - @CanIgnoreReturnValue - public @NonNull Builder setVolume(@NonNull Double setterArg) { - this.volume = setterArg; - return this; - } - - public @NonNull VolumeMessage build() { - VolumeMessage pigeonReturn = new VolumeMessage(); - pigeonReturn.setTextureId(textureId); - pigeonReturn.setVolume(volume); - return pigeonReturn; - } - } - - @NonNull - ArrayList toList() { - ArrayList toListResult = new ArrayList<>(2); - toListResult.add(textureId); - toListResult.add(volume); - return toListResult; - } - - static @NonNull VolumeMessage fromList(@NonNull ArrayList pigeonVar_list) { - VolumeMessage pigeonResult = new VolumeMessage(); - Object textureId = pigeonVar_list.get(0); - pigeonResult.setTextureId((Long) textureId); - Object volume = pigeonVar_list.get(1); - pigeonResult.setVolume((Double) volume); - return pigeonResult; - } - } - - /** Generated class from Pigeon that represents data sent in messages. */ - public static final class PlaybackSpeedMessage { - private @NonNull Long textureId; - - public @NonNull Long getTextureId() { - return textureId; - } - - public void setTextureId(@NonNull Long setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"textureId\" is null."); - } - this.textureId = setterArg; - } - - private @NonNull Double speed; - - public @NonNull Double getSpeed() { - return speed; - } - - public void setSpeed(@NonNull Double setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"speed\" is null."); - } - this.speed = setterArg; - } - - /** Constructor is non-public to enforce null safety; use Builder. */ - PlaybackSpeedMessage() {} - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - PlaybackSpeedMessage that = (PlaybackSpeedMessage) o; - return textureId.equals(that.textureId) && speed.equals(that.speed); - } - - @Override - public int hashCode() { - return Objects.hash(textureId, speed); - } - - public static final class Builder { - - private @Nullable Long textureId; - - @CanIgnoreReturnValue - public @NonNull Builder setTextureId(@NonNull Long setterArg) { - this.textureId = setterArg; - return this; - } - - private @Nullable Double speed; - - @CanIgnoreReturnValue - public @NonNull Builder setSpeed(@NonNull Double setterArg) { - this.speed = setterArg; - return this; - } - - public @NonNull PlaybackSpeedMessage build() { - PlaybackSpeedMessage pigeonReturn = new PlaybackSpeedMessage(); - pigeonReturn.setTextureId(textureId); - pigeonReturn.setSpeed(speed); - return pigeonReturn; - } - } - - @NonNull - ArrayList toList() { - ArrayList toListResult = new ArrayList<>(2); - toListResult.add(textureId); - toListResult.add(speed); - return toListResult; - } - - static @NonNull PlaybackSpeedMessage fromList(@NonNull ArrayList pigeonVar_list) { - PlaybackSpeedMessage pigeonResult = new PlaybackSpeedMessage(); - Object textureId = pigeonVar_list.get(0); - pigeonResult.setTextureId((Long) textureId); - Object speed = pigeonVar_list.get(1); - pigeonResult.setSpeed((Double) speed); - return pigeonResult; - } - } - - /** Generated class from Pigeon that represents data sent in messages. */ - public static final class PositionMessage { - private @NonNull Long textureId; - - public @NonNull Long getTextureId() { - return textureId; - } - - public void setTextureId(@NonNull Long setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"textureId\" is null."); - } - this.textureId = setterArg; - } - - private @NonNull Long position; - - public @NonNull Long getPosition() { - return position; - } - - public void setPosition(@NonNull Long setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"position\" is null."); - } - this.position = setterArg; - } - - /** Constructor is non-public to enforce null safety; use Builder. */ - PositionMessage() {} - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - PositionMessage that = (PositionMessage) o; - return textureId.equals(that.textureId) && position.equals(that.position); - } - - @Override - public int hashCode() { - return Objects.hash(textureId, position); - } - - public static final class Builder { - - private @Nullable Long textureId; - - @CanIgnoreReturnValue - public @NonNull Builder setTextureId(@NonNull Long setterArg) { - this.textureId = setterArg; - return this; - } - - private @Nullable Long position; - - @CanIgnoreReturnValue - public @NonNull Builder setPosition(@NonNull Long setterArg) { - this.position = setterArg; - return this; - } - - public @NonNull PositionMessage build() { - PositionMessage pigeonReturn = new PositionMessage(); - pigeonReturn.setTextureId(textureId); - pigeonReturn.setPosition(position); - return pigeonReturn; - } - } - - @NonNull - ArrayList toList() { - ArrayList toListResult = new ArrayList<>(2); - toListResult.add(textureId); - toListResult.add(position); - return toListResult; - } - - static @NonNull PositionMessage fromList(@NonNull ArrayList pigeonVar_list) { - PositionMessage pigeonResult = new PositionMessage(); - Object textureId = pigeonVar_list.get(0); - pigeonResult.setTextureId((Long) textureId); - Object position = pigeonVar_list.get(1); - pigeonResult.setPosition((Long) position); - return pigeonResult; - } - } - /** Generated class from Pigeon that represents data sent in messages. */ public static final class CreateMessage { private @Nullable String asset; @@ -659,73 +224,6 @@ ArrayList toList() { } } - /** Generated class from Pigeon that represents data sent in messages. */ - public static final class MixWithOthersMessage { - private @NonNull Boolean mixWithOthers; - - public @NonNull Boolean getMixWithOthers() { - return mixWithOthers; - } - - public void setMixWithOthers(@NonNull Boolean setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"mixWithOthers\" is null."); - } - this.mixWithOthers = setterArg; - } - - /** Constructor is non-public to enforce null safety; use Builder. */ - MixWithOthersMessage() {} - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MixWithOthersMessage that = (MixWithOthersMessage) o; - return mixWithOthers.equals(that.mixWithOthers); - } - - @Override - public int hashCode() { - return Objects.hash(mixWithOthers); - } - - public static final class Builder { - - private @Nullable Boolean mixWithOthers; - - @CanIgnoreReturnValue - public @NonNull Builder setMixWithOthers(@NonNull Boolean setterArg) { - this.mixWithOthers = setterArg; - return this; - } - - public @NonNull MixWithOthersMessage build() { - MixWithOthersMessage pigeonReturn = new MixWithOthersMessage(); - pigeonReturn.setMixWithOthers(mixWithOthers); - return pigeonReturn; - } - } - - @NonNull - ArrayList toList() { - ArrayList toListResult = new ArrayList<>(1); - toListResult.add(mixWithOthers); - return toListResult; - } - - static @NonNull MixWithOthersMessage fromList(@NonNull ArrayList pigeonVar_list) { - MixWithOthersMessage pigeonResult = new MixWithOthersMessage(); - Object mixWithOthers = pigeonVar_list.get(0); - pigeonResult.setMixWithOthers((Boolean) mixWithOthers); - return pigeonResult; - } - } - private static class PigeonCodec extends StandardMessageCodec { public static final PigeonCodec INSTANCE = new PigeonCodec(); @@ -735,19 +233,7 @@ private PigeonCodec() {} protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { switch (type) { case (byte) 129: - return TextureMessage.fromList((ArrayList) readValue(buffer)); - case (byte) 130: - return LoopingMessage.fromList((ArrayList) readValue(buffer)); - case (byte) 131: - return VolumeMessage.fromList((ArrayList) readValue(buffer)); - case (byte) 132: - return PlaybackSpeedMessage.fromList((ArrayList) readValue(buffer)); - case (byte) 133: - return PositionMessage.fromList((ArrayList) readValue(buffer)); - case (byte) 134: return CreateMessage.fromList((ArrayList) readValue(buffer)); - case (byte) 135: - return MixWithOthersMessage.fromList((ArrayList) readValue(buffer)); default: return super.readValueOfType(type, buffer); } @@ -755,27 +241,9 @@ protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { @Override protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { - if (value instanceof TextureMessage) { + if (value instanceof CreateMessage) { stream.write(129); - writeValue(stream, ((TextureMessage) value).toList()); - } else if (value instanceof LoopingMessage) { - stream.write(130); - writeValue(stream, ((LoopingMessage) value).toList()); - } else if (value instanceof VolumeMessage) { - stream.write(131); - writeValue(stream, ((VolumeMessage) value).toList()); - } else if (value instanceof PlaybackSpeedMessage) { - stream.write(132); - writeValue(stream, ((PlaybackSpeedMessage) value).toList()); - } else if (value instanceof PositionMessage) { - stream.write(133); - writeValue(stream, ((PositionMessage) value).toList()); - } else if (value instanceof CreateMessage) { - stream.write(134); writeValue(stream, ((CreateMessage) value).toList()); - } else if (value instanceof MixWithOthersMessage) { - stream.write(135); - writeValue(stream, ((MixWithOthersMessage) value).toList()); } else { super.writeValue(stream, value); } @@ -788,26 +256,26 @@ public interface AndroidVideoPlayerApi { void initialize(); @NonNull - TextureMessage create(@NonNull CreateMessage msg); + Long create(@NonNull CreateMessage msg); - void dispose(@NonNull TextureMessage msg); + void dispose(@NonNull Long textureId); - void setLooping(@NonNull LoopingMessage msg); + void setLooping(@NonNull Long textureId, @NonNull Boolean looping); - void setVolume(@NonNull VolumeMessage msg); + void setVolume(@NonNull Long textureId, @NonNull Double volume); - void setPlaybackSpeed(@NonNull PlaybackSpeedMessage msg); + void setPlaybackSpeed(@NonNull Long textureId, @NonNull Double speed); - void play(@NonNull TextureMessage msg); + void play(@NonNull Long textureId); @NonNull - PositionMessage position(@NonNull TextureMessage msg); + Long position(@NonNull Long textureId); - void seekTo(@NonNull PositionMessage msg); + void seekTo(@NonNull Long textureId, @NonNull Long position); - void pause(@NonNull TextureMessage msg); + void pause(@NonNull Long textureId); - void setMixWithOthers(@NonNull MixWithOthersMessage msg); + void setMixWithOthers(@NonNull Boolean mixWithOthers); /** The codec used by AndroidVideoPlayerApi. */ static @NonNull MessageCodec getCodec() { @@ -864,7 +332,7 @@ static void setUp( ArrayList args = (ArrayList) message; CreateMessage msgArg = (CreateMessage) args.get(0); try { - TextureMessage output = api.create(msgArg); + Long output = api.create(msgArg); wrapped.add(0, output); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -887,9 +355,9 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - TextureMessage msgArg = (TextureMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); try { - api.dispose(msgArg); + api.dispose(textureIdArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -912,9 +380,10 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - LoopingMessage msgArg = (LoopingMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); + Boolean loopingArg = (Boolean) args.get(1); try { - api.setLooping(msgArg); + api.setLooping(textureIdArg, loopingArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -937,9 +406,10 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - VolumeMessage msgArg = (VolumeMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); + Double volumeArg = (Double) args.get(1); try { - api.setVolume(msgArg); + api.setVolume(textureIdArg, volumeArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -962,9 +432,10 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - PlaybackSpeedMessage msgArg = (PlaybackSpeedMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); + Double speedArg = (Double) args.get(1); try { - api.setPlaybackSpeed(msgArg); + api.setPlaybackSpeed(textureIdArg, speedArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -987,9 +458,9 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - TextureMessage msgArg = (TextureMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); try { - api.play(msgArg); + api.play(textureIdArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -1012,9 +483,9 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - TextureMessage msgArg = (TextureMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); try { - PositionMessage output = api.position(msgArg); + Long output = api.position(textureIdArg); wrapped.add(0, output); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -1037,9 +508,10 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - PositionMessage msgArg = (PositionMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); + Long positionArg = (Long) args.get(1); try { - api.seekTo(msgArg); + api.seekTo(textureIdArg, positionArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -1062,9 +534,9 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - TextureMessage msgArg = (TextureMessage) args.get(0); + Long textureIdArg = (Long) args.get(0); try { - api.pause(msgArg); + api.pause(textureIdArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); @@ -1087,9 +559,9 @@ static void setUp( (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - MixWithOthersMessage msgArg = (MixWithOthersMessage) args.get(0); + Boolean mixWithOthersArg = (Boolean) args.get(0); try { - api.setMixWithOthers(msgArg); + api.setMixWithOthers(mixWithOthersArg); wrapped.add(0, null); } catch (Throwable exception) { wrapped = wrapError(exception); diff --git a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java index d1911d8cc37..d248ad2f0be 100644 --- a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java +++ b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java @@ -14,12 +14,6 @@ import io.flutter.plugin.common.EventChannel; import io.flutter.plugins.videoplayer.Messages.AndroidVideoPlayerApi; import io.flutter.plugins.videoplayer.Messages.CreateMessage; -import io.flutter.plugins.videoplayer.Messages.LoopingMessage; -import io.flutter.plugins.videoplayer.Messages.MixWithOthersMessage; -import io.flutter.plugins.videoplayer.Messages.PlaybackSpeedMessage; -import io.flutter.plugins.videoplayer.Messages.PositionMessage; -import io.flutter.plugins.videoplayer.Messages.TextureMessage; -import io.flutter.plugins.videoplayer.Messages.VolumeMessage; import io.flutter.view.TextureRegistry; /** Android platform implementation of the VideoPlayerPlugin. */ @@ -71,11 +65,13 @@ public void onDestroy() { disposeAllPlayers(); } + @Override public void initialize() { disposeAllPlayers(); } - public @NonNull TextureMessage create(@NonNull CreateMessage arg) { + @Override + public @NonNull Long create(@NonNull CreateMessage arg) { TextureRegistry.SurfaceProducer handle = flutterState.textureRegistry.createSurfaceProducer(); EventChannel eventChannel = new EventChannel( @@ -120,7 +116,7 @@ public void initialize() { videoAsset, options)); - return new TextureMessage.Builder().setTextureId(handle.id()).build(); + return handle.id(); } @NonNull @@ -139,56 +135,60 @@ private VideoPlayer getPlayer(long textureId) { return player; } - public void dispose(@NonNull TextureMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); + @Override + public void dispose(@NonNull Long textureId) { + VideoPlayer player = getPlayer(textureId); player.dispose(); - videoPlayers.remove(arg.getTextureId()); + videoPlayers.remove(textureId); } - public void setLooping(@NonNull LoopingMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); - player.setLooping(arg.getIsLooping()); + @Override + public void setLooping(@NonNull Long textureId, @NonNull Boolean looping) { + VideoPlayer player = getPlayer(textureId); + player.setLooping(looping); } - public void setVolume(@NonNull VolumeMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); - player.setVolume(arg.getVolume()); + @Override + public void setVolume(@NonNull Long textureId, @NonNull Double volume) { + VideoPlayer player = getPlayer(textureId); + player.setVolume(volume); } - public void setPlaybackSpeed(@NonNull PlaybackSpeedMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); - player.setPlaybackSpeed(arg.getSpeed()); + @Override + public void setPlaybackSpeed(@NonNull Long textureId, @NonNull Double speed) { + VideoPlayer player = getPlayer(textureId); + player.setPlaybackSpeed(speed); } - public void play(@NonNull TextureMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); + @Override + public void play(@NonNull Long textureId) { + VideoPlayer player = getPlayer(textureId); player.play(); } - public @NonNull PositionMessage position(@NonNull TextureMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); - PositionMessage result = - new PositionMessage.Builder() - .setPosition(player.getPosition()) - .setTextureId(arg.getTextureId()) - .build(); + @Override + public @NonNull Long position(@NonNull Long textureId) { + VideoPlayer player = getPlayer(textureId); + long position = player.getPosition(); player.sendBufferingUpdate(); - return result; + return position; } - public void seekTo(@NonNull PositionMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); - player.seekTo(arg.getPosition().intValue()); + @Override + public void seekTo(@NonNull Long textureId, @NonNull Long position) { + VideoPlayer player = getPlayer(textureId); + player.seekTo(position.intValue()); } - public void pause(@NonNull TextureMessage arg) { - VideoPlayer player = getPlayer(arg.getTextureId()); + @Override + public void pause(@NonNull Long textureId) { + VideoPlayer player = getPlayer(textureId); player.pause(); } @Override - public void setMixWithOthers(@NonNull MixWithOthersMessage arg) { - options.mixWithOthers = arg.getMixWithOthers(); + public void setMixWithOthers(@NonNull Boolean mixWithOthers) { + options.mixWithOthers = mixWithOthers; } private interface KeyForAssetFn { diff --git a/packages/video_player/video_player_android/lib/src/android_video_player.dart b/packages/video_player/video_player_android/lib/src/android_video_player.dart index 7d4a600397d..45665631d93 100644 --- a/packages/video_player/video_player_android/lib/src/android_video_player.dart +++ b/packages/video_player/video_player_android/lib/src/android_video_player.dart @@ -27,7 +27,7 @@ class AndroidVideoPlayer extends VideoPlayerPlatform { @override Future dispose(int textureId) { - return _api.dispose(TextureMessage(textureId: textureId)); + return _api.dispose(textureId); } @override @@ -59,59 +59,45 @@ class AndroidVideoPlayer extends VideoPlayerPlatform { formatHint: formatHint, ); - final TextureMessage response = await _api.create(message); - return response.textureId; + return _api.create(message); } @override Future setLooping(int textureId, bool looping) { - return _api.setLooping(LoopingMessage( - textureId: textureId, - isLooping: looping, - )); + return _api.setLooping(textureId, looping); } @override Future play(int textureId) { - return _api.play(TextureMessage(textureId: textureId)); + return _api.play(textureId); } @override Future pause(int textureId) { - return _api.pause(TextureMessage(textureId: textureId)); + return _api.pause(textureId); } @override Future setVolume(int textureId, double volume) { - return _api.setVolume(VolumeMessage( - textureId: textureId, - volume: volume, - )); + return _api.setVolume(textureId, volume); } @override Future setPlaybackSpeed(int textureId, double speed) { assert(speed > 0); - return _api.setPlaybackSpeed(PlaybackSpeedMessage( - textureId: textureId, - speed: speed, - )); + return _api.setPlaybackSpeed(textureId, speed); } @override Future seekTo(int textureId, Duration position) { - return _api.seekTo(PositionMessage( - textureId: textureId, - position: position.inMilliseconds, - )); + return _api.seekTo(textureId, position.inMilliseconds); } @override Future getPosition(int textureId) async { - final PositionMessage response = - await _api.position(TextureMessage(textureId: textureId)); - return Duration(milliseconds: response.position); + final int position = await _api.position(textureId); + return Duration(milliseconds: position); } @override @@ -162,8 +148,7 @@ class AndroidVideoPlayer extends VideoPlayerPlatform { @override Future setMixWithOthers(bool mixWithOthers) { - return _api - .setMixWithOthers(MixWithOthersMessage(mixWithOthers: mixWithOthers)); + return _api.setMixWithOthers(mixWithOthers); } EventChannel _eventChannelFor(int textureId) { diff --git a/packages/video_player/video_player_android/lib/src/messages.g.dart b/packages/video_player/video_player_android/lib/src/messages.g.dart index 9cff05e9e9d..e3190b389e4 100644 --- a/packages/video_player/video_player_android/lib/src/messages.g.dart +++ b/packages/video_player/video_player_android/lib/src/messages.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.4.2), do not edit directly. +// Autogenerated from Pigeon (v22.5.0), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -29,131 +29,6 @@ List wrapResponse( return [error.code, error.message, error.details]; } -class TextureMessage { - TextureMessage({ - required this.textureId, - }); - - int textureId; - - Object encode() { - return [ - textureId, - ]; - } - - static TextureMessage decode(Object result) { - result as List; - return TextureMessage( - textureId: result[0]! as int, - ); - } -} - -class LoopingMessage { - LoopingMessage({ - required this.textureId, - required this.isLooping, - }); - - int textureId; - - bool isLooping; - - Object encode() { - return [ - textureId, - isLooping, - ]; - } - - static LoopingMessage decode(Object result) { - result as List; - return LoopingMessage( - textureId: result[0]! as int, - isLooping: result[1]! as bool, - ); - } -} - -class VolumeMessage { - VolumeMessage({ - required this.textureId, - required this.volume, - }); - - int textureId; - - double volume; - - Object encode() { - return [ - textureId, - volume, - ]; - } - - static VolumeMessage decode(Object result) { - result as List; - return VolumeMessage( - textureId: result[0]! as int, - volume: result[1]! as double, - ); - } -} - -class PlaybackSpeedMessage { - PlaybackSpeedMessage({ - required this.textureId, - required this.speed, - }); - - int textureId; - - double speed; - - Object encode() { - return [ - textureId, - speed, - ]; - } - - static PlaybackSpeedMessage decode(Object result) { - result as List; - return PlaybackSpeedMessage( - textureId: result[0]! as int, - speed: result[1]! as double, - ); - } -} - -class PositionMessage { - PositionMessage({ - required this.textureId, - required this.position, - }); - - int textureId; - - int position; - - Object encode() { - return [ - textureId, - position, - ]; - } - - static PositionMessage decode(Object result) { - result as List; - return PositionMessage( - textureId: result[0]! as int, - position: result[1]! as int, - ); - } -} - class CreateMessage { CreateMessage({ this.asset, @@ -196,27 +71,6 @@ class CreateMessage { } } -class MixWithOthersMessage { - MixWithOthersMessage({ - required this.mixWithOthers, - }); - - bool mixWithOthers; - - Object encode() { - return [ - mixWithOthers, - ]; - } - - static MixWithOthersMessage decode(Object result) { - result as List; - return MixWithOthersMessage( - mixWithOthers: result[0]! as bool, - ); - } -} - class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -224,26 +78,8 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is TextureMessage) { - buffer.putUint8(129); - writeValue(buffer, value.encode()); - } else if (value is LoopingMessage) { - buffer.putUint8(130); - writeValue(buffer, value.encode()); - } else if (value is VolumeMessage) { - buffer.putUint8(131); - writeValue(buffer, value.encode()); - } else if (value is PlaybackSpeedMessage) { - buffer.putUint8(132); - writeValue(buffer, value.encode()); - } else if (value is PositionMessage) { - buffer.putUint8(133); - writeValue(buffer, value.encode()); } else if (value is CreateMessage) { - buffer.putUint8(134); - writeValue(buffer, value.encode()); - } else if (value is MixWithOthersMessage) { - buffer.putUint8(135); + buffer.putUint8(129); writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); @@ -254,19 +90,7 @@ class _PigeonCodec extends StandardMessageCodec { Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { case 129: - return TextureMessage.decode(readValue(buffer)!); - case 130: - return LoopingMessage.decode(readValue(buffer)!); - case 131: - return VolumeMessage.decode(readValue(buffer)!); - case 132: - return PlaybackSpeedMessage.decode(readValue(buffer)!); - case 133: - return PositionMessage.decode(readValue(buffer)!); - case 134: return CreateMessage.decode(readValue(buffer)!); - case 135: - return MixWithOthersMessage.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } @@ -312,7 +136,7 @@ class AndroidVideoPlayerApi { } } - Future create(CreateMessage msg) async { + Future create(CreateMessage msg) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.create$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -337,11 +161,11 @@ class AndroidVideoPlayerApi { message: 'Host platform returned null value for non-null return value.', ); } else { - return (pigeonVar_replyList[0] as TextureMessage?)!; + return (pigeonVar_replyList[0] as int?)!; } } - Future dispose(TextureMessage msg) async { + Future dispose(int textureId) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.dispose$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -351,7 +175,7 @@ class AndroidVideoPlayerApi { binaryMessenger: pigeonVar_binaryMessenger, ); final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + await pigeonVar_channel.send([textureId]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -365,7 +189,7 @@ class AndroidVideoPlayerApi { } } - Future setLooping(LoopingMessage msg) async { + Future setLooping(int textureId, bool looping) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setLooping$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -374,8 +198,8 @@ class AndroidVideoPlayerApi { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + final List? pigeonVar_replyList = await pigeonVar_channel + .send([textureId, looping]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -389,7 +213,7 @@ class AndroidVideoPlayerApi { } } - Future setVolume(VolumeMessage msg) async { + Future setVolume(int textureId, double volume) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setVolume$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -398,8 +222,8 @@ class AndroidVideoPlayerApi { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + final List? pigeonVar_replyList = await pigeonVar_channel + .send([textureId, volume]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -413,7 +237,7 @@ class AndroidVideoPlayerApi { } } - Future setPlaybackSpeed(PlaybackSpeedMessage msg) async { + Future setPlaybackSpeed(int textureId, double speed) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setPlaybackSpeed$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -422,8 +246,8 @@ class AndroidVideoPlayerApi { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + final List? pigeonVar_replyList = await pigeonVar_channel + .send([textureId, speed]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -437,7 +261,7 @@ class AndroidVideoPlayerApi { } } - Future play(TextureMessage msg) async { + Future play(int textureId) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.play$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -447,7 +271,7 @@ class AndroidVideoPlayerApi { binaryMessenger: pigeonVar_binaryMessenger, ); final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + await pigeonVar_channel.send([textureId]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -461,7 +285,7 @@ class AndroidVideoPlayerApi { } } - Future position(TextureMessage msg) async { + Future position(int textureId) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.position$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -471,7 +295,7 @@ class AndroidVideoPlayerApi { binaryMessenger: pigeonVar_binaryMessenger, ); final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + await pigeonVar_channel.send([textureId]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -486,11 +310,11 @@ class AndroidVideoPlayerApi { message: 'Host platform returned null value for non-null return value.', ); } else { - return (pigeonVar_replyList[0] as PositionMessage?)!; + return (pigeonVar_replyList[0] as int?)!; } } - Future seekTo(PositionMessage msg) async { + Future seekTo(int textureId, int position) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.seekTo$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -499,8 +323,8 @@ class AndroidVideoPlayerApi { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + final List? pigeonVar_replyList = await pigeonVar_channel + .send([textureId, position]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -514,7 +338,7 @@ class AndroidVideoPlayerApi { } } - Future pause(TextureMessage msg) async { + Future pause(int textureId) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.pause$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -524,7 +348,7 @@ class AndroidVideoPlayerApi { binaryMessenger: pigeonVar_binaryMessenger, ); final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + await pigeonVar_channel.send([textureId]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -538,7 +362,7 @@ class AndroidVideoPlayerApi { } } - Future setMixWithOthers(MixWithOthersMessage msg) async { + Future setMixWithOthers(bool mixWithOthers) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setMixWithOthers$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = @@ -547,8 +371,8 @@ class AndroidVideoPlayerApi { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final List? pigeonVar_replyList = - await pigeonVar_channel.send([msg]) as List?; + final List? pigeonVar_replyList = await pigeonVar_channel + .send([mixWithOthers]) as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { diff --git a/packages/video_player/video_player_android/pigeons/messages.dart b/packages/video_player/video_player_android/pigeons/messages.dart index 8538f52cedc..37bde3dcda5 100644 --- a/packages/video_player/video_player_android/pigeons/messages.dart +++ b/packages/video_player/video_player_android/pigeons/messages.dart @@ -13,35 +13,6 @@ import 'package:pigeon/pigeon.dart'; ), copyrightHeader: 'pigeons/copyright.txt', )) -class TextureMessage { - TextureMessage(this.textureId); - int textureId; -} - -class LoopingMessage { - LoopingMessage(this.textureId, this.isLooping); - int textureId; - bool isLooping; -} - -class VolumeMessage { - VolumeMessage(this.textureId, this.volume); - int textureId; - double volume; -} - -class PlaybackSpeedMessage { - PlaybackSpeedMessage(this.textureId, this.speed); - int textureId; - double speed; -} - -class PositionMessage { - PositionMessage(this.textureId, this.position); - int textureId; - int position; -} - class CreateMessage { CreateMessage({required this.httpHeaders}); String? asset; @@ -51,22 +22,17 @@ class CreateMessage { Map httpHeaders; } -class MixWithOthersMessage { - MixWithOthersMessage(this.mixWithOthers); - bool mixWithOthers; -} - @HostApi(dartHostTestHandler: 'TestHostVideoPlayerApi') abstract class AndroidVideoPlayerApi { void initialize(); - TextureMessage create(CreateMessage msg); - void dispose(TextureMessage msg); - void setLooping(LoopingMessage msg); - void setVolume(VolumeMessage msg); - void setPlaybackSpeed(PlaybackSpeedMessage msg); - void play(TextureMessage msg); - PositionMessage position(TextureMessage msg); - void seekTo(PositionMessage msg); - void pause(TextureMessage msg); - void setMixWithOthers(MixWithOthersMessage msg); + int create(CreateMessage msg); + void dispose(int textureId); + void setLooping(int textureId, bool looping); + void setVolume(int textureId, double volume); + void setPlaybackSpeed(int textureId, double speed); + void play(int textureId); + int position(int textureId); + void seekTo(int textureId, int position); + void pause(int textureId); + void setMixWithOthers(bool mixWithOthers); } diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml index eaaec350813..ababc4aca4e 100644 --- a/packages/video_player/video_player_android/pubspec.yaml +++ b/packages/video_player/video_player_android/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player_android description: Android implementation of the video_player plugin. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 -version: 2.7.15 +version: 2.7.16 environment: sdk: ^3.5.0 diff --git a/packages/video_player/video_player_android/test/android_video_player_test.dart b/packages/video_player/video_player_android/test/android_video_player_test.dart index dc9544781cf..2c99cb934d0 100644 --- a/packages/video_player/video_player_android/test/android_video_player_test.dart +++ b/packages/video_player/video_player_android/test/android_video_player_test.dart @@ -12,25 +12,25 @@ import 'test_api.g.dart'; class _ApiLogger implements TestHostVideoPlayerApi { final List log = []; - TextureMessage? textureMessage; - CreateMessage? createMessage; - PositionMessage? positionMessage; - LoopingMessage? loopingMessage; - VolumeMessage? volumeMessage; - PlaybackSpeedMessage? playbackSpeedMessage; - MixWithOthersMessage? mixWithOthersMessage; + int? passedTextureId; + CreateMessage? passedCreateMessage; + int? passedPosition; + bool? passedLooping; + double? passedVolume; + double? passedPlaybackSpeed; + bool? passedMixWithOthers; @override - TextureMessage create(CreateMessage arg) { + int create(CreateMessage arg) { log.add('create'); - createMessage = arg; - return TextureMessage(textureId: 3); + passedCreateMessage = arg; + return 3; } @override - void dispose(TextureMessage arg) { + void dispose(int textureId) { log.add('dispose'); - textureMessage = arg; + passedTextureId = textureId; } @override @@ -39,52 +39,56 @@ class _ApiLogger implements TestHostVideoPlayerApi { } @override - void pause(TextureMessage arg) { + void pause(int textureId) { log.add('pause'); - textureMessage = arg; + passedTextureId = textureId; } @override - void play(TextureMessage arg) { + void play(int textureId) { log.add('play'); - textureMessage = arg; + passedTextureId = textureId; } @override - void setMixWithOthers(MixWithOthersMessage arg) { + void setMixWithOthers(bool mixWithOthers) { log.add('setMixWithOthers'); - mixWithOthersMessage = arg; + passedMixWithOthers = mixWithOthers; } @override - PositionMessage position(TextureMessage arg) { + int position(int textureId) { log.add('position'); - textureMessage = arg; - return PositionMessage(textureId: arg.textureId, position: 234); + passedTextureId = textureId; + return 234; } @override - void seekTo(PositionMessage arg) { + void seekTo(int textureId, int position) { log.add('seekTo'); - positionMessage = arg; + passedTextureId = textureId; + passedPosition = position; } @override - void setLooping(LoopingMessage arg) { + void setLooping(int textureId, bool looping) { log.add('setLooping'); - loopingMessage = arg; + passedTextureId = textureId; + passedLooping = looping; } @override - void setVolume(VolumeMessage arg) { + void setVolume(int textureId, double volume) { log.add('setVolume'); - volumeMessage = arg; + passedTextureId = textureId; + passedVolume = volume; } @override - void setPlaybackSpeed(PlaybackSpeedMessage arg) { + void setPlaybackSpeed(int textureId, double speed) { log.add('setPlaybackSpeed'); - playbackSpeedMessage = arg; + passedTextureId = textureId; + passedPlaybackSpeed = speed; } } @@ -116,7 +120,7 @@ void main() { test('dispose', () async { await player.dispose(1); expect(log.log.last, 'dispose'); - expect(log.textureMessage?.textureId, 1); + expect(log.passedTextureId, 1); }); test('create with asset', () async { @@ -126,8 +130,8 @@ void main() { package: 'somePackage', )); expect(log.log.last, 'create'); - expect(log.createMessage?.asset, 'someAsset'); - expect(log.createMessage?.packageName, 'somePackage'); + expect(log.passedCreateMessage?.asset, 'someAsset'); + expect(log.passedCreateMessage?.packageName, 'somePackage'); expect(textureId, 3); }); @@ -138,11 +142,11 @@ void main() { formatHint: VideoFormat.dash, )); expect(log.log.last, 'create'); - expect(log.createMessage?.asset, null); - expect(log.createMessage?.uri, 'someUri'); - expect(log.createMessage?.packageName, null); - expect(log.createMessage?.formatHint, 'dash'); - expect(log.createMessage?.httpHeaders, {}); + expect(log.passedCreateMessage?.asset, null); + expect(log.passedCreateMessage?.uri, 'someUri'); + expect(log.passedCreateMessage?.packageName, null); + expect(log.passedCreateMessage?.formatHint, 'dash'); + expect(log.passedCreateMessage?.httpHeaders, {}); expect(textureId, 3); }); @@ -153,11 +157,11 @@ void main() { httpHeaders: {'Authorization': 'Bearer token'}, )); expect(log.log.last, 'create'); - expect(log.createMessage?.asset, null); - expect(log.createMessage?.uri, 'someUri'); - expect(log.createMessage?.packageName, null); - expect(log.createMessage?.formatHint, null); - expect(log.createMessage?.httpHeaders, + expect(log.passedCreateMessage?.asset, null); + expect(log.passedCreateMessage?.uri, 'someUri'); + expect(log.passedCreateMessage?.packageName, null); + expect(log.passedCreateMessage?.formatHint, null); + expect(log.passedCreateMessage?.httpHeaders, {'Authorization': 'Bearer token'}); expect(textureId, 3); }); @@ -168,7 +172,7 @@ void main() { uri: 'someUri', )); expect(log.log.last, 'create'); - expect(log.createMessage?.uri, 'someUri'); + expect(log.passedCreateMessage?.uri, 'someUri'); expect(textureId, 3); }); @@ -179,65 +183,65 @@ void main() { httpHeaders: {'Authorization': 'Bearer token'}, )); expect(log.log.last, 'create'); - expect(log.createMessage?.uri, 'someUri'); - expect(log.createMessage?.httpHeaders, + expect(log.passedCreateMessage?.uri, 'someUri'); + expect(log.passedCreateMessage?.httpHeaders, {'Authorization': 'Bearer token'}); expect(textureId, 3); }); test('setLooping', () async { await player.setLooping(1, true); expect(log.log.last, 'setLooping'); - expect(log.loopingMessage?.textureId, 1); - expect(log.loopingMessage?.isLooping, true); + expect(log.passedTextureId, 1); + expect(log.passedLooping, true); }); test('play', () async { await player.play(1); expect(log.log.last, 'play'); - expect(log.textureMessage?.textureId, 1); + expect(log.passedTextureId, 1); }); test('pause', () async { await player.pause(1); expect(log.log.last, 'pause'); - expect(log.textureMessage?.textureId, 1); + expect(log.passedTextureId, 1); }); test('setMixWithOthers', () async { await player.setMixWithOthers(true); expect(log.log.last, 'setMixWithOthers'); - expect(log.mixWithOthersMessage?.mixWithOthers, true); + expect(log.passedMixWithOthers, true); await player.setMixWithOthers(false); expect(log.log.last, 'setMixWithOthers'); - expect(log.mixWithOthersMessage?.mixWithOthers, false); + expect(log.passedMixWithOthers, false); }); test('setVolume', () async { await player.setVolume(1, 0.7); expect(log.log.last, 'setVolume'); - expect(log.volumeMessage?.textureId, 1); - expect(log.volumeMessage?.volume, 0.7); + expect(log.passedTextureId, 1); + expect(log.passedVolume, 0.7); }); test('setPlaybackSpeed', () async { await player.setPlaybackSpeed(1, 1.5); expect(log.log.last, 'setPlaybackSpeed'); - expect(log.playbackSpeedMessage?.textureId, 1); - expect(log.playbackSpeedMessage?.speed, 1.5); + expect(log.passedTextureId, 1); + expect(log.passedPlaybackSpeed, 1.5); }); test('seekTo', () async { await player.seekTo(1, const Duration(milliseconds: 12345)); expect(log.log.last, 'seekTo'); - expect(log.positionMessage?.textureId, 1); - expect(log.positionMessage?.position, 12345); + expect(log.passedTextureId, 1); + expect(log.passedPosition, 12345); }); test('getPosition', () async { final Duration position = await player.getPosition(1); expect(log.log.last, 'position'); - expect(log.textureMessage?.textureId, 1); + expect(log.passedTextureId, 1); expect(position, const Duration(milliseconds: 234)); }); diff --git a/packages/video_player/video_player_android/test/test_api.g.dart b/packages/video_player/video_player_android/test/test_api.g.dart index 6dadde6b37e..838dcfbc5a2 100644 --- a/packages/video_player/video_player_android/test/test_api.g.dart +++ b/packages/video_player/video_player_android/test/test_api.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.4.2), do not edit directly. +// Autogenerated from Pigeon (v22.5.0), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import, no_leading_underscores_for_local_identifiers // ignore_for_file: avoid_relative_lib_imports @@ -20,26 +20,8 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is TextureMessage) { - buffer.putUint8(129); - writeValue(buffer, value.encode()); - } else if (value is LoopingMessage) { - buffer.putUint8(130); - writeValue(buffer, value.encode()); - } else if (value is VolumeMessage) { - buffer.putUint8(131); - writeValue(buffer, value.encode()); - } else if (value is PlaybackSpeedMessage) { - buffer.putUint8(132); - writeValue(buffer, value.encode()); - } else if (value is PositionMessage) { - buffer.putUint8(133); - writeValue(buffer, value.encode()); } else if (value is CreateMessage) { - buffer.putUint8(134); - writeValue(buffer, value.encode()); - } else if (value is MixWithOthersMessage) { - buffer.putUint8(135); + buffer.putUint8(129); writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); @@ -50,19 +32,7 @@ class _PigeonCodec extends StandardMessageCodec { Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { case 129: - return TextureMessage.decode(readValue(buffer)!); - case 130: - return LoopingMessage.decode(readValue(buffer)!); - case 131: - return VolumeMessage.decode(readValue(buffer)!); - case 132: - return PlaybackSpeedMessage.decode(readValue(buffer)!); - case 133: - return PositionMessage.decode(readValue(buffer)!); - case 134: return CreateMessage.decode(readValue(buffer)!); - case 135: - return MixWithOthersMessage.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } @@ -76,25 +46,25 @@ abstract class TestHostVideoPlayerApi { void initialize(); - TextureMessage create(CreateMessage msg); + int create(CreateMessage msg); - void dispose(TextureMessage msg); + void dispose(int textureId); - void setLooping(LoopingMessage msg); + void setLooping(int textureId, bool looping); - void setVolume(VolumeMessage msg); + void setVolume(int textureId, double volume); - void setPlaybackSpeed(PlaybackSpeedMessage msg); + void setPlaybackSpeed(int textureId, double speed); - void play(TextureMessage msg); + void play(int textureId); - PositionMessage position(TextureMessage msg); + int position(int textureId); - void seekTo(PositionMessage msg); + void seekTo(int textureId, int position); - void pause(TextureMessage msg); + void pause(int textureId); - void setMixWithOthers(MixWithOthersMessage msg); + void setMixWithOthers(bool mixWithOthers); static void setUp( TestHostVideoPlayerApi? api, { @@ -150,7 +120,7 @@ abstract class TestHostVideoPlayerApi { assert(arg_msg != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.create was null, expected non-null CreateMessage.'); try { - final TextureMessage output = api.create(arg_msg!); + final int output = api.create(arg_msg!); return [output]; } on PlatformException catch (e) { return wrapResponse(error: e); @@ -178,11 +148,11 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.dispose was null.'); final List args = (message as List?)!; - final TextureMessage? arg_msg = (args[0] as TextureMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.dispose was null, expected non-null TextureMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.dispose was null, expected non-null int.'); try { - api.dispose(arg_msg!); + api.dispose(arg_textureId!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -210,11 +180,14 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setLooping was null.'); final List args = (message as List?)!; - final LoopingMessage? arg_msg = (args[0] as LoopingMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setLooping was null, expected non-null LoopingMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setLooping was null, expected non-null int.'); + final bool? arg_looping = (args[1] as bool?); + assert(arg_looping != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setLooping was null, expected non-null bool.'); try { - api.setLooping(arg_msg!); + api.setLooping(arg_textureId!, arg_looping!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -242,11 +215,14 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setVolume was null.'); final List args = (message as List?)!; - final VolumeMessage? arg_msg = (args[0] as VolumeMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setVolume was null, expected non-null VolumeMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setVolume was null, expected non-null int.'); + final double? arg_volume = (args[1] as double?); + assert(arg_volume != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setVolume was null, expected non-null double.'); try { - api.setVolume(arg_msg!); + api.setVolume(arg_textureId!, arg_volume!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -274,12 +250,14 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setPlaybackSpeed was null.'); final List args = (message as List?)!; - final PlaybackSpeedMessage? arg_msg = - (args[0] as PlaybackSpeedMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setPlaybackSpeed was null, expected non-null PlaybackSpeedMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setPlaybackSpeed was null, expected non-null int.'); + final double? arg_speed = (args[1] as double?); + assert(arg_speed != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setPlaybackSpeed was null, expected non-null double.'); try { - api.setPlaybackSpeed(arg_msg!); + api.setPlaybackSpeed(arg_textureId!, arg_speed!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -307,11 +285,11 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.play was null.'); final List args = (message as List?)!; - final TextureMessage? arg_msg = (args[0] as TextureMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.play was null, expected non-null TextureMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.play was null, expected non-null int.'); try { - api.play(arg_msg!); + api.play(arg_textureId!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -339,11 +317,11 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.position was null.'); final List args = (message as List?)!; - final TextureMessage? arg_msg = (args[0] as TextureMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.position was null, expected non-null TextureMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.position was null, expected non-null int.'); try { - final PositionMessage output = api.position(arg_msg!); + final int output = api.position(arg_textureId!); return [output]; } on PlatformException catch (e) { return wrapResponse(error: e); @@ -371,11 +349,14 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.seekTo was null.'); final List args = (message as List?)!; - final PositionMessage? arg_msg = (args[0] as PositionMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.seekTo was null, expected non-null PositionMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.seekTo was null, expected non-null int.'); + final int? arg_position = (args[1] as int?); + assert(arg_position != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.seekTo was null, expected non-null int.'); try { - api.seekTo(arg_msg!); + api.seekTo(arg_textureId!, arg_position!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -403,11 +384,11 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.pause was null.'); final List args = (message as List?)!; - final TextureMessage? arg_msg = (args[0] as TextureMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.pause was null, expected non-null TextureMessage.'); + final int? arg_textureId = (args[0] as int?); + assert(arg_textureId != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.pause was null, expected non-null int.'); try { - api.pause(arg_msg!); + api.pause(arg_textureId!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -435,12 +416,11 @@ abstract class TestHostVideoPlayerApi { assert(message != null, 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setMixWithOthers was null.'); final List args = (message as List?)!; - final MixWithOthersMessage? arg_msg = - (args[0] as MixWithOthersMessage?); - assert(arg_msg != null, - 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setMixWithOthers was null, expected non-null MixWithOthersMessage.'); + final bool? arg_mixWithOthers = (args[0] as bool?); + assert(arg_mixWithOthers != null, + 'Argument for dev.flutter.pigeon.video_player_android.AndroidVideoPlayerApi.setMixWithOthers was null, expected non-null bool.'); try { - api.setMixWithOthers(arg_msg!); + api.setMixWithOthers(arg_mixWithOthers!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e);