summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorPraveen Chavan <pchavan@codeaurora.org>2014-10-07 22:23:22 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:05 -0600
commit1fc086f2e9e71a9a983560acb350817c2d5dd8e9 (patch)
tree1a91529582f7f0d7826e3a2a5d099325a23654f8 /media
parent6f349f520552b6929551ee67454588d3e7c89397 (diff)
downloadframeworks_av-1fc086f2e9e71a9a983560acb350817c2d5dd8e9.zip
frameworks_av-1fc086f2e9e71a9a983560acb350817c2d5dd8e9.tar.gz
frameworks_av-1fc086f2e9e71a9a983560acb350817c2d5dd8e9.tar.bz2
Stagefright: avc_utils: handle invalid sample aspect ratio
Set sample aspect ratio width & height only if both sar_width and sar_height are valid ( >1 ). sar-height being 0 can cause divide by zero exception in NuPlayer. Change-Id: Idfc4cae57651f3b5fd755057a880503f359aa004 CRs-Fixed: 735506
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/avc_utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp
index 8ef2dca..8c371ba 100644
--- a/media/libstagefright/avc_utils.cpp
+++ b/media/libstagefright/avc_utils.cpp
@@ -393,7 +393,7 @@ sp<MetaData> MakeAVCCodecSpecificData(const sp<ABuffer> &accessUnit) {
meta->setInt32(kKeyWidth, width);
meta->setInt32(kKeyHeight, height);
- if (sarWidth > 1 || sarHeight > 1) {
+ if (sarWidth > 1 && sarHeight > 1) {
// We treat 0:0 (unspecified) as 1:1.
meta->setInt32(kKeySARWidth, sarWidth);