diff options
| author | trav90 <travawine@palemoon.org> | 2018-05-25 08:28:17 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-05-25 08:28:17 -0500 |
| commit | e2464b1391b986a19e8560108070c16a08ed62a8 (patch) | |
| tree | 4566da0a75a4f09dce9cccdc092307a7170eadc8 /dom/media/mediasource | |
| parent | b565e2c227af2cbcbc3573c1f874fd9e809bd5fe (diff) | |
| download | UXP-e2464b1391b986a19e8560108070c16a08ed62a8.tar UXP-e2464b1391b986a19e8560108070c16a08ed62a8.tar.gz UXP-e2464b1391b986a19e8560108070c16a08ed62a8.tar.lz UXP-e2464b1391b986a19e8560108070c16a08ed62a8.tar.xz UXP-e2464b1391b986a19e8560108070c16a08ed62a8.zip | |
[MSE] Correct ADTS frame size calculation
This should be bitwise OR rather than logical OR, which just returns 1.
Diffstat (limited to 'dom/media/mediasource')
| -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); |