commit 1864e9f621cabc77cae58a6214d13dae09b05681
author Lajos Molnar <lajos@google.com> Fri Aug 15 14:55:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 15 08:11:59 2014 +0000
tree e4732d80ce526761a5f83623a63baa13bf82f130
parent 74868d6d167ff231e9d2c65cb90eb249bc99c0ea
parent cd39746f8d83bb3f12e8f613e77c3c3b5f77c077

Merge "stagefright: allow specifying flac copmression level by 'complexity'" into lmp-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index b77e1cd..b44d5cc 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1419,8 +1419,10 @@
         } else {
             if (encoder) {
                 if (!msg->findInt32(
+                            "complexity", &compressionLevel) &&
+                    !msg->findInt32(
                             "flac-compression-level", &compressionLevel)) {
-                    compressionLevel = 5;// default FLAC compression level
+                    compressionLevel = 5; // default FLAC compression level
                 } else if (compressionLevel < 0) {
                     ALOGW("compression level %d outside [0..8] range, "
                           "using 0",