diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-02 23:41:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 23:41:54 +0000 |
| commit | fc93499e83403d5959693efa040cb29fd6825abb (patch) | |
| tree | 6305f9ff545119b331e83a3c10d596491498f71c /media/libmediaplayerservice | |
| parent | 6eff943c133903fcd9bdb7bb1812d7b383b090f8 (diff) | |
| parent | a147b4f91143d9f2fb608e22f9fca14bbd029573 (diff) | |
| download | frameworks_av-fc93499e83403d5959693efa040cb29fd6825abb.zip frameworks_av-fc93499e83403d5959693efa040cb29fd6825abb.tar.gz frameworks_av-fc93499e83403d5959693efa040cb29fd6825abb.tar.bz2 | |
Merge "mediarecorder: set level if setting default profile" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index b904aa8..17190fb 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -30,6 +30,7 @@ #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/foundation/ALooper.h> +#include <media/stagefright/ACodec.h> #include <media/stagefright/AudioSource.h> #include <media/stagefright/AMRWriter.h> #include <media/stagefright/AACWriter.h> @@ -1243,6 +1244,10 @@ void StagefrightRecorder::setDefaultProfileIfNecessary() { if (videoCodec == VIDEO_ENCODER_H264) { ALOGI("Force to use AVC baseline profile"); setParamVideoEncoderProfile(OMX_VIDEO_AVCProfileBaseline); + // set 0 for invalid levels - this will be rejected by the + // codec if it cannot handle it during configure + setParamVideoEncoderLevel(ACodec::getAVCLevelFor( + videoFrameWidth, videoFrameHeight, videoFrameRate, videoBitRate)); } } } |