diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-25 17:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 17:22:26 +0200 |
| commit | b43a5fbedae602d0025ffdda8929e5bee9e2ca0b (patch) | |
| tree | 4566da0a75a4f09dce9cccdc092307a7170eadc8 /dom/media | |
| parent | b565e2c227af2cbcbc3573c1f874fd9e809bd5fe (diff) | |
| parent | e2464b1391b986a19e8560108070c16a08ed62a8 (diff) | |
| download | UXP-b43a5fbedae602d0025ffdda8929e5bee9e2ca0b.tar UXP-b43a5fbedae602d0025ffdda8929e5bee9e2ca0b.tar.gz UXP-b43a5fbedae602d0025ffdda8929e5bee9e2ca0b.tar.lz UXP-b43a5fbedae602d0025ffdda8929e5bee9e2ca0b.tar.xz UXP-b43a5fbedae602d0025ffdda8929e5bee9e2ca0b.zip | |
Merge pull request #383 from trav90/media-work
[MSE] Correct ADTS frame size calculation
Diffstat (limited to 'dom/media')
| -rw-r--r-- | dom/media/mediasource/ContainerParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dom/media/mediasource/ContainerParser.cpp b/dom/media/mediasource/ContainerParser.cpp index 594d8fc26..4ae37d7e9 100644 --- a/dom/media/mediasource/ContainerParser.cpp +++ b/dom/media/mediasource/ContainerParser.cpp @@ -588,8 +588,8 @@ public: return false; } size_t header_length = have_crc ? 9 : 7; - size_t data_length = (((*aData)[3] & 0x03) << 11) || - (((*aData)[4] & 0xff) << 3) || + size_t data_length = (((*aData)[3] & 0x03) << 11) | + (((*aData)[4] & 0xff) << 3) | (((*aData)[5] & 0xe0) >> 5); uint8_t frames = ((*aData)[6] & 0x03) + 1; MOZ_ASSERT(frames > 0); |