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

[video-player] add support for content uris as urls #1813

Merged
cyanglaz merged 2 commits into from
Sep 4, 2019
Merged

[video-player] add support for content uris as urls #1813

cyanglaz merged 2 commits into from
Sep 4, 2019

Conversation

@udnisap
Copy link
Contributor

@udnisap udnisap commented Jul 8, 2019 •
edited
Loading

#1706 Description

content:// uris will be routed from DefaultDataSourceFactory in Android

Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

  • [ x] I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • My PR includes unit or integration tests for all changed/updated/fixed behaviors (See Contributor Guide).
  • All existing and new tests are passing.
  • I updated/added relevant documentation (doc comments with ///).
  • The analyzer (flutter analyze) does not report any problems on my PR.
  • I read and followed the Flutter Style Guide.
  • The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy.
  • I updated CHANGELOG.md to add a description of the change.
  • I signed the CLA.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

Does your PR require plugin users to manually update their apps to accommodate your change?

  • Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
  • No, this is not a breaking change.

@udnisap
Copy link
Contributor Author

udnisap commented Jul 8, 2019 •
edited
Loading

Does it make sense to flip the condition here

plugins/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java

Lines 84 to 94 in f54590f

if (isFileOrAsset(uri)) {
dataSourceFactory = new DefaultDataSourceFactory(context, "ExoPlayer");
} else {
dataSourceFactory =
new DefaultHttpDataSourceFactory(
"ExoPlayer",
null,
DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
true);
}

to use DefaultDataSourceFactory by default and DefaultHttpDataSourceFactory on http or https?

cyanglaz
cyanglaz suggested changes Jul 18, 2019
View reviewed changes
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution. The fix looks good. Just need to update the changelog and pubspec with a new version.

@cyanglaz
Copy link
Contributor

cyanglaz commented Jul 18, 2019 •
edited
Loading

Does it make sense to flip the condition here

plugins/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java

Lines 84 to 94 in f54590f

if (isFileOrAsset(uri)) {
dataSourceFactory = new DefaultDataSourceFactory(context, "ExoPlayer");
} else {
dataSourceFactory =
new DefaultHttpDataSourceFactory(
"ExoPlayer",
null,
DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
true);
}

to use DefaultDataSourceFactory by default and DefaultHttpDataSourceFactory on http or https?

I think you are right. We can get rid of the isFileOrAsset and make it something like isHTTP. Do you mind to do this change?

@udnisap udnisap force-pushed the support-for-content-uris-in-video-player-plugin branch from d5e1fd7 to 391e3b2 Compare July 29, 2019 08:26
@udnisap udnisap requested a review from iskakaushik as a code owner July 29, 2019 08:26
cyanglaz
cyanglaz reviewed Aug 6, 2019
View reviewed changes
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

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

Did another review, overall it looks good. Left some comments!
And the CI seems not happy with the formatting, could you also fix that?

@cyanglaz cyanglaz self-assigned this Aug 6, 2019
@udnisap udnisap force-pushed the support-for-content-uris-in-video-player-plugin branch 2 times, most recently from df91885 to d9f6841 Compare August 15, 2019 19:26
@udnisap
[video-player] add support for content uris as urls
74d2c21 
-- all http and https uris will be routed to DefaultHttpDataSourceFactory
-- everything else will use DefaultMediaSource
@udnisap udnisap force-pushed the support-for-content-uris-in-video-player-plugin branch from d9f6841 to 74d2c21 Compare August 15, 2019 19:49
iskakaushik
iskakaushik approved these changes Aug 15, 2019
View reviewed changes
Copy link
Contributor

@iskakaushik iskakaushik left a comment

Choose a reason for hiding this comment

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

LGTM

@udnisap
Copy link
Contributor Author

udnisap commented Sep 3, 2019

@cyanglaz does everything looks good to you?

cyanglaz
cyanglaz approved these changes Sep 3, 2019
View reviewed changes
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

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

LGTM

@cyanglaz cyanglaz merged commit 163bbec into flutter:master Sep 4, 2019
noelmansour pushed a commit to snowble/plugins that referenced this pull request Nov 13, 2019
@udnisap
[video-player] add support for content uris as urls (flutter#1813)
f7d9f5a 
content:// uris will be routed from DefaultDataSourceFactory in Android
mormih pushed a commit to mormih/plugins that referenced this pull request Nov 17, 2019
@udnisap @mormih
[video-player] add support for content uris as urls (flutter#1813)
69d08dd 
content:// uris will be routed from DefaultDataSourceFactory in Android
sungmin-park pushed a commit to sungmin-park/flutter-plugins that referenced this pull request Dec 17, 2019
@udnisap
[video-player] add support for content uris as urls (flutter#1813)
aa4fd5b 
content:// uris will be routed from DefaultDataSourceFactory in Android
@udnisap udnisap deleted the support-for-content-uris-in-video-player-plugin branch December 19, 2019 18:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@iskakaushik iskakaushik iskakaushik approved these changes

@cyanglaz cyanglaz cyanglaz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cyanglaz cyanglaz

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@udnisap @cyanglaz @iskakaushik @googlebot