diff options
| author | Andreas Huber <andih@google.com> | 2011-01-06 13:26:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 13:26:51 -0800 |
| commit | 1932fef94a14d0a1b86213864a2bcc690e0faa5e (patch) | |
| tree | 4bdd44f22782447b3bd30f9273634ad1476d1ffc /include | |
| parent | cc9585fb38534f0c882cf58d3db9038198beb1b1 (diff) | |
| parent | c0dbe3a4457020bdba6ce311d383faecb7950a90 (diff) | |
| download | frameworks_base-1932fef94a14d0a1b86213864a2bcc690e0faa5e.zip frameworks_base-1932fef94a14d0a1b86213864a2bcc690e0faa5e.tar.gz frameworks_base-1932fef94a14d0a1b86213864a2bcc690e0faa5e.tar.bz2 | |
Merge "Colorconverter may not support some src/dst bitmap configurations." into honeycomb
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 &); |