Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[video_player] Updated Pigeon version #4726

Merged
gaaclarke merged 6 commits into from
Feb 15, 2022
Merged

[video_player] Updated Pigeon version #4726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84f0aad
[video_player] Updated Pigeon version
gaaclarke Feb 3, 2022
ee7ce00
updated android
gaaclarke Feb 3, 2022
d9a9307
updated the changelog messages
gaaclarke Feb 3, 2022
c702665
[video_player] updated nullability in pigeon files
gaaclarke Feb 4, 2022
32bb3f8
made httpheaders not null
gaaclarke Feb 14, 2022
df6a66a
removed nil check and switched away from init
gaaclarke Feb 14, 2022
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
14 changes: 10 additions & 4 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 @@ -419,16 +419,22 @@ public void setFormatHint(@Nullable String setterArg) {
this.formatHint = setterArg;
}

private @Nullable Map<String, String> httpHeaders;
private @NonNull Map<String, String> httpHeaders;

public @Nullable Map<String, String> getHttpHeaders() {
public @NonNull Map<String, String> getHttpHeaders() {
return httpHeaders;
}

public void setHttpHeaders(@Nullable Map<String, String> setterArg) {
public void setHttpHeaders(@NonNull Map<String, String> setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"httpHeaders\" is null.");
}
this.httpHeaders = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private CreateMessage() {}

public static class Builder {
private @Nullable String asset;

Expand Down Expand Up @@ -460,7 +466,7 @@ public static class Builder {

private @Nullable Map<String, String> httpHeaders;

public @NonNull Builder setHttpHeaders(@Nullable Map<String, String> setterArg) {
public @NonNull Builder setHttpHeaders(@NonNull Map<String, String> setterArg) {
this.httpHeaders = setterArg;
return this;
}
Expand Down
3 changes: 2 additions & 1 deletion ...ideo_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.content.Context;
import android.net.Uri;
import android.view.Surface;
import androidx.annotation.NonNull;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.Format;
Expand Down Expand Up @@ -64,7 +65,7 @@ final class VideoPlayer {
TextureRegistry.SurfaceTextureEntry textureEntry,
String dataSource,
String formatHint,
Map<String, String> httpHeaders,
@NonNull Map<String, String> httpHeaders,
VideoPlayerOptions options) {
this.eventChannel = eventChannel;
this.textureEntry = textureEntry;
Expand Down
28 changes: 19 additions & 9 deletions packages/video_player/video_player_android/lib/src/android_video_player.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,35 @@ class AndroidVideoPlayer extends VideoPlayerPlatform {

@override
Future<int?> create(DataSource dataSource) async {
final CreateMessage message = CreateMessage();

String? asset;
String? packageName;
String? uri;
String? formatHint;
Map<String, String> httpHeaders = <String, String>{};
switch (dataSource.sourceType) {
case DataSourceType.asset:
message.asset = dataSource.asset;
message.packageName = dataSource.package;
asset = dataSource.asset;
packageName = dataSource.package;
break;
case DataSourceType.network:
message.uri = dataSource.uri;
message.formatHint = _videoFormatStringMap[dataSource.formatHint];
message.httpHeaders = dataSource.httpHeaders;
uri = dataSource.uri;
formatHint = _videoFormatStringMap[dataSource.formatHint];
httpHeaders = dataSource.httpHeaders;
break;
case DataSourceType.file:
message.uri = dataSource.uri;
uri = dataSource.uri;
break;
case DataSourceType.contentUri:
message.uri = dataSource.uri;
uri = dataSource.uri;
break;
}
final CreateMessage message = CreateMessage(
asset: asset,
packageName: packageName,
uri: uri,
httpHeaders: httpHeaders,
formatHint: formatHint,
);

final TextureMessage response = await _api.create(message);
return response.textureId;
Expand Down
8 changes: 4 additions & 4 deletions packages/video_player/video_player_android/lib/src/messages.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ class CreateMessage {
this.uri,
this.packageName,
this.formatHint,
this.httpHeaders,
required this.httpHeaders,
});

String? asset;
String? uri;
String? packageName;
String? formatHint;
Map<String?, String?>? httpHeaders;
Map<String?, String?> httpHeaders;

Object encode() {
final Map<Object?, Object?> pigeonMap = <Object?, Object?>{};
Expand All @@ -164,8 +164,8 @@ class CreateMessage {
uri: pigeonMap['uri'] as String?,
packageName: pigeonMap['packageName'] as String?,
formatHint: pigeonMap['formatHint'] as String?,
httpHeaders: (pigeonMap['httpHeaders'] as Map<Object?, Object?>?)
?.cast<String?, String?>(),
httpHeaders: (pigeonMap['httpHeaders'] as Map<Object?, Object?>?)!
.cast<String?, String?>(),
);
}
}
Expand Down
3 changes: 2 additions & 1 deletion packages/video_player/video_player_android/pigeons/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ class PositionMessage {
}

class CreateMessage {
CreateMessage({required this.httpHeaders});
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Feb 14, 2022

Choose a reason for hiding this comment

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

Why is this required, rather than defaulting to an empty collection?

Copy link
Member Author

@gaaclarke gaaclarke Feb 14, 2022

Choose a reason for hiding this comment

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

Pigeon demands there be no logic here, it doesn't generate code for initialization.

Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Feb 14, 2022

Choose a reason for hiding this comment

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

Filed flutter/flutter#98448

String? asset;
String? uri;
String? packageName;
String? formatHint;
Map<String?, String?>? httpHeaders;
Map<String?, String?> httpHeaders;
}

class MixWithOthersMessage {
Expand Down
6 changes: 3 additions & 3 deletions packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler>
@property(nonatomic, readonly) BOOL isInitialized;
- (instancetype)initWithURL:(NSURL *)url
frameUpdater:(FLTFrameUpdater *)frameUpdater
httpHeaders:(NSDictionary<NSString *, NSString *> *)headers;
httpHeaders:(nonnull NSDictionary<NSString *, NSString *> *)headers;
@end

static void *timeRangeContext = &timeRangeContext;
Expand All @@ -57,7 +57,7 @@ - (instancetype)initWithURL:(NSURL *)url
@implementation FLTVideoPlayer
- (instancetype)initWithAsset:(NSString *)asset frameUpdater:(FLTFrameUpdater *)frameUpdater {
NSString *path = [[NSBundle mainBundle] pathForResource:asset ofType:nil];
return [self initWithURL:[NSURL fileURLWithPath:path] frameUpdater:frameUpdater httpHeaders:nil];
return [self initWithURL:[NSURL fileURLWithPath:path] frameUpdater:frameUpdater httpHeaders:@{}];
}

- (void)addObservers:(AVPlayerItem *)item {
Expand Down Expand Up @@ -177,7 +177,7 @@ - (void)createVideoOutputAndDisplayLink:(FLTFrameUpdater *)frameUpdater {

- (instancetype)initWithURL:(NSURL *)url
frameUpdater:(FLTFrameUpdater *)frameUpdater
httpHeaders:(NSDictionary<NSString *, NSString *> *)headers {
httpHeaders:(nonnull NSDictionary<NSString *, NSString *> *)headers {
NSDictionary<NSString *, id> *options = nil;
if (headers != nil && [headers count] != 0) {
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Feb 14, 2022

Choose a reason for hiding this comment

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

The headers != nil can be removed.

(Technically it could have been removed either way since [nil count] is zero, but it should definitely be removed now.)

Copy link
Member Author

@gaaclarke gaaclarke Feb 14, 2022

Choose a reason for hiding this comment

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

done

options = @{@"AVURLAssetHTTPHeaderFieldsKey" : headers};
Expand Down
6 changes: 4 additions & 2 deletions packages/video_player/video_player_avfoundation/ios/Classes/messages.g.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,18 @@ NS_ASSUME_NONNULL_BEGIN
@end

@interface FLTCreateMessage : NSObject
/// `init` unavailable to enforce nonnull fields, see the `make` class method.
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithAsset:(nullable NSString *)asset
uri:(nullable NSString *)uri
packageName:(nullable NSString *)packageName
formatHint:(nullable NSString *)formatHint
httpHeaders:(nullable NSDictionary<NSString *, NSString *> *)httpHeaders;
httpHeaders:(NSDictionary<NSString *, NSString *> *)httpHeaders;
@property(nonatomic, copy, nullable) NSString *asset;
@property(nonatomic, copy, nullable) NSString *uri;
@property(nonatomic, copy, nullable) NSString *packageName;
@property(nonatomic, copy, nullable) NSString *formatHint;
@property(nonatomic, strong, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
@property(nonatomic, strong) NSDictionary<NSString *, NSString *> *httpHeaders;
@end

@interface FLTMixWithOthersMessage : NSObject
Expand Down
3 changes: 2 additions & 1 deletion packages/video_player/video_player_avfoundation/ios/Classes/messages.g.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ + (instancetype)makeWithAsset:(nullable NSString *)asset
uri:(nullable NSString *)uri
packageName:(nullable NSString *)packageName
formatHint:(nullable NSString *)formatHint
httpHeaders:(nullable NSDictionary<NSString *, NSString *> *)httpHeaders {
httpHeaders:(NSDictionary<NSString *, NSString *> *)httpHeaders {
FLTCreateMessage *pigeonResult = [[FLTCreateMessage alloc] init];
pigeonResult.asset = asset;
pigeonResult.uri = uri;
Expand All @@ -188,6 +188,7 @@ + (FLTCreateMessage *)fromMap:(NSDictionary *)dict {
pigeonResult.packageName = GetNullableObject(dict, @"packageName");
pigeonResult.formatHint = GetNullableObject(dict, @"formatHint");
pigeonResult.httpHeaders = GetNullableObject(dict, @"httpHeaders");
NSAssert(pigeonResult.httpHeaders != nil, @"");
return pigeonResult;
}
- (NSDictionary *)toMap {
Expand Down
28 changes: 19 additions & 9 deletions packages/video_player/video_player_avfoundation/lib/src/avfoundation_video_player.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,35 @@ class AVFoundationVideoPlayer extends VideoPlayerPlatform {

@override
Future<int?> create(DataSource dataSource) async {
final CreateMessage message = CreateMessage();

String? asset;
String? packageName;
String? uri;
String? formatHint;
Map<String, String> httpHeaders = <String, String>{};
switch (dataSource.sourceType) {
case DataSourceType.asset:
message.asset = dataSource.asset;
message.packageName = dataSource.package;
asset = dataSource.asset;
packageName = dataSource.package;
break;
case DataSourceType.network:
message.uri = dataSource.uri;
message.formatHint = _videoFormatStringMap[dataSource.formatHint];
message.httpHeaders = dataSource.httpHeaders;
uri = dataSource.uri;
formatHint = _videoFormatStringMap[dataSource.formatHint];
httpHeaders = dataSource.httpHeaders;
break;
case DataSourceType.file:
message.uri = dataSource.uri;
uri = dataSource.uri;
break;
case DataSourceType.contentUri:
message.uri = dataSource.uri;
uri = dataSource.uri;
break;
}
final CreateMessage message = CreateMessage(
asset: asset,
packageName: packageName,
uri: uri,
httpHeaders: httpHeaders,
formatHint: formatHint,
);

final TextureMessage response = await _api.create(message);
return response.textureId;
Expand Down
8 changes: 4 additions & 4 deletions packages/video_player/video_player_avfoundation/lib/src/messages.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ class CreateMessage {
this.uri,
this.packageName,
this.formatHint,
this.httpHeaders,
required this.httpHeaders,
});

String? asset;
String? uri;
String? packageName;
String? formatHint;
Map<String?, String?>? httpHeaders;
Map<String?, String?> httpHeaders;

Object encode() {
final Map<Object?, Object?> pigeonMap = <Object?, Object?>{};
Expand All @@ -164,8 +164,8 @@ class CreateMessage {
uri: pigeonMap['uri'] as String?,
packageName: pigeonMap['packageName'] as String?,
formatHint: pigeonMap['formatHint'] as String?,
httpHeaders: (pigeonMap['httpHeaders'] as Map<Object?, Object?>?)
?.cast<String?, String?>(),
httpHeaders: (pigeonMap['httpHeaders'] as Map<Object?, Object?>?)!
.cast<String?, String?>(),
);
}
}
Expand Down
3 changes: 2 additions & 1 deletion packages/video_player/video_player_avfoundation/pigeons/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ class PositionMessage {
}

class CreateMessage {
CreateMessage({required this.httpHeaders});
String? asset;
String? uri;
String? packageName;
String? formatHint;
Map<String?, String?>? httpHeaders;
Map<String?, String?> httpHeaders;
}

class MixWithOthersMessage {
Expand Down