1815546 - Windows Media Foundation CDM build bustage from bug 1810817

Status: RESOLVED FIXED

(Thunderbird :: Upstream Synchronization, defect)

Description

[Rob Lemley [:rjl]]

Bug 1810817 added PlayReady CDM support to Firefox. The change broke Thunderbird builds.

CDMs and EME are related. As Thunderbird does not support Encrypted Media Extension DRM stuff, the PlayReady CDM should not be enabled either.

The current configure code will enable PlayReady even if --enable-eme is not set, as is the case for Thunderbird.

Discussion in #media on Matrix:

Rob Lemley (:rjl)
Hi, quick question regarding bug 1810817 - would it make sense to only enable MOZ_MF_CDM when --enable-eme is set?
jhlin
Rob Lemley (:rjl): Yes, you're right. I'll open a bug and change it.

This bug is for a temporary fix in c-c until the proper fix from jhlin is complete.

Comment 1

[Rob Lemley [:rjl]]

Attachment: Bug 1815546 - Explicitly disable WMF CDM support until fixed upstream. r=#thunderbird-reviewers

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/c3c22250b89c
Explicitly disable WMF CDM support until fixed upstream. r=aleca

Comment 3

[Rob Lemley [:rjl]]

When bug 1815553 is fixed, the patch in comment 2 can be backed out and this bug can be closed.

Comment 4

[ISHIKAWA, Chiaki]

Maybe I am not doing something right, but after refreshing my local M-C and C-C trees, I get
the following error. during local configure.

Traceback (most recent call last):
  File "/NEW-SSD/NREF-COMM-CENTRAL/mozilla/configure.py", line 343, in <module>
    sys.exit(main(sys.argv))
             ^^^^^^^^^^^^^^
  File "/NEW-SSD/NREF-COMM-CENTRAL/mozilla/configure.py", line 126, in main
    sandbox.run(os.path.join(os.path.dirname(__file__), "moz.configure"))
  File "/NEW-SSD/NREF-COMM-CENTRAL/mozilla/python/mozbuild/mozbuild/configure/__init__.py", line 525, in run
    raise ConfigureError(
mozbuild.configure.ConfigureError: `--enable-mf-cdm`, emitted from `/NEW-SSD/NREF-COMM-CENTRAL/mozilla/comm/mail/moz.configure` line 18, is unknown.
*** Fix above errors and then restart with "./mach build"

If I remove

imply_option("--enable-mf-cdm", False)

from mail/moz.configure , configure proceeds without errors.

Comment 5

[Magnus Melin [:mkmelin]]

Make sure you're all rebased latest

Comment 6

[mac198442]

Seems with recent mozilla-central landings, --disable-mf-cdm builds fail. I am temporarily building without this, but with --enable-eme=widevine if and only if the os is windows.

Comment 7

[mac198442]

In bug 1816060 it was suggested to change the workaround here to just imply_option("--enable-wmf", False) would be a better fix here.

Comment 8

[mac198442]

So, it would seem replacing the:
imply_option("--enable-mf-cdm", False)
wit:
imply_option("--enable-wmf", False)

would be a better workaround while we are awaiting the mozilla-central folks to get their act together.

Comment 9

[mac198442]

And that did not build either failed with:

C:/Users/xxx/mozilla/seamonkey/mozilla/dom/html/HTMLMediaElement.cpp(32,10): fatal error: 'MP4Decoder.h' file not found
83:54.20 #include "MP4Decoder.h"
83:54.20 ^~~~~~~~~~~~~~

I do not think it is possible to build comm-central with latest mozilla-central under windows at all.

Comment 10

[Rob Lemley [:rjl]]

(In reply to mac198442 from comment #6)

Seems with recent mozilla-central landings, --disable-mf-cdm builds fail. I am temporarily building without this, but with --enable-eme=widevine if and only if the os is windows.

That will be fixed in bug 1816060. Hopefully by Monday.

(In reply to mac198442 from comment #9)

I do not think it is possible to build comm-central with latest mozilla-central under windows at all.

Unfortunately this is the case. You can always manually backout the commits from bug 1815367 in m-c until a fix lands.

Comment 11

[mac198442]

It seems that with the patches currently on autoland this should work after the next merge to mozilla-central. However, the mf-cdm option has been changed to wmf-cdm, so the workaround here will need to be updated.

Comment 12

[Rob Lemley [:rjl]]

Attachment: Bug 1815546 - Rename "--enable-mf-cdm" to "--enable-wmf-cdm". r=#thunderbird-reviewers

Comment 13

[Rob Lemley [:rjl]]

Regarding the patch in comment 12...

Ideally, it won't be needed and the patch from comment 2 gets backed out. However, it is the weekend and version bump and stuff happens Monday. The patches needed for Thunderbird to remove this line from moz.configure completely may not make it to mozilla-central in time.

So, land comment 12 when the option rename in D169401 (currently on autoland as a3b9784c27fb) gets merged. I'll handle a full backout before I do the version bump/beta merge if everything looks good on Monday.

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/b0499c162541
Rename "--enable-mf-cdm" to "--enable-wmf-cdm". rs=bustage-fix

Comment 15

[Rob Lemley [:rjl]]

Attachment: Backed out 2 changesets (Bug 1815546) fixed upstream. r=#thunderbird-reviewers

Backed out changeset b0499c162541 (bug 1815546)
Backed out changeset c3c22250b89c (bug 1815546)

Comment 16

[Rob Lemley [:rjl]]

RE: comment 15 patch - Backs out the other two on this bug. It can land once once D169140 from bug 1815553 is on mozilla-central. (Tested this morning with a local build.)

Comment 17

[Pulsebot]

Backout by [e-mail]:
https://hg.mozilla.org/comm-central/rev/4693353052a2
Backed out 2 changesets fixed upstream. r=freaktechnik