diff options
| author | James Dong <jdong@google.com> | 2011-02-28 11:27:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-28 11:27:09 -0800 |
| commit | 6fa83fbad4bf779c6677d525d434f0738726465e (patch) | |
| tree | 99e9ee8cd5ef6b7d652faae11e5d9771d59d33ab /media | |
| parent | 3911a720270fc0326accfa4a3df427a649a45487 (diff) | |
| parent | ff98976e40459e910cfd1a7693bb08cff4dabd42 (diff) | |
| download | frameworks_av-6fa83fbad4bf779c6677d525d434f0738726465e.zip frameworks_av-6fa83fbad4bf779c6677d525d434f0738726465e.tar.gz frameworks_av-6fa83fbad4bf779c6677d525d434f0738726465e.tar.bz2 | |
Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/colorconversion/ColorConverter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp index d518c97..3b92e5d 100644 --- a/media/libstagefright/colorconversion/ColorConverter.cpp +++ b/media/libstagefright/colorconversion/ColorConverter.cpp @@ -187,7 +187,7 @@ status_t ColorConverter::convertCbYCrY( status_t ColorConverter::convertYUV420Planar( const BitmapParams &src, const BitmapParams &dst) { - if (!((dst.mWidth & 3) == 0 + if (!((dst.mWidth & 1) == 0 && (src.mCropLeft & 1) == 0 && src.cropWidth() == dst.cropWidth() && src.cropHeight() == dst.cropHeight())) { |