diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-24 12:59:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-24 12:59:35 -0700 |
| commit | 726e4527b7a750e688fec4c1e7c5f7b9a33d1623 (patch) | |
| tree | 06c12073a7c0919361b092d1f9a5537982077d4c /include | |
| parent | 348a3aca420da133b2283ee12216e8e0f939e88d (diff) | |
| parent | d35924d9928f29dcee6f5666b5bbd084640c7b34 (diff) | |
| download | frameworks_av-726e4527b7a750e688fec4c1e7c5f7b9a33d1623.zip frameworks_av-726e4527b7a750e688fec4c1e7c5f7b9a33d1623.tar.gz frameworks_av-726e4527b7a750e688fec4c1e7c5f7b9a33d1623.tar.bz2 | |
Merge "QueryCodecs() signature change"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 20fcde5..93933d9 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -348,6 +348,8 @@ struct CodecCapabilities { // that encode content of the given type. // profile and level indications only make sense for h.263, mpeg4 and avc // video. +// If hwCodecOnly==true, only returns hardware-based components, software and +// hardware otherwise. // The profile/level values correspond to // OMX_VIDEO_H263PROFILETYPE, OMX_VIDEO_MPEG4PROFILETYPE, // OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263LEVELTYPE, OMX_VIDEO_MPEG4LEVELTYPE @@ -358,6 +360,11 @@ status_t QueryCodecs( const char *mimeType, bool queryDecoders, bool hwCodecOnly, Vector<CodecCapabilities> *results); +status_t QueryCodecs( + const sp<IOMX> &omx, + const char *mimeType, bool queryDecoders, + Vector<CodecCapabilities> *results); + } // namespace android #endif // OMX_CODEC_H_ |