1320026 - Support 'tenc' box for rust mp4 parser

Status: RESOLVED FIXED

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

Description

[Alfredo Yang (:alfredo)]

It is required for eme function [1].


[1] http://searchfox.org/mozilla-central/rev/feef954874af9a18168e61a75629a9406b847c53/media/libstagefright/binding/DecoderData.cpp#122

Comment 1

[Alfredo Yang (:alfredo)]

Attachment: Bug 1320026 - support crypto info in rust mp4 parser.

Review commit: https://reviewboard.mozilla.org/r/98144/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/98144/

Comment 2

[Alfredo Yang (:alfredo)]

Parser PR, https://github.com/mozilla/mp4parse-rust/pulls

Comment 3

[Matthew Gregan [:kinetik]]

Comment on attachment 8817959 [details]
Bug 1320026 - support crypto info in rust mp4 parser.

https://reviewboard.mozilla.org/r/98144/#review98478

::: media/libstagefright/binding/DecoderData.cpp:197
(Diff revision 1)
>  #ifdef MOZ_RUST_MP4PARSE
> +static void
> +UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
> +                         const mp4parser_sinf_info& aSinf)
> +{
> +  if (!!aSinf.is_encrypted) {

!= 0 is clearer in this case, I think

::: media/libstagefright/binding/MP4Metadata.cpp:307
(Diff revision 1)
>        MOZ_DIAGNOSTIC_ASSERT(audioRust->mRate == audio->mRate);
>        MOZ_DIAGNOSTIC_ASSERT(audioRust->mChannels == audio->mChannels);
>        MOZ_DIAGNOSTIC_ASSERT(audioRust->mBitDepth == audio->mBitDepth);
>        // TODO: These fields aren't implemented in the Rust demuxer yet.
>        //MOZ_DIAGNOSTIC_ASSERT(audioRust->mProfile != audio->mProfile);
> -      //MOZ_DIAGNOSTIC_ASSERT(audioRust->mExtendedProfile != audio->mExtendedProfile);
> +      MOZ_DIAGNOSTIC_ASSERT(audioRust->mExtendedProfile != audio->mExtendedProfile);

Oops, this should be ==, please fix the commented bit above too

Comment 4

[Alfredo Yang (:alfredo)]

Comment on attachment 8817959 [details]
Bug 1320026 - support crypto info in rust mp4 parser.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/98144/diff/1-2/

Comment 5

[Alfredo Yang (:alfredo)]

this also needs this PR.

https://github.com/mozilla/mp4parse-rust/pull/49

Comment 6

[Alfredo Yang (:alfredo)]

Comment on attachment 8817959 [details]
Bug 1320026 - support crypto info in rust mp4 parser.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/98144/diff/2-3/

Comment 7

[Alfredo Yang (:alfredo)]

Comment on attachment 8817959 [details]
Bug 1320026 - support crypto info in rust mp4 parser.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/98144/diff/3-4/

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/3664eb1f7737
support crypto info in rust mp4 parser. r=kinetik

Comment 9

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

https://hg.mozilla.org/mozilla-central/rev/3664eb1f7737