Skip to content

MUXに送信するパラメータを追加 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 26, 2025
Merged

MUXに送信するパラメータを追加 #14

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c26ea7
fix: 送信するパラメータを追加
Jul 25, 2025
f06b94f
chore: exoplayerからmedia3に移行
Aug 12, 2025
7505a83
feat: Androidからもviewer_plan_statusを送れるようにした
Aug 12, 2025
c3c2cae
refactor: デバッグコードを削除
Aug 12, 2025
1f6bd0f
refactor: 不要なコードの削除
Aug 12, 2025
56915cf
refactor: 不要なコードを削除
Aug 12, 2025
26db06f
refactor: lint崩れを修正
Aug 19, 2025
f3de554
refactor: reformat
Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions packages/video_player/video_player_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
## 2.5.0

* Migrates ExoPlayer to Media3-ExoPlayer 1.3.1.

## 2.4.17

* Revert Impeller support.

## 2.4.16

* [Supports Impeller](https://docs.flutter.dev/release/breaking-changes/android-surface-plugins).

## 2.4.15

* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
* Removes support for apps using the v1 Android embedding.

## 2.4.14

* Calls `onDestroy` instead of `initialize` in onDetachedFromEngine.

## 2.4.13

* Updates minSdkVersion to 19.
* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.

## 2.4.12

* Updates compileSdk version to 34.
* Adds error handling for `BehindLiveWindowException`, which may occur upon live-video playback failure.

## 2.4.11

* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
* Fixes new lint warnings.

## 2.4.10

* Adds pub topics to package metadata.
* Updates minimum supported SDK version to Flutter 3.7/Dart 2.19.

## 2.4.9

* Bumps ExoPlayer version to 2.18.7.
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ command in this directory:
flutter pub upgrade
flutter pub run pigeon --input pigeons/messages.dart
# git commit your changes so that your working environment is clean
(cd ../../../; ./script/tool_runner.sh format --clang-format=clang-format-7)
dart run ../../../script/tool/bin/flutter_plugin_tools.dart format --current-package
```

If you update pigeon itself and want to test the changes here,
Expand Down
17 changes: 9 additions & 8 deletions packages/video_player/video_player_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,21 @@ android {
}

dependencies {
def exoplayer_version = "2.18.7"
def media3_version = "1.4.1"
def picasso_version = "2.8"
implementation "com.google.android.exoplayer:exoplayer-core:${exoplayer_version}"
implementation "com.google.android.exoplayer:exoplayer-hls:${exoplayer_version}"
implementation "com.google.android.exoplayer:exoplayer-dash:${exoplayer_version}"
implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${exoplayer_version}"
implementation "com.google.android.exoplayer:exoplayer-ui:${exoplayer_version}"
implementation "com.google.android.exoplayer:extension-mediasession:${exoplayer_version}"
implementation "androidx.media3:media3-exoplayer:${media3_version}"
implementation "androidx.media3:media3-exoplayer-hls:${media3_version}"
implementation "androidx.media3:media3-exoplayer-dash:${media3_version}"
implementation "androidx.media3:media3-exoplayer-smoothstreaming:${media3_version}"
implementation "androidx.media3:media3-ui:${media3_version}"
implementation "androidx.media3:media3-session:${media3_version}"
implementation "com.squareup.picasso:picasso:${picasso_version}"
implementation "androidx.media:media:1.7.0"
testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.mockito:mockito-inline:5.0.0'
testImplementation 'org.robolectric:robolectric:4.10.3'
api 'com.mux.stats.sdk.muxstats:MuxExoPlayer_r2_16_1:2.7.2'
api 'com.mux.stats.sdk.muxstats:data-media3-at_1_4:1.8.0'
}

testOptions {
Expand Down
92 changes: 62 additions & 30 deletions ...r/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ ArrayList<Object> toList() {
static @NonNull TextureMessage fromList(@NonNull ArrayList<Object> list) {
TextureMessage pigeonResult = new TextureMessage();
Object textureId = list.get(0);
pigeonResult.setTextureId((textureId == null) ? null : ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
pigeonResult.setTextureId(
(textureId == null)
? null
: ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
return pigeonResult;
}
}
Expand Down Expand Up @@ -175,7 +178,10 @@ ArrayList<Object> toList() {
static @NonNull LoopingMessage fromList(@NonNull ArrayList<Object> list) {
LoopingMessage pigeonResult = new LoopingMessage();
Object textureId = list.get(0);
pigeonResult.setTextureId((textureId == null) ? null : ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
pigeonResult.setTextureId(
(textureId == null)
? null
: ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
Object isLooping = list.get(1);
pigeonResult.setIsLooping((Boolean) isLooping);
return pigeonResult;
Expand Down Expand Up @@ -248,7 +254,10 @@ ArrayList<Object> toList() {
static @NonNull VolumeMessage fromList(@NonNull ArrayList<Object> list) {
VolumeMessage pigeonResult = new VolumeMessage();
Object textureId = list.get(0);
pigeonResult.setTextureId((textureId == null) ? null : ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
pigeonResult.setTextureId(
(textureId == null)
? null
: ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
Object volume = list.get(1);
pigeonResult.setVolume((Double) volume);
return pigeonResult;
Expand Down Expand Up @@ -321,7 +330,10 @@ ArrayList<Object> toList() {
static @NonNull PlaybackSpeedMessage fromList(@NonNull ArrayList<Object> list) {
PlaybackSpeedMessage pigeonResult = new PlaybackSpeedMessage();
Object textureId = list.get(0);
pigeonResult.setTextureId((textureId == null) ? null : ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
pigeonResult.setTextureId(
Copy link

@ryo0511 ryo0511 Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

badge
lintが崩れてるので直してください

(textureId == null)
? null
: ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
Object speed = list.get(1);
pigeonResult.setSpeed((Double) speed);
return pigeonResult;
Expand Down Expand Up @@ -394,9 +406,15 @@ ArrayList<Object> toList() {
static @NonNull PositionMessage fromList(@NonNull ArrayList<Object> list) {
PositionMessage pigeonResult = new PositionMessage();
Object textureId = list.get(0);
pigeonResult.setTextureId((textureId == null) ? null : ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
pigeonResult.setTextureId(
(textureId == null)
? null
: ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId));
Object position = list.get(1);
pigeonResult.setPosition((position == null) ? null : ((position instanceof Integer) ? (Integer) position : (Long) position));
pigeonResult.setPosition(
(position == null)
? null
: ((position instanceof Integer) ? (Integer) position : (Long) position));
return pigeonResult;
}
}
Expand Down Expand Up @@ -1066,6 +1084,16 @@ public void setVideoCdn(@Nullable String setterArg) {
this.videoCdn = setterArg;
}

private @Nullable String viewerPlanStatus;

public @Nullable String getViewerPlanStatus() {
return viewerPlanStatus;
}

public void setViewerPlanStatus(@Nullable String setterArg) {
this.viewerPlanStatus = setterArg;
}

public static final class Builder {

private @Nullable Long textureId;
Expand Down Expand Up @@ -1215,6 +1243,13 @@ public static final class Builder {
return this;
}

private @Nullable String viewerPlanStatus;

public @NonNull Builder setViewerPlanStatus(@Nullable String setterArg) {
this.viewerPlanStatus = setterArg;
return this;
}

public @NonNull MuxConfigMessage build() {
MuxConfigMessage pigeonReturn = new MuxConfigMessage();
pigeonReturn.setTextureId(textureId);
Expand All @@ -1238,6 +1273,7 @@ public static final class Builder {
pigeonReturn.setVideoProducer(videoProducer);
pigeonReturn.setVideoEncodingVariant(videoEncodingVariant);
pigeonReturn.setVideoCdn(videoCdn);
pigeonReturn.setViewerPlanStatus(viewerPlanStatus);
return pigeonReturn;
}
}
Expand Down Expand Up @@ -1266,6 +1302,7 @@ ArrayList<Object> toList() {
toListResult.add(videoProducer);
toListResult.add(videoEncodingVariant);
toListResult.add(videoCdn);
toListResult.add(viewerPlanStatus);
return toListResult;
}

Expand Down Expand Up @@ -1313,6 +1350,8 @@ ArrayList<Object> toList() {
pigeonResult.setVideoEncodingVariant((String) videoEncodingVariant);
Object videoCdn = list.get(20);
pigeonResult.setVideoCdn((String) videoCdn);
Object viewerPlanStatus = list.get(21);
pigeonResult.setViewerPlanStatus((String) viewerPlanStatus);
return pigeonResult;
}
}
Expand Down Expand Up @@ -1418,8 +1457,12 @@ public interface AndroidVideoPlayerApi {
static @NonNull MessageCodec<Object> getCodec() {
return AndroidVideoPlayerApiCodec.INSTANCE;
}
/**Sets up an instance of `AndroidVideoPlayerApi` to handle messages through the `binaryMessenger`. */
static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVideoPlayerApi api) {
/**
* Sets up an instance of `AndroidVideoPlayerApi` to handle messages through the
* `binaryMessenger`.
*/
static void setup(
@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVideoPlayerApi api) {
{
BasicMessageChannel<Object> channel =
new BasicMessageChannel<>(
Expand All @@ -1431,8 +1474,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.initialize();
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
Copy link

@ryo0511 ryo0511 Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

他の箇所もlint崩れてるので直してください

Copy link
Author

@lefirea lefirea Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

一通り直しました
これで大丈夫だと思います

ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1455,8 +1497,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
TextureMessage output = api.create(msgArg);
wrapped.add(0, output);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1479,8 +1520,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.dispose(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1503,8 +1543,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.setLooping(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1527,8 +1566,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.setVolume(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1551,8 +1589,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.setPlaybackSpeed(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1575,8 +1612,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.play(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1599,8 +1635,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
PositionMessage output = api.position(msgArg);
wrapped.add(0, output);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1623,8 +1658,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.seekTo(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1647,8 +1681,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.pause(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand All @@ -1671,8 +1704,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable AndroidVid
try {
api.setMixWithOthers(msgArg);
wrapped.add(0, null);
}
catch (Throwable exception) {
} catch (Throwable exception) {
ArrayList<Object> wrappedError = wrapError(exception);
wrapped = wrappedError;
}
Expand Down
Loading