summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-10-06 18:58:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-06 18:58:52 +0000
commit10908ec6033c29433a399e1c160a8516bc12d931 (patch)
tree4cfc241fcb5eff3e0abe2d99d6dafc9592d59ae1 /media
parent61eb367594b4321170a931059e9139d1c91ea882 (diff)
parente48b90d634f9e6190a788e6225927d418b11d162 (diff)
downloadframeworks_av-10908ec6033c29433a399e1c160a8516bc12d931.zip
frameworks_av-10908ec6033c29433a399e1c160a8516bc12d931.tar.gz
frameworks_av-10908ec6033c29433a399e1c160a8516bc12d931.tar.bz2
am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev
* commit 'e48b90d634f9e6190a788e6225927d418b11d162': 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;