summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-10-06 22:23:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-06 22:23:57 +0000
commit0fe4c176fbf52af74f6b0ea0d422621193618d01 (patch)
tree8dc552100638205cca1ba7f0964b7d9d41f24696 /media
parent5769ed50bfcb88e2613a8616a5f4cf9f99ea2ecf (diff)
parent1318a60824c4f787e54fbbc8a388c6be5146f220 (diff)
downloadframeworks_av-0fe4c176fbf52af74f6b0ea0d422621193618d01.zip
frameworks_av-0fe4c176fbf52af74f6b0ea0d422621193618d01.tar.gz
frameworks_av-0fe4c176fbf52af74f6b0ea0d422621193618d01.tar.bz2
am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev
* commit '1318a60824c4f787e54fbbc8a388c6be5146f220': StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 17190fb..cadd691 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1172,6 +1172,7 @@ status_t StagefrightRecorder::checkVideoEncoderCapabilities(
client.interface(),
(mVideoEncoder == VIDEO_ENCODER_H263 ? MEDIA_MIMETYPE_VIDEO_H263 :
mVideoEncoder == VIDEO_ENCODER_MPEG_4_SP ? MEDIA_MIMETYPE_VIDEO_MPEG4 :
+ mVideoEncoder == VIDEO_ENCODER_VP8 ? MEDIA_MIMETYPE_VIDEO_VP8 :
mVideoEncoder == VIDEO_ENCODER_H264 ? MEDIA_MIMETYPE_VIDEO_AVC : ""),
false /* decoder */, true /* hwCodec */, &codecs);
*supportsCameraSourceMetaDataMode = codecs.size() > 0;