summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/colorconversion
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-07-17 16:25:03 -0700
committerChong Zhang <chz@google.com>2015-07-17 17:14:29 -0700
commit505aab41c0e8e79a49d4506344fcd9d220d5965b (patch)
tree4f1389e7281cbd3973f6c4af7c15dd4ff164d849 /media/libstagefright/colorconversion
parenta8dc93efc9be8d5e37c7473601fb8654804188c1 (diff)
downloadframeworks_av-505aab41c0e8e79a49d4506344fcd9d220d5965b.zip
frameworks_av-505aab41c0e8e79a49d4506344fcd9d220d5965b.tar.gz
frameworks_av-505aab41c0e8e79a49d4506344fcd9d220d5965b.tar.bz2
fix soft renderer rotation
bug: 13222807 Change-Id: I6f6f417422d3a18117b594670bb23e3019d449bb
Diffstat (limited to 'media/libstagefright/colorconversion')
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index d22451b..e92c192 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -38,7 +38,8 @@ static int ALIGN(int x, int y) {
return (x + y - 1) & ~(y - 1);
}
-SoftwareRenderer::SoftwareRenderer(const sp<ANativeWindow> &nativeWindow)
+SoftwareRenderer::SoftwareRenderer(
+ const sp<ANativeWindow> &nativeWindow, int32_t rotation)
: mColorFormat(OMX_COLOR_FormatUnused),
mConverter(NULL),
mYUVMode(None),
@@ -50,7 +51,8 @@ SoftwareRenderer::SoftwareRenderer(const sp<ANativeWindow> &nativeWindow)
mCropRight(0),
mCropBottom(0),
mCropWidth(0),
- mCropHeight(0) {
+ mCropHeight(0),
+ mRotationDegrees(rotation) {
}
SoftwareRenderer::~SoftwareRenderer() {
@@ -181,7 +183,7 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) {
int32_t rotationDegrees;
if (!format->findInt32("rotation-degrees", &rotationDegrees)) {
- rotationDegrees = 0;
+ rotationDegrees = mRotationDegrees;
}
uint32_t transform;
switch (rotationDegrees) {