diff options
author | Andy McFadden <fadden@android.com> | 2013-09-19 21:23:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-19 21:23:28 +0000 |
commit | cfca686ae8e64bda44a370232f3ba367e6e520d1 (patch) | |
tree | ac8299c0ae2fd5729ec6227d843c83d4cc4c60ed | |
parent | b5bca3ff7784ce95431224482ec42a50261e04b2 (diff) | |
parent | 253dfdb983611b8375c9e0b0483eda03fa146028 (diff) | |
download | frameworks_av-cfca686ae8e64bda44a370232f3ba367e6e520d1.zip frameworks_av-cfca686ae8e64bda44a370232f3ba367e6e520d1.tar.gz frameworks_av-cfca686ae8e64bda44a370232f3ba367e6e520d1.tar.bz2 |
Merge "Rotate fallback size" into klp-dev
-rw-r--r-- | cmds/screenrecord/screenrecord.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmds/screenrecord/screenrecord.cpp b/cmds/screenrecord/screenrecord.cpp index 68289a5..49999b5 100644 --- a/cmds/screenrecord/screenrecord.cpp +++ b/cmds/screenrecord/screenrecord.cpp @@ -464,12 +464,16 @@ static status_t recordScreen(const char* fileName) { err = prepareEncoder(mainDpyInfo.fps, &encoder, &bufferProducer); if (err != NO_ERROR && !gSizeSpecified) { - if (gVideoWidth != kFallbackWidth && gVideoHeight != kFallbackHeight) { + // fallback is defined for landscape; swap if we're in portrait + bool needSwap = gVideoWidth < gVideoHeight; + uint32_t newWidth = needSwap ? kFallbackHeight : kFallbackWidth; + uint32_t newHeight = needSwap ? kFallbackWidth : kFallbackHeight; + if (gVideoWidth != newWidth && gVideoHeight != newHeight) { ALOGV("Retrying with 720p"); - fprintf(stderr, "WARNING: failed at %dx%d, retrying at 720p\n", - gVideoWidth, gVideoHeight); - gVideoWidth = kFallbackWidth; - gVideoHeight = kFallbackHeight; + fprintf(stderr, "WARNING: failed at %dx%d, retrying at %dx%d\n", + gVideoWidth, gVideoHeight, newWidth, newHeight); + gVideoWidth = newWidth; + gVideoHeight = newHeight; err = prepareEncoder(mainDpyInfo.fps, &encoder, &bufferProducer); } } |