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

Commit e8b0ace5 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Handle malformed audio packets received during RTSP stream switching"... 

Merge "Handle malformed audio packets received during RTSP stream switching" am: 6e9e6336 am: 5be284fc
am: 11999d96

* commit '11999d96':
  Handle malformed audio packets received during RTSP stream switching
parents 808e3d55 11999d96

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

+4 −1
Original line number Diff line number Diff line
@@ -379,7 +379,10 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) { 
                unsigned muxSlotLengthBytes = 0;

                unsigned tmp;

                do {

                    CHECK_LT(offset, buffer->size());

                    if (offset >= buffer->size()) {

                        ALOGW("Malformed buffer received");

                        return out;

                    }

                    tmp = ptr[offset++];

                    muxSlotLengthBytes += tmp;

                } while (tmp == 0xff);