Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95601ba2 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 44e15c44: Some playable/decodable streams have been found in the wild that... 

am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.

Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
parents 1213d6f3 e5d6df40

media/libstagefright/OMXCodec.cpp

+3 −1
Original line number Diff line number Diff line
@@ -351,7 +351,9 @@ sp<OMXCodec> OMXCodec::Create( 
        uint8_t profile = ptr[1];

        uint8_t level = ptr[3];



        CHECK((ptr[4] >> 2) == 0x3f);  // reserved

        // There is decodable content out there that fails the following

        // assertion, let's be lenient for now...

        // CHECK((ptr[4] >> 2) == 0x3f);  // reserved



        size_t lengthSize = 1 + (ptr[4] & 3);