diff options
author | Andreas Huber <andih@google.com> | 2010-03-12 15:08:52 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2010-03-12 15:08:52 -0800 |
commit | e3452d3fe1da014a6db9a326df08230e0d5339ec (patch) | |
tree | 1100aa650a815c221bb88c2f75b59d8d4422267d /include | |
parent | 34ec95de2f96a5f85d5e4e0f99252b99c0aca14f (diff) | |
download | frameworks_base-e3452d3fe1da014a6db9a326df08230e0d5339ec.zip frameworks_base-e3452d3fe1da014a6db9a326df08230e0d5339ec.tar.gz frameworks_base-e3452d3fe1da014a6db9a326df08230e0d5339ec.tar.bz2 |
Fix the media metadata retriever (tests). The native constants must match those published at the java layer.
Change-Id: Ic1efed709e4d93c61913b231a8cd3ef1074f8ca0
Diffstat (limited to 'include')
-rw-r--r-- | include/media/MediaMetadataRetrieverInterface.h | 6 | ||||
-rw-r--r-- | include/media/mediametadataretriever.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/media/MediaMetadataRetrieverInterface.h b/include/media/MediaMetadataRetrieverInterface.h index e228357..ff57774 100644 --- a/include/media/MediaMetadataRetrieverInterface.h +++ b/include/media/MediaMetadataRetrieverInterface.h @@ -43,6 +43,10 @@ public: class MediaMetadataRetrieverInterface : public MediaMetadataRetrieverBase { public: + MediaMetadataRetrieverInterface() + : mMode(0) { + } + virtual ~MediaMetadataRetrieverInterface() {} // @param mode The intended mode of operations: @@ -57,6 +61,8 @@ public: mode > METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL) { return BAD_VALUE; } + + mMode = mode; return NO_ERROR; } diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index 9b12410..dbbcc49 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -67,8 +67,8 @@ enum { // and meta data retrieval.$ enum { METADATA_MODE_NOOP = 0x00, - METADATA_MODE_FRAME_CAPTURE_ONLY = 0x01, - METADATA_MODE_METADATA_RETRIEVAL_ONLY = 0x02, + METADATA_MODE_METADATA_RETRIEVAL_ONLY = 0x01, + METADATA_MODE_FRAME_CAPTURE_ONLY = 0x02, METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL = 0x03 }; |