summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/colorconversion
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2014-09-05 14:25:39 -0700
committerRonghua Wu <ronghuawu@google.com>2014-09-11 10:33:59 -0700
commita694dd0ce2caaf921f7bc894df87a5d52594b4eb (patch)
tree9ad4a1cbb711e3b2f81365e6163367c4cfb4b02b /media/libstagefright/colorconversion
parent971873179cf202ad8aa1ddc4ec737795f1e03ce3 (diff)
downloadframeworks_av-a694dd0ce2caaf921f7bc894df87a5d52594b4eb.zip
frameworks_av-a694dd0ce2caaf921f7bc894df87a5d52594b4eb.tar.gz
frameworks_av-a694dd0ce2caaf921f7bc894df87a5d52594b4eb.tar.bz2
stagefright: add adaptive playback support to SoftMPEG decoder.
This covers both MPEG4 and H263 adaptive playback. Bug: 17326758 Change-Id: I80a67b7f3ceab05e792f0a459439a8274bd78e20
Diffstat (limited to 'media/libstagefright/colorconversion')
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index cc98da0..1899b40 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -65,8 +65,8 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) {
CHECK(format->findInt32("color-format", &colorFormatNew));
int32_t widthNew, heightNew;
- CHECK(format->findInt32("width", &widthNew));
- CHECK(format->findInt32("height", &heightNew));
+ CHECK(format->findInt32("stride", &widthNew));
+ CHECK(format->findInt32("slice-height", &heightNew));
int32_t cropLeftNew, cropTopNew, cropRightNew, cropBottomNew;
if (!format->findRect(