From 1fc086f2e9e71a9a983560acb350817c2d5dd8e9 Mon Sep 17 00:00:00 2001
From: Praveen Chavan <pchavan@codeaurora.org>
Date: Tue, 7 Oct 2014 22:23:22 -0700
Subject: 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
---
 media/libstagefright/avc_utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'media/libstagefright/avc_utils.cpp')

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);
-- 
cgit v1.1