1050060 - Clean up MP4 range calculation

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

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

The MP4 range calculation has become messy and requires some clean up.

Comment 1

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

Attachment: Clean up MP4 index fields

Comment 2

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

Attachment: Update index off main thread

Comment 3

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

Attachment: Optimise MP4 range calculation

Comment 4

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

Attachment: Fix MP4 range pinning

Comment 5

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

Attachment: Fix 64 bit file offset in MP4 reader

Comment 6

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

Attachment: Fix MP4 range pinning

Comment 7

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

Attachment: Optimise MP4 range calculation

Comment 8

[Edwin Flores [inactive from 2016-12-01] [:eflores] [:edwin]]

Comment on attachment 8468998 [details] [diff] [review]
Clean up MP4 index fields

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

::: media/libstagefright/binding/Box.cpp
@@ +57,5 @@
>      mChildOffset = headerRange.mEnd;
>    }
>  
>    MediaByteRange boxRange(aOffset, aOffset + size);
> +  if (mChildOffset > boxRange.mEnd ||

Since boxRange is [), this should be |>=|.

Comment 9

[Edwin Flores [inactive from 2016-12-01] [:eflores] [:edwin]]

Comment on attachment 8469060 [details] [diff] [review]
Optimise MP4 range calculation

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

::: media/libstagefright/binding/MoofParser.cpp
@@ +56,5 @@
>  MoofParser::ParseMdia(Box& aBox, Tkhd& aTkhd)
>  {
>    for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
>      if (box.IsType("mdhd")) {
> +      if (aTkhd.mTrackId == aTkhd.mTrackId) {

um...?

Comment 10

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

https://tbpl.mozilla.org/?tree=Try&rev=7b3c3a7d6345

Comment 11

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

https://hg.mozilla.org/integration/mozilla-inbound/rev/cf9300710e32
https://hg.mozilla.org/integration/mozilla-inbound/rev/2bbd13167a53
https://hg.mozilla.org/integration/mozilla-inbound/rev/51a77113e637
https://hg.mozilla.org/integration/mozilla-inbound/rev/131fee00a393
https://hg.mozilla.org/integration/mozilla-inbound/rev/f38f848af906

Comment 13

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/cf9300710e32
https://hg.mozilla.org/mozilla-central/rev/2bbd13167a53
https://hg.mozilla.org/mozilla-central/rev/51a77113e637
https://hg.mozilla.org/mozilla-central/rev/131fee00a393
https://hg.mozilla.org/mozilla-central/rev/f38f848af906