1022434 - [EME] Expose decryption data in MP4Samples

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

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

Our demuxer must expose the info we'll need to pass to the CDM in order to decrypt MP4 samples.

Comment 1

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

Specifics here: https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/cenc-format.html

Requirements:
* Each time one or more consecutive PSSH boxes are encountered, the demuxer should concatenate the PSSH boxes and signal the MP4Reader (via a callback say). The MP4Reader will then forward the PSSH boxes (the "initData") onto the EME/JS APIs. PSSH boxes that are not directly following each other should be sent in a separate callback.
* Each MP4Sample needs to either be flagged as non-encrypted, or if it is encrypted, it must have a 16 byte KeyId, and a list of SubsampleEntries. The SubsampleEntries are (roughly) a list of the form [($numClearBytes, $numEncryptedBytes), ...]. See the URL above for more details.

Comment 2

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

Attachment: Extract crypto information from MP4 demuxer

Comment 3

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

Attachment: Extract crypto information from MP4 demuxer

Comment 4

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

Comment on attachment 8441827 [details] [diff] [review]
Extract crypto information from MP4 demuxer

Review of attachment 8441827 [details] [diff] [review]:
-----------------------------------------------------------------

::: media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
@@ +25,5 @@
> +{
> +  PsshInfo() {}
> +  PsshInfo(PsshInfo&& aOther) : uuid(aOther.uuid), data(Move(aOther.data)) {}
> +  mozilla::Array<uint8_t, 16> uuid;
> +  mozilla::Vector<uint8_t> data;

It would good if you used nsTArray<uint8_t> consistently in the demuxer, it would make handling these easier.

@@ +61,5 @@
> +public:
> +  void Update(stagefright::sp<stagefright::MetaData>& aMetaData);
> +
> +  mozilla::Vector<size_t> plain_sizes;
> +  mozilla::Vector<size_t> encrypted_sizes;

If these values can't be larger than uint32_t, then it would be good if you could use uint32_t instead of size_t here, so that we can copy these inter-process around without having to worry about the sizeof(size_t).

Comment 5

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

Attachment: Patch: Extra stuff needed

I had to add this stuff on top of ajone's patch to make decryption work.

1. I had to increment the first subsample clear byte offset by the size of the ADTS header added to AAC samples when the ESDS to ADTS conversion is done, otherwise the decryption starts 7 and finishes bytes too early, so the decryption output is garbage.
2. The MPEG4Extractor doesn't extract audio config data for encrypted audio streams, only non encrypted ones. We want it to.

Comment 6

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

Attachment: Extract crypto information from MP4 demuxer

* * *
Bug 1022434 - "[EME] Expose decryption data in MP4Samples" []

Comment 7

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

Comment on attachment 8457748 [details] [diff] [review]
Extract crypto information from MP4 demuxer

Review of attachment 8457748 [details] [diff] [review]:
-----------------------------------------------------------------

::: media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
@@ +38,5 @@
> +    valid = DoUpdate(aMetaData);
> +  }
> +
> +  bool valid;
> +  mozilla::Vector<PsshInfo> pssh;

nsTArray here too please. There's no need to have two different container types used here.

Comment 8

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/588a03cd4e27

Comment 9

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

Backout:

https://hg.mozilla.org/integration/mozilla-inbound/rev/929cc6239d79

Comment 10

[Carsten Book [:Tomcat]]

bustage / reasion for the backout was https://tbpl.mozilla.org/php/getParsedLog.php?id=43992329&tree=Mozilla-Inbound

Comment 11

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

https://tbpl.mozilla.org/?tree=Try&rev=9862d14f9774

Comment 12

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/daa82439f77f

Comment 13

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

Backed out in https://hg.mozilla.org/integration/mozilla-inbound/rev/a9d2ca71f904 for build bustage: https://tbpl.mozilla.org/php/getParsedLog.php?id=44069480&tree=Mozilla-Inbound

Comment 14

[Anthony Jones (:ajones, :kentuckyfriedtakahe, :k17e)]

Here goes nothing....

https://hg.mozilla.org/integration/mozilla-inbound/rev/274a3f27b497

Comment 15

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/274a3f27b497