summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-10-06 18:39:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-06 18:39:28 +0000
commite48b90d634f9e6190a788e6225927d418b11d162 (patch)
tree92a4c27bab7b137f17ff70dfaede76d2c1d0e184 /media/libmediaplayerservice
parentc4da004d4baef8cc4a631058549216c8d2383824 (diff)
parentbc78bd02f0b823b18e3a4f8b8f862780b51994c0 (diff)
downloadframeworks_av-e48b90d634f9e6190a788e6225927d418b11d162.zip
frameworks_av-e48b90d634f9e6190a788e6225927d418b11d162.tar.gz
frameworks_av-e48b90d634f9e6190a788e6225927d418b11d162.tar.bz2
Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice')
-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;