wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 08:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Warn instead of assert if SPS value is incorrect

Browse source
This commit is contained in:
trav90 2018-07-20 22:41:34 -05:00 • committed by Roy Tam
commit 95089a84b6
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
media/libstagefright/binding/include/mp4_demuxer/ByteReader.h
View file

@ -63,7 +63,7 @@ public:
{ {
auto ptr = Read(1); auto ptr = Read(1);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return *ptr; return *ptr;
@ -75,7 +75,7 @@ public:
{ {
auto ptr = Read(2); auto ptr = Read(2);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return mozilla::BigEndian::readUint16(ptr); return mozilla::BigEndian::readUint16(ptr);
@ -85,7 +85,7 @@ public:
{ {
auto ptr = Read(2); auto ptr = Read(2);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return mozilla::LittleEndian::readInt16(ptr); return mozilla::LittleEndian::readInt16(ptr);
@ -95,7 +95,7 @@ public:
{ {
auto ptr = Read(3); auto ptr = Read(3);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return ptr[0] << 16 | ptr[1] << 8 | ptr[2]; return ptr[0] << 16 | ptr[1] << 8 | ptr[2];
@ -110,7 +110,7 @@ public:
{ {
auto ptr = Read(3); auto ptr = Read(3);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
int32_t result = int32_t(ptr[2] << 16 | ptr[1] << 8 | ptr[0]); int32_t result = int32_t(ptr[2] << 16 | ptr[1] << 8 | ptr[0]);
@ -126,7 +126,7 @@ public:
{ {
auto ptr = Read(4); auto ptr = Read(4);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return mozilla::BigEndian::readUint32(ptr); return mozilla::BigEndian::readUint32(ptr);
@ -136,7 +136,7 @@ public:
{ {
auto ptr = Read(4); auto ptr = Read(4);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return mozilla::BigEndian::readInt32(ptr); return mozilla::BigEndian::readInt32(ptr);
@ -146,7 +146,7 @@ public:
{ {
auto ptr = Read(8); auto ptr = Read(8);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return mozilla::BigEndian::readUint64(ptr); return mozilla::BigEndian::readUint64(ptr);
@ -156,7 +156,7 @@ public:
{ {
auto ptr = Read(8); auto ptr = Read(8);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to read data");
return 0; return 0;
} }
return mozilla::BigEndian::readInt64(ptr); return mozilla::BigEndian::readInt64(ptr);
@ -192,7 +192,7 @@ public:
{ {
auto ptr = Peek(1); auto ptr = Peek(1);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return *ptr; return *ptr;
@ -202,7 +202,7 @@ public:
{ {
auto ptr = Peek(2); auto ptr = Peek(2);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return mozilla::BigEndian::readUint16(ptr); return mozilla::BigEndian::readUint16(ptr);
@ -212,7 +212,7 @@ public:
{ {
auto ptr = Peek(3); auto ptr = Peek(3);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return ptr[0] << 16 | ptr[1] << 8 | ptr[2]; return ptr[0] << 16 | ptr[1] << 8 | ptr[2];
@ -227,7 +227,7 @@ public:
{ {
auto ptr = Peek(4); auto ptr = Peek(4);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return mozilla::BigEndian::readUint32(ptr); return mozilla::BigEndian::readUint32(ptr);
@ -237,7 +237,7 @@ public:
{ {
auto ptr = Peek(4); auto ptr = Peek(4);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return mozilla::BigEndian::readInt32(ptr); return mozilla::BigEndian::readInt32(ptr);
@ -247,7 +247,7 @@ public:
{ {
auto ptr = Peek(8); auto ptr = Peek(8);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return mozilla::BigEndian::readUint64(ptr); return mozilla::BigEndian::readUint64(ptr);
@ -257,7 +257,7 @@ public:
{ {
auto ptr = Peek(8); auto ptr = Peek(8);
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("Failed to peek data");
return 0; return 0;
} }
return mozilla::BigEndian::readInt64(ptr); return mozilla::BigEndian::readInt64(ptr);
@ -274,7 +274,7 @@ public:
const uint8_t* Seek(size_t aOffset) const uint8_t* Seek(size_t aOffset)
{ {
if (aOffset >= mLength) { if (aOffset >= mLength) {
MOZ_ASSERT(false); NS_WARNING("Seek failed");
return nullptr; return nullptr;
} }
@ -301,7 +301,7 @@ public:
{ {
auto ptr = Read(sizeof(T)); auto ptr = Read(sizeof(T));
if (!ptr) { if (!ptr) {
MOZ_ASSERT(false); NS_WARNING("ReadType failed");
return 0; return 0;
} }
return *reinterpret_cast<const T*>(ptr); return *reinterpret_cast<const T*>(ptr);
@ -312,6 +312,7 @@ public:
{ {
auto ptr = Read(aLength * sizeof(T)); auto ptr = Read(aLength * sizeof(T));
if (!ptr) { if (!ptr) {
NS_WARNING("ReadArray failed");
return false; return false;
} }
@ -325,6 +326,7 @@ public:
{ {
auto ptr = Read(aLength * sizeof(T)); auto ptr = Read(aLength * sizeof(T));
if (!ptr) { if (!ptr) {
NS_WARNING("ReadArray failed");
return false; return false;
} }