diff options
| author | Andreas Huber <andih@google.com> | 2011-03-18 11:40:20 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-03-18 11:40:20 -0700 |
| commit | b8fdab2b709980650945cd04d8d000c619390e75 (patch) | |
| tree | d4310bae7b0bfa1fe8a9022f57ac75bc6ac5d935 /media/libstagefright/codecs/avc | |
| parent | 6ed6f6d82d7b9f8d82f3ab3a9f718a0e59ffa476 (diff) | |
| download | frameworks_base-b8fdab2b709980650945cd04d8d000c619390e75.zip frameworks_base-b8fdab2b709980650945cd04d8d000c619390e75.tar.gz frameworks_base-b8fdab2b709980650945cd04d8d000c619390e75.tar.bz2 | |
Signal a runtime error if the AVCDecoder encounters an invalid frame.
Instead of asserting.
Change-Id: I4c89f5fef92e5adb11d1ea6b564a67e99fc96595
related-to-bug: 4109304
Diffstat (limited to 'media/libstagefright/codecs/avc')
| -rw-r--r-- | media/libstagefright/codecs/avc/dec/AVCDecoder.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp b/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp index 5bbba35..490129f 100644 --- a/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp +++ b/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp @@ -534,7 +534,8 @@ status_t AVCDecoder::read( default: { LOGE("Should not be here, unknown nalType %d", nalType); - CHECK(!"Should not be here"); + + err = ERROR_MALFORMED; break; } } |