From b1787e3b95e96cc002377d41518cc183f64b58c4 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 6 Jan 2011 11:26:54 -0800 Subject: 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 --- include/media/stagefright/ColorConverter.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'include') 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 #include +#include #include @@ -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 &); -- cgit v1.1