diff options
| author | Andreas Huber <andih@google.com> | 2011-01-06 11:26:54 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-01-06 12:42:33 -0800 |
| commit | b1787e3b95e96cc002377d41518cc183f64b58c4 (patch) | |
| tree | f6c8ed1d45603def7a587c5935c92a8629800585 /media/libstagefright/StagefrightMetadataRetriever.cpp | |
| parent | 4d785ae6b940c62610612baf9d24f1ee607a2714 (diff) | |
| download | frameworks_av-b1787e3b95e96cc002377d41518cc183f64b58c4.zip frameworks_av-b1787e3b95e96cc002377d41518cc183f64b58c4.tar.gz frameworks_av-b1787e3b95e96cc002377d41518cc183f64b58c4.tar.bz2 | |
Colorconverter may not support some src/dst bitmap configurations.
Let it return an appropriate error code instead of asserting.
Change-Id: I7fe0dfa169e1cbdecb04c5fcbe8501e73362d05e
related-to-bug: 3328212
Diffstat (limited to 'media/libstagefright/StagefrightMetadataRetriever.cpp')
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index 6331a63..8cd2998 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -238,7 +238,7 @@ static VideoFrame *extractVideoFrameWithCodecFlags( (OMX_COLOR_FORMATTYPE)srcFormat, OMX_COLOR_Format16bitRGB565); CHECK(converter.isValid()); - converter.convert( + err = converter.convert( (const uint8_t *)buffer->data() + buffer->range_offset(), width, height, crop_left, crop_top, crop_right, crop_bottom, @@ -252,6 +252,13 @@ static VideoFrame *extractVideoFrameWithCodecFlags( decoder->stop(); + if (err != OK) { + LOGE("Colorconverter failed to convert frame."); + + delete frame; + frame = NULL; + } + return frame; } |