diff options
| author | Robert Shih <robertshih@google.com> | 2014-07-09 20:09:43 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2014-07-22 14:20:38 -0700 |
| commit | 114819633470ebd5b346c13c2a82a0025d2d39c0 (patch) | |
| tree | 1b18e4333bb8d3bde991fcea29e956be83e94b8b /media/libmedia/mediarecorder.cpp | |
| parent | d8cf55d878edddfc36bb821a95b88dfb2453c2c3 (diff) | |
| download | frameworks_av-114819633470ebd5b346c13c2a82a0025d2d39c0.zip frameworks_av-114819633470ebd5b346c13c2a82a0025d2d39c0.tar.gz frameworks_av-114819633470ebd5b346c13c2a82a0025d2d39c0.tar.bz2 | |
StagefrightRecorder: webm (video only) support
Bug: 16329805
Change-Id: I8a0ecd100fca397add97a1416125bcc6aeb86364
Diffstat (limited to 'media/libmedia/mediarecorder.cpp')
| -rw-r--r-- | media/libmedia/mediarecorder.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index c8192e9..1952b86 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -186,8 +186,11 @@ status_t MediaRecorder::setOutputFormat(int of) ALOGE("setOutputFormat called in an invalid state: %d", mCurrentState); return INVALID_OPERATION; } - if (mIsVideoSourceSet && of >= OUTPUT_FORMAT_AUDIO_ONLY_START && of != OUTPUT_FORMAT_RTP_AVP && of != OUTPUT_FORMAT_MPEG2TS) { //first non-video output format - ALOGE("output format (%d) is meant for audio recording only and incompatible with video recording", of); + if (mIsVideoSourceSet + && of >= OUTPUT_FORMAT_AUDIO_ONLY_START //first non-video output format + && of < OUTPUT_FORMAT_AUDIO_ONLY_END) { + ALOGE("output format (%d) is meant for audio recording only" + " and incompatible with video recording", of); return INVALID_OPERATION; } |