1307595 - Videos on my.xfinity.net do not play again

Status: VERIFIED FIXED

(Core :: Audio/Video: Playback, defect, P1)

Description

[Chris Pearce [:cpearce (Not reading bugmail)]]

Bug 1280829 fixed video playback at http://my.xfinity.com/video/ but it regressed again between 2016-09-28 and 2016-09-29.

Comment 1

[Chris Peterson [:cpeterson]]

[Tracking Requested - why for this release]:

This is an EME regression in Nightly 52 from bug 1280829.

Comment 2

[Chris Pearce [:cpearce (Not reading bugmail)]]

This is a regression from Bug 1300654, that landed with an incorrect merge conflict resolution which effectively backed out bug 1280829:

https://hg.mozilla.org/mozilla-central/rev/8eef5d2cc850#l8.108

Comment 3

[Chris Pearce [:cpearce (Not reading bugmail)]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ff26deb4079871216636252d24fa0dceb6b67c98
Bug 1307595 - Fixup bad merge conflict resolution from Bug 1300654/8eef5d2cc850. r=partial-backout

Comment 4

[Chris Pearce [:cpearce (Not reading bugmail)]]

(In reply to Chris Pearce (:cpearce) from comment #3)
> https://hg.mozilla.org/integration/mozilla-inbound/rev/
> ff26deb4079871216636252d24fa0dceb6b67c98
> Bug 1307595 - Fixup bad merge conflict resolution from Bug
> 1300654/8eef5d2cc850. r=partial-backout

Partial backout of the incorrect merge conflict resolution.

Comment 5

[Chris Pearce [:cpearce (Not reading bugmail)]]

Attachment: Fixup bad merge conflict resolution from Bug 1300654/8eef5d2cc850

8eef5d2cc850 in Bug 1300654 incorrectly resolved a merge conflict and backed
out part of the fix for Bug 1280829. Relanding.

MozReview-Commit-ID: 6DIkUrc9R4t

Comment 6

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 8797850 [details] [diff] [review]
Fixup bad merge conflict resolution from Bug 1300654/8eef5d2cc850

Approval Request Comment
[Feature/regressing bug #]: The build was broken on Aurora with the landing of bug 1299694. The fix for that is in bug 1300654, however that had a mismerge, so we also need this patch to fix the mismerge.
[User impact if declined]: Some videos which setup EME but don't actually use EME will not play.
[Describe test coverage new/current, TreeHerder]: We have a specific test to test this case, it's currently on aurroa.
[Risks and why]: Low, fixing a bad merge.
[String/UUID change made/needed]: None.

Comment 7

[Gerry Chang [:gchang]]

Comment on attachment 8797850 [details] [diff] [review]
Fixup bad merge conflict resolution from Bug 1300654/8eef5d2cc850

Fix a bad merge conflict. Take it in 51 aurora.

Comment 8

[Chris Pearce [:cpearce (Not reading bugmail)]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/af5a59737002cc4e8bb0f69acddb2583a9d952c6

Comment 9

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/ff26deb40798

Comment 10

[Ciprian Georgiu, Desktop QA]

This issue is verified fixed on latest Nightly/Aurora builds from 2016-10-10 on the following OSes:
- Windows 7 x64
- Ubuntu 16.04 x64 LTS
- Mac OS X 10.11.6