3354 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bachinger	ab277675a1	set mediaSession flags properly and keep queue in sync when timeline changes ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164774783	2017-08-10 13:21:47 +01:00
aquilescanta	0d11ebdf2d	Run optimage to optimize demo app's PNGs ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164726319	2017-08-10 13:20:26 +01:00
olly	b6b84839ed	Add ErrorMessageProvider to util package ... It's needed in multiple places. MediaSessionConnector uses it today. Our leanback connector will also use it. Maybe SimpleExoPlayerView should use one too, to show the message to the user when an error occurs. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164720020	2017-08-10 13:19:12 +01:00
olly	55d1abaa21	Document usage of the RTMP extension ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164706135	2017-08-10 13:17:13 +01:00
olly	ebbf9f635b	Fix minor Javadoc error ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164706078	2017-08-10 13:15:51 +01:00
olly	98d50c13ef	Clean up terminology for MediaSession extension ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164705750	2017-08-10 13:14:27 +01:00
olly	91adba5d1b	Minimal change to expose segment indices in DefaultDashChunkSource ... Issue: #3037 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164614478	2017-08-10 13:12:49 +01:00
Oliver Woodman	ceb1e87219	Revert "Add possibility of forcing a specific license URL in HttpMediaDrmCallback" ... This reverts commit 768a73b377d842aeefdd466cf7a5904f858cc8a4.	2017-08-10 12:57:06 +01:00
ojw28	3f31cec742	Merge pull request #3136 from jeoliva/force-drm-license-url ... Add possibility of forcing a specific license URL in HttpMediaDrmCallback	2017-08-08 17:21:37 +01:00
olly	026ac1d69b	Don't release a surface until we've stopped using it ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164596062	2017-08-08 16:44:08 +01:00
olly	b8c6ed6701	Bump to 2.5.1 ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164595874	2017-08-08 16:42:42 +01:00
olly	072788c88a	Support building of version 1 PSSH atoms ... Issue: #3138 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164590835	2017-08-08 15:50:58 +01:00
olly	24bf2aa0e2	Support clip end greater than the child's duration ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164577001	2017-08-08 15:49:45 +01:00
olly	e45345e21b	Fix missing source info refresh notification ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164502580	2017-08-08 15:48:22 +01:00
aquilescanta	38360f6267	Add support for HLS's FRAME-RATE attribute ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164482135	2017-08-08 15:46:53 +01:00
Oliver Woodman	b96d7eee6e	Merge branch 'release-v2' into dev-v2	2017-08-07 14:48:27 +01:00
Oliver Woodman	0425ff6d41	Merge branch 'dev-v2' into release-v2	2017-08-07 14:45:41 +01:00
Oliver Woodman	deb9b301b2	Merge branch 'dev-v2-r2.5.0' into release-v2	2017-08-07 14:33:22 +01:00
Oliver Woodman	7a109f7411	Merge branch 'release-v2' into dev-v2-r2.5.0	2017-08-07 14:30:53 +01:00
eguven	e713ddc22d	Disable test coverage again ... https://issuetracker.google.com/issues/37019591 causes local variables can't be found while debugging. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164449443	2017-08-07 13:43:03 +01:00
olly	f88149385a	Avoid rollover calculating sample offsets ... I considered using Util.scaleLargeTimestamp for this, but given sample offsets are relative and should always be small (<<1s), it really shouldn't be necessary. Issue: #3139 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164443795	2017-08-07 13:42:57 +01:00
olly	15bcdf3b71	Don't use TextureView's SurfaceTexture unless available ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434943	2017-08-07 13:42:48 +01:00
olly	df05195f5f	Set correct Content-Type for ClearKey requests ... Issue: #3138 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434858	2017-08-07 13:42:42 +01:00
olly	1f66f30ccd	Clean up extension READMEs ... Issue: #1157 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434768	2017-08-07 13:42:35 +01:00
olly	13a580fdbc	Finalize r2.5.0 ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434615	2017-08-07 13:42:28 +01:00
eguven	427411befb	Disable test coverage again ... https://issuetracker.google.com/issues/37019591 causes local variables can't be found while debugging. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164449443	2017-08-07 13:38:15 +01:00
olly	87012f22f2	Avoid rollover calculating sample offsets ... I considered using Util.scaleLargeTimestamp for this, but given sample offsets are relative and should always be small (<<1s), it really shouldn't be necessary. Issue: #3139 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164443795	2017-08-07 11:59:25 +01:00
olly	865d74cde0	Don't use TextureView's SurfaceTexture unless available ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434943	2017-08-07 11:57:01 +01:00
olly	05179b4f1b	Set correct Content-Type for ClearKey requests ... Issue: #3138 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434858	2017-08-07 11:55:42 +01:00
olly	d4c45861f4	Clean up extension READMEs ... Issue: #1157 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434768	2017-08-07 11:54:21 +01:00
olly	9ecec92b56	Finalize r2.5.0 ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434615	2017-08-07 11:53:04 +01:00
aquilescanta	b0da1f98f6	Remove unnecessary API level check in PlayerActivity of the demo app ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164271226	2017-08-04 18:16:12 +01:00
andrewlewis	b407b19296	Log IMA LOG AdEvent ad data ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164267555	2017-08-04 18:16:06 +01:00
andrewlewis	fdcee8f1b6	Fix detection of postroll when seeking to duration ... Also mark all ads as played when the postroll plays, in the case the player is backgrounded then resumed and the user seeks back. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164262738	2017-08-04 18:15:49 +01:00
olly	ba46e472af	Fix playing local content after permission granted. ... After maybeRequestReadExternalStoragePermission and the subsequent granting of the permission, the media source would never be created. I can't see a case where initializePlayer shouldn't create a new MediaSource, so I've just removed the condition. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164260074	2017-08-04 18:13:52 +01:00
andrewlewis	42eaee3db8	Update playbackInfo even if there's no period holder ... This is required to correctly update the playbackInfo.periodId when seeking close to the end of a period with ads, as the seek operation leads to an immediate source info refresh when midroll ads are marked as played. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164257099	2017-08-04 18:13:44 +01:00
andrewlewis	c72278d23e	Separate handling of oldTimeline == null case ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164254522	2017-08-04 18:13:37 +01:00
aquilescanta	f502171e5f	Remove unnecessary API level check in PlayerActivity of the demo app ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164271226	2017-08-04 18:01:12 +01:00
andrewlewis	c449bae51a	Log IMA LOG AdEvent ad data ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164267555	2017-08-04 18:00:00 +01:00
andrewlewis	287b999723	Fix detection of postroll when seeking to duration ... Also mark all ads as played when the postroll plays, in the case the player is backgrounded then resumed and the user seeks back. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164262738	2017-08-04 17:58:32 +01:00
olly	c28ebf10f7	Fix playing local content after permission granted. ... After maybeRequestReadExternalStoragePermission and the subsequent granting of the permission, the media source would never be created. I can't see a case where initializePlayer shouldn't create a new MediaSource, so I've just removed the condition. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164260074	2017-08-04 17:57:02 +01:00
andrewlewis	576f362912	Update playbackInfo even if there's no period holder ... This is required to correctly update the playbackInfo.periodId when seeking close to the end of a period with ads, as the seek operation leads to an immediate source info refresh when midroll ads are marked as played. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164257099	2017-08-04 17:55:35 +01:00
andrewlewis	08e58af6e7	Separate handling of oldTimeline == null case ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164254522	2017-08-04 17:54:01 +01:00
olly	1203b53406	Decrease number of Vpx input buffers ... I think they're excessively sized also, but changing that is a little more risky. And we should look at investigating the input buffer size for all our decoder extensions, rather than just this one. Issue: #3120 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164234087	2017-08-04 12:54:41 +01:00
olly	6bf967263b	Remove dead sample link ... Issue: #3135 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164138761	2017-08-04 12:54:34 +01:00
olly	de1f538e14	Bump version ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164126494	2017-08-04 12:54:27 +01:00
andrewlewis	5fbb58c62f	Take into account init data size for input buffer size ... Issue: #2900 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164110904	2017-08-04 12:54:20 +01:00
olly	c2049ba1a7	Fix some lint warnings ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164105662	2017-08-04 12:54:14 +01:00
olly	587704a2a0	Add some missing @param Javadoc to extensions ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164105607	2017-08-04 12:54:08 +01:00
olly	838c4414eb	Fix targetSdkVersion to be consistent with gradle builds ... The manifest value is always overridden in gradle builds, so this is for internal builds only. The value should be the same (i.e. 25!). Also fix IMA build to force the right support library version, attempt 2! ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164103183	2017-08-04 12:54:02 +01:00