diff options
| author | James Dong <jdong@google.com> | 2010-09-24 10:56:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-24 10:56:19 -0700 |
| commit | 74aa142af3eefd53e676b0a57e6032c9340f561e (patch) | |
| tree | 545292b5d68624df3bcf36eb76516e8da947dc98 | |
| parent | f43c92f8d7b1d81cc7248031970d68dc65579be0 (diff) | |
| parent | 6d59aa4bb8e9734a9197290a027356e88552f59a (diff) | |
| download | frameworks_av-74aa142af3eefd53e676b0a57e6032c9340f561e.zip frameworks_av-74aa142af3eefd53e676b0a57e6032c9340f561e.tar.gz frameworks_av-74aa142af3eefd53e676b0a57e6032c9340f561e.tar.bz2 | |
Merge "Added two more video encoders"
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 7a29bd2..4d69dd3 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -205,12 +205,14 @@ static const CodecInfo kEncoderInfo[] = { { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.encoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.encoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.encoder" }, + { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.encoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Encoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Encoder" }, // { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.PV.mpeg4enc" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.encoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.encoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.TI.Video.encoder" }, + { MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.encoder" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Encoder" }, { MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Encoder" }, // { MEDIA_MIMETYPE_VIDEO_H263, "OMX.PV.h263enc" }, |