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 /include | |
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 'include')
-rw-r--r-- | include/media/stagefright/ColorConverter.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/media/stagefright/ColorConverter.h b/include/media/stagefright/ColorConverter.h index 2b61f58..2ae8a5b 100644 --- a/include/media/stagefright/ColorConverter.h +++ b/include/media/stagefright/ColorConverter.h @@ -21,6 +21,7 @@ #include <sys/types.h> #include <stdint.h> +#include <utils/Errors.h> #include <OMX_Video.h> @@ -32,7 +33,7 @@ struct ColorConverter { bool isValid() const; - void convert( + status_t convert( const void *srcBits, size_t srcWidth, size_t srcHeight, size_t srcCropLeft, size_t srcCropTop, @@ -63,16 +64,16 @@ private: uint8_t *initClip(); - void convertCbYCrY( + status_t convertCbYCrY( const BitmapParams &src, const BitmapParams &dst); - void convertYUV420Planar( + status_t convertYUV420Planar( const BitmapParams &src, const BitmapParams &dst); - void convertQCOMYUV420SemiPlanar( + status_t convertQCOMYUV420SemiPlanar( const BitmapParams &src, const BitmapParams &dst); - void convertYUV420SemiPlanar( + status_t convertYUV420SemiPlanar( const BitmapParams &src, const BitmapParams &dst); ColorConverter(const ColorConverter &); |