268 Commits

Author	SHA1	Message	Date
andrewlewis	07de4d1b2c	Handle ad skipping and content resume ... SKIPPED can't be handled as CONTENT_RESUME_REQUESTED because after skipping an ad there may be further ads to play in its ad group. Remove workaround for handling unexpected playAd without stopAd, as the player can instead recover when IMA sends CONTENT_RESUME_REQUESTED. This in turn fixes handling of the case where playAd is called twice but IMA expects only the first ad to play, when skipping a particular ad. (Add an ad tag where this occurs to internal samples.) Check whether a currently playing ad has been marked as played in ExoPlayerImplInternal, and handle this case as a seek. This ensures that any loaded ad periods are discarded in the case of CONTENT_RESUME_REQUESTED. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162610621	2017-07-21 11:23:10 +01:00
andrewlewis	554a399407	Switch to non-deprecated player constants ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162605429	2017-07-21 11:20:07 +01:00
andrewlewis	4658e619b3	Don't modify playWhenReady in ImaAdsLoader, except for playAd ... Store playWhenReady when playAd is called, and restore it if necessary when the content resumes. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162471616	2017-07-19 14:18:26 +01:00
andrewlewis	5e81cf99dc	Fix comment typo ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162368534	2017-07-19 14:17:04 +01:00
andrewlewis	41028fafba	Workaround late event delivery from IMA ... Remove assertions in pauseAd()/playAd(), which can fail if events are delivered after detaching the player, and log warnings instead. Use whether IMA has sent CONTENT_PAUSE_REQUESTED/CONTENT_RESUME_REQUESTED to determine whether we pause/resume the AdsManager, matching the IMA documentation. Also clean up use of player.isPlayingAd vs playingAd. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162364751	2017-07-19 14:14:26 +01:00
olly	387720d182	Allow module registrations + log player release ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162223981	2017-07-17 23:21:34 +01:00
andrewlewis	6041b0fe9c	Handle VAST loading errors by playing content ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162204327	2017-07-17 23:12:34 +01:00
andrewlewis	70c5bf7052	Support resuming ads ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161778560	2017-07-15 17:22:52 +01:00
andrewlewis	6b17e2cf3f	Fix handling of postrolls ... adsLoader.contentComplete was called twice which led to postrolls not seeing the STARTED event. Also make the onPositionDiscontinuity handler easier to follow by renaming variables, and remove the adGroupIndex field. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161537765	2017-07-12 18:19:41 +01:00
andrewlewis	0b58c33632	Handle detaching and reattaching the ads loader ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161526026	2017-07-12 18:17:13 +01:00
andrewlewis	ef56c9fe39	Move ad playback state into ImaAdsLoader ... Once background and resuming is supported, the ads loader will be kept when the player is destroyed and recreated. Move the state relating to the structure of ads and what ads have been loaded/played out of the media source and into the loader so the information is not lost when the source is released, in preparation for supporting background and resuming. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161503571	2017-07-12 18:11:39 +01:00
andrewlewis	1f815db367	Switch the IMA extension to use in-period ads ... This also adds support for seeking in periods with midroll ads. Remove Timeline.Period.isAd. Issue: #2617 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160510702	2017-06-30 16:35:14 +01:00
andrewlewis	675756d32d	Create MediaPeriods based on an identifier not an index ... This will allow MediaSources to provide MediaPeriods that correspond to ad breaks in a timeline period rather than content for a timeline period, in a future change. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160267841	2017-06-28 22:26:05 +01:00
andrewlewis	d9ea8f7143	Allow disabling the initial discontinuity on ClippingMediaSource ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=159227077	2017-06-22 19:57:23 +01:00
andrewlewis	58280f979e	Fix continueLoading in IMA deferred periods ... continueLoading may be called during preparation, but this is not handled correctly in the case where a deferred period doesn't have a source yet. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=158696539	2017-06-13 13:10:26 +01:00
andrewlewis	4e006a9616	Move positionUs parameter from createPeriod to prepare ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=158494794	2017-06-12 10:25:49 +01:00
andrewlewis	3daa7a084f	Shorten the player type ... The string is truncated to 20 character in IMA. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=157122929	2017-05-31 11:26:55 +01:00
andrewlewis	cdac347f8f	Open source IMA extension ... ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156312761	2017-05-17 21:24:44 +01:00