diff options
| author | Lajos Molnar <lajos@google.com> | 2014-08-15 15:04:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 15:04:50 +0000 |
| commit | ef1012772ab6292981f163bd6515f193d579046d (patch) | |
| tree | 6060e6e7c34a180fae33af801f4138e844c90a7e /media/libstagefright | |
| parent | b986d6bbf92601ed72151c1b5da01dc529accf0e (diff) | |
| parent | 1864e9f621cabc77cae58a6214d13dae09b05681 (diff) | |
| download | frameworks_av-ef1012772ab6292981f163bd6515f193d579046d.zip frameworks_av-ef1012772ab6292981f163bd6515f193d579046d.tar.gz frameworks_av-ef1012772ab6292981f163bd6515f193d579046d.tar.bz2 | |
am 1864e9f6: Merge "stagefright: allow specifying flac copmression level by \'complexity\'" into lmp-dev
* commit '1864e9f621cabc77cae58a6214d13dae09b05681':
stagefright: allow specifying flac copmression level by 'complexity'
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ status_t ACodec::configureCodec( } 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", |