forked from TheWidlarzGroup/react-native-video
-
Notifications
You must be signed in to change notification settings - Fork 25
Feature/ios drm support #5
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.
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
Open
danielmarino24i
wants to merge
325
commits into
master
Choose a base branch
from
feature/ios-drm-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 18 commits
Commits
Show all changes
325 commits
Select commit
Hold shift + click to select a range
bd8aa99
Changed the execution order of initializePlayerControl method in orde…
739a636
Fix so background audio from other apps can play when disableFocus is…
a55b7e5
Added details to readme and changelog
c361b79
Cleanup controls comment
cobarx 4080349
Code formatting cleanups for controls
cobarx e0fd69e
Merge pull request #1414 from IbrahimSulai/master
cobarx 77411f2
Rename failureRetryCount to minLoadRetryCount
cobarx 35250fa
Rename failureRetryCount to minLoadRetryCount
cobarx e4763c9
Rename failureRetryCount to minLoadRetryCount
cobarx 420d88d
Rename failureRetryCount to minLoadRetryCount
cobarx 2898f8c
Revert changes to video group index unset code
cobarx 4424774
Merge pull request #1448 from sridhard/master
cobarx 891add6
Throw an error instead of crashing app when video source is empty
laurent22 4dd1c73
improve props
d759e97
Merge branch 'feature/ios-drm-support' of github.com:24i/react-native…
e5cd51a
allow base64 cer response
d981f80
Update iOS readme
e7f1732
Merge branch 'rnv-master' into feature/ios-drm-support
801dce4
more readable java version for gradle
d8a2a9e
fix(ios): message sent to deallocated instance (#1482)
n1ru4l b448b30
fix: remove runtime warning by replacing `UIManager.RCTVideo` with `U…
nitishxyz 98eb7a3
Merge pull request #1478 from laurent22/master
cobarx 075dfba
Only check for an empty source
cobarx f69231f
Merge pull request #1246 from niklassaers/master
cobarx 02851bb
Display a warning when source is empty instead of throwing an error
cobarx 967dc3f
Add items for 4.4.0
cobarx d5fe47f
Merge pull request #1325 from Khan/pip
cobarx 80fb571
Picture in Picture iOS
cobarx dc75d23
fix: access on undefined variable
n1ru4l e1882fd
Merge pull request #1488 from react-native-community/fix-undefined-ui…
cobarx b5c2577
Fix undefined variable
cobarx f38b6f8
Version 4.4.0
cobarx fd16a93
Merge branch 'rnv-master' into feature/ios-drm-support-update
59b541c
fix merge
5b92ea0
remove extra curly brace
a7780f9
add missing curly after merge
300f283
Adding compileOptions Java 1.8 to build.gradle
reime005 decb56e
support for controls
CHaNGeTe f710df5
Merge pull request #1499 from NectGmbH/detox-10-android-build
cobarx 0ecba93
Merge branch 'master' of https://github.com/react-native-community/re…
cobarx 933bbae
Fix tvOS picture-in-picture compilation regression.
FullstackJack 5dbf7e2
Remove unused delegate in header file.
FullstackJack 9016d19
Merge pull request #1518 from FullstackJack/tvos-pip-regression
cobarx f162667
Merge branch 'master' of https://github.com/react-native-community/re…
cobarx c36a9cf
Merge pull request #1441 from nfb-onf/1319-fullscreen-rotation-issues
cobarx 6c39ac7
Merge branch 'master' of https://github.com/react-native-community/re…
cobarx 9df4f89
Merge branch 'rnv-master' into feature/ios-drm-support
CHaNGeTe 3d80bfd
Merge branch 'master' into bugfix/android-disablefocus-audio
KurtMakesWeb 2072793
Fix Android audio crash
Mrjaco12 da8a202
Make video auto track selection more readable
cobarx c12e9d8
Merge pull request #1529 from Mrjaco12/master
cobarx 03b7f8d
Merge branch 'master' of https://github.com/react-native-community/re…
cobarx 2fb1619
Android audio freeze fix
cobarx c30f246
Version 4.4.1
cobarx 0c87b78
Merge branch 'rnv-master' into feature/update-rnv-and-refactor-src
CHaNGeTe 9b5ced2
split DRM doc
CHaNGeTe 6e3e653
decoupling drm from source prop
CHaNGeTe 24730ed
ios preparePlayback
CHaNGeTe 5725c62
fix var name
CHaNGeTe 4d12d1d
drm prop
CHaNGeTe 4210929
test async
CHaNGeTe 3b952dc
preparing android
CHaNGeTe 1b680c2
fixes android
CHaNGeTe a22bf45
protect
CHaNGeTe ce4dedf
preparePlayback not needed
CHaNGeTe 8818b9a
revert
CHaNGeTe bdc599d
improvements shouldwait
CHaNGeTe a296fd9
extend doc
CHaNGeTe 2fc3b77
finishLoading DRM request when changing source
CHaNGeTe 2d0e402
fixes + unify indentation
CHaNGeTe 9fa4046
update readme with more scenarios
CHaNGeTe fccbc93
Adds onPlaybackRateChange to README
3989d73
react-native 0.59 support
yjb94 327d862
simplified logic
yjb94 d61a0d7
update other vulnerable
yjb94 88c5541
change stream fixes
91f200b
initializePlayback postDelayed
4efd0b5
Updates README description
5f42e0f
Update CHANGELOG.md
CHaNGeTe 4223f5d
Update CHANGELOG.md
CHaNGeTe e28ae17
Merge pull request #1578 from JoeM-RP/master
CHaNGeTe f6bc13e
Merge branch 'master' into feature/ios-drm-support
CHaNGeTe fb3175f
remove logs
a0bb083
Remove video layer when entering background correctly, both if using …
jensellfors 0a15579
Update CHANGELOG.md
jensellfors 112608c
RCTDirectEventBlock
32796e9
Change also RCTVideo.h
9c04bd2
Update CHANGELOG
4f36eb1
update for androidX
a96fa33
change minSdkVersion back to 16
3ddcba3
update readme
6d3936d
Fixes bug where poster and video was displayed simultaneously
jensellfors cc7db91
Improved handling of poster, fading it out on load
jensellfors 420332e
Implemented onReadyForDisplay for iOS when using controls
jensellfors b193baa
Hide poster at the right time ie in onReadyForDisplay
jensellfors e5b5bbe
Updated changelog and readme
jensellfors fcef441
Added onReadyForDisplay to web/dom
jensellfors a3b32ac
Merge pull request #1625 from 24i/feature/avoid-event-collision-3
CHaNGeTe 92f7459
Merge pull request #1614 from jenshandersson/master
CHaNGeTe 3762a32
remove duplicate ReactVideoPackage()
976ebcc
add readme to migrating to AndroidX
e5bc715
add read me
cad807d
Merge pull request #1592 from yjb94/master
CHaNGeTe e033fc4
update changelog for #1592
88d2aed
bump version
cb3e8c8
Merge branch 'release/4.4.2' into posterfix
jensellfors 6ea6583
Make sure to hide poster for Windows, even though onReadyForDisplay i…
jensellfors ed25b3f
fix read me
a203aea
pre androidX, upgrade to 28
3a7be63
Merge pull request #1627 from jenshandersson/posterfix
CHaNGeTe 1cd9796
remove duplicated line in example
438df8b
change dead code in example
4c4899b
Update DRM.md
CHaNGeTe a48fb69
Update DRM.md
CHaNGeTe c123d86
Update README.md
CHaNGeTe e6710f3
Update ReactExoplayerView.java
CHaNGeTe 6de06f1
Remove calls to [super observe] to fix crash
reaperdtme e9c978c
Update DRM.md
CHaNGeTe 7525d4a
Update Video.js
CHaNGeTe 6876179
Add #1646 to changelog
reaperdtme 4a3ea93
bring back super KVO with selector check
reaperdtme 3d2a58a
Fix memory leak when using AVPlayerViewController, make sure to relea…
jensellfors 666c26d
Updated changelog
jensellfors f484bd8
Merge branch 'rnv-master' into feature/ios-drm-support
2b067f1
Merge branch 'master' into bugfix/android-disablefocus-audio
KurtMakesWeb 22a3961
Merge pull request #1646 from kidcosmic/master
CHaNGeTe 7949c55
Merge pull request #1629 from vokhuyetOz/android-28
CHaNGeTe 6c7a0b4
changelog for #1629
9bc709f
Merge branch 'release/4.4.3' into master
CHaNGeTe 1433d16
Merge pull request #1647 from jenshandersson/master
CHaNGeTe d4313e2
bump version
8a8f215
chang maven to google
9dec6ae
Merge branch 'release/4.4.3' into bugfix/android-disablefocus-audio
CHaNGeTe be3c8b6
Merge pull request #1469 from KurtMakesWeb/bugfix/android-disablefocu…
CHaNGeTe 576273d
fix when controls & muted
61a72ad
update changelog
466c004
handle racing conditions when props are setted on exoplayer
40c7371
fix for setControls
eae487c
Merge branch 'release/4.4.3' into feature/fix-when-muted-and-controls
CHaNGeTe 77c9ad3
Merge pull request #1654 from 24i/feature/fix-when-muted-and-controls
CHaNGeTe cb3cff7
fix repeat
b7d1139
Merge pull request #1652 from react-native-community/release/4.4.3
CHaNGeTe cde2432
Merge branch 'rnv-master' into feature/handle-props-racing-conditions…
f60aff7
comment why postDelayed
f58ae34
remove extra whitespace
47e1630
remove rnpm
03114bc
Merge pull request #1655 from 24i/feature/handle-props-racing-conditi…
ashnfb 6bdbaec
4.4.4
95060d7
Update README.md
CHaNGeTe 66a85ae
Update README.md
CHaNGeTe 62ff44a
Update README.md
CHaNGeTe d748d17
Update MainApplication.java
CHaNGeTe 222adf5
remove matchingfallbacks in example
a45e857
Merge branch 'release/5.0.0' into update-androidx
CHaNGeTe 1fb07b5
Merge pull request #1626 from vokhuyetOz/update-androidx
CHaNGeTe 917f9cb
prepare 5.0.0 version
c29244b
Merge pull request #1683 from react-native-community/release/5.0.0
CHaNGeTe 88d3a4a
cpck androidx
6bd8f33
change minSdkVersion back to 16
45b806d
update readme
991fd59
add readme to migrating to AndroidX
e6e57ec
cpck readme
2f8746c
fix read me
a1679ef
chang maven to google
4f9f793
cpck
CHaNGeTe e38149b
ad platform installation to TOC
aad75d4
More update info
c38ff02
5.0.1
3012b81
Fixed Exoplayer doesn't work with mute=true #1696
andrewchae 2b9ddda
Updated README.md to include instructions for React Native 0.60 and a…
jhalvorson 7a9081d
Removing the call to observeValueForKeyPath:ofObject:change:context: …
923bc59
Updated CHANGELOG to reflect bug fix in PR 1720
e3782c4
added support for automaticallyWaitsToMinimizeStalling property on iOS
0a361d1
update readme
7615e5d
fix invert boolean property
4320b56
bumped version & updated changelog
008f5f0
fix formatting issues
0cfc732
fix formatting
d858bf7
Merge pull request #1690 from 24i/feature/androidx-cherry-pick
CHaNGeTe 0a2f7bd
Merge pull request #1715 from jhalvorson/master
CHaNGeTe 9272678
Merge branch 'master' into fix-NSInternalInconsistencyException
CHaNGeTe f66ca32
Merge pull request #1720 from nmarisi/fix-NSInternalInconsistencyExce…
CHaNGeTe cfcf6ce
Merge branch 'master' into master
CHaNGeTe 59be8b5
Merge pull request #1723 from blitzcrank/master
CHaNGeTe b954a4f
Merge pull request #1699 from andrewchae/mute
CHaNGeTe a86f316
changelog for #1696
9149346
Update issue templates
CHaNGeTe c90197b
Update bug_report.md
CHaNGeTe 461209f
Update bug_report.md
CHaNGeTe ed335f3
Fix indent and respect previous rate
CHaNGeTe 81cfd4e
Bring the basic example back to a runnable state
3e38f88
Remove Exoplayer deprecations
3d40deb
Update changelog with Exoplayer update (#1766)
benoitdion c9a248e
update package json version
78f1d29
update changelog version
4a8eea7
Add disableFocus to TOC
CHaNGeTe 040b171
fix typo in README
BaderSerhan 395b9b7
Merge master
d266b32
pass drm to exoplayer
03b2d4d
comment
62166a2
complete
725a15c
Merge branch 'react-native-video/master' into feature/ios-drm-support
b675e59
Merge pull request #1773 from BaderSerhan/master
CHaNGeTe b97663e
Clear progress messages on STATE_IDLE and STATE_BUFFERING (#1768)
benoitdion c7a8a25
change to DRMType
CHaNGeTe 8c40aaf
more params for onGetLicense (spcBase64 and contentId)
32748d5
base64 -> string
257be24
fix README about reportBandwidth (#1816)
set0gut1 a5bfba9
Fixes a situation when exiting fullscreen, where observed keypath val…
ashnfb fa20965
add try catch block around removal of observer keypaths on playerView…
ashnfb 2c5006a
Merge pull request #1827 from nfb-onf/fix-playerviewcontroller-keypat…
ashnfb 0df6676
Audio Poster issue fix (#1779)
9200dce
Add full screen support to Android Exoplayer (#1730)
IbrahimSulai 029b893
Bump version to 5.1.0-alpha
2738892
Fix readme grammar (#1888)
msal4 82c191d
Improve Android Audio Focus (#1897)
michaeltintiuc 4d0be29
Update changelog (#1913)
benoitdion 5fa4cdd
docs(video): fix bufferConfig property name (#1855)
peterblazejewicz fd8ac76
Fix play/pause regression after added fullscreen support. (#1916)
IbrahimSulai f0867d7
v5.1.0-alpha4
benoitdion 4f07aab
Bump javascript dependencies (#1914)
benoitdion a4fec8e
Add support for react-native Windows Cpp/WinRT (#1893)
ddalp 6d1a7be
Fix the `ref` sample code to remove the syntax error
bfaulk96 89b6d11
Update changelog
benoitdion 68dc152
v5.1.0-alpha5
benoitdion 91384d8
Don't set reactViewController view frame to whole screen (#1931)
marlonandrade 1ecb09a
Update onLoad event to include videoTracks info
cobarx b4582c6
add mixWithOthers prop
euharrison 4157a60
Update README.md
euharrison 052f49e
Update index.ios.js
euharrison cc2e9c4
Fix video dimensions for HLS streams
jensellfors 4bc2a72
Changelog
jensellfors 08c7aaa
Compare CGFloats instead
jensellfors c579d3c
Merge pull request #1992 from jenshandersson/feat/hlssize
jensellfors 2b33b9e
Merge remote-tracking branch 'upstream/master'
euharrison b8234f8
Update CHANGELOG.md
euharrison c438509
Merge pull request #1978 from euharrison/master
jensellfors 838b99a
Update CHANGELOG, alpha-6 hasn't been released yet
jensellfors 6bc25f1
Implement pending seek
jensellfors d6a7117
Merge pull request #1994 from jenshandersson/pendingseek
jensellfors e3009c6
Recommend npx pod-install for setup instructions
EvanBacon 0b914ef
Expose currentPlaybackTime when live stream video (#1944)
paramaggarwal c9096d1
[ios] Adaptive fullscreen in landscape by device orientation (#1862)
r0b0t3d 2dd5025
Revert "[ios] Adaptive fullscreen in landscape by device orientation …
jensellfors 7c8c613
Upgrade exoplayer to 2.11.4 (#2034)
miguelSWE f395bd1
Removed JS fullscreening for Android (#2013)
jensellfors 9c31948
Always set headers for iOS (#2014)
jensellfors 8962720
Support preventsDisplaySleepDuringVideoPlayback (#2019)
anderslemke dbf1a4e
Fix exoplayer aspect ratio update on source changes (#2053)
jefersondaniel 8c25828
Merge branch 'master' into feature/ios-drm-support
cobarx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -211,6 +211,27 @@ export default class Video extends Component { | |
| } | ||
| }; | ||
|
|
||
| _onGetLicense = (event) => { | ||
| if (this.props.source && this.props.source.drm && this.props.source.drm.getLicense instanceof Function) { | ||
| const data = event.nativeEvent; | ||
| if (data && data.spc) { | ||
| const getLicenseOverride = this.props.source.drm.getLicense(data.spc, this.props); | ||
| const getLicensePromise = Promise.resolve(getLicenseOverride); // Handles both scenarios, getLicenseOverride being a promise and not. | ||
| getLicensePromise.then((result => { | ||
| if (result !== undefined) { | ||
| NativeModules.VideoManager.setLicenseResult(result, findNodeHandle(this._root)); | ||
| } else { | ||
| NativeModules.VideoManager.setLicenseError('Empty license result', findNodeHandle(this._root)); | ||
| } | ||
| })).catch((error) => { | ||
| NativeModules.VideoManager.setLicenseError(error, findNodeHandle(this._root)); | ||
| }); | ||
| } | ||
| } else { | ||
| NativeModules.VideoManager.setLicenseError("No enough data for license override", findNodeHandle(this._root)); | ||
|
||
| } | ||
| } | ||
|
|
||
| render() { | ||
| const resizeMode = this.props.resizeMode; | ||
| const source = resolveAssetSource(this.props.source) || {}; | ||
|
|
@@ -269,8 +290,9 @@ export default class Video extends Component { | |
| onPlaybackRateChange: this._onPlaybackRateChange, | ||
| onAudioFocusChanged: this._onAudioFocusChanged, | ||
| onAudioBecomingNoisy: this._onAudioBecomingNoisy, | ||
| onGetLicense: this._onGetLicense, | ||
| }); | ||
|
|
||
|
||
| const posterStyle = { | ||
| ...StyleSheet.absoluteFillObject, | ||
| resizeMode: this.props.posterResizeMode || 'contain', | ||
|
|
@@ -398,9 +420,6 @@ Video.propTypes = { | |
| }), | ||
| stereoPan: PropTypes.number, | ||
| rate: PropTypes.number, | ||
| drmUrl: PropTypes.string, | ||
| drmName: PropTypes.string, | ||
| drmHeader: PropTypes.object, | ||
| playInBackground: PropTypes.bool, | ||
| playWhenInactive: PropTypes.bool, | ||
| ignoreSilentSwitch: PropTypes.oneOf(['ignore', 'obey']), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if there's no
dataordata.spc?