summaryrefslogtreecommitdiffstats
path: root/media/tests/players
diff options
context:
space:
mode:
authorniko <niko@google.com>2009-07-20 15:07:26 -0700
committerniko <niko@google.com>2009-07-22 15:03:22 -0700
commitbc7269278042e448299c2e80e4dbb16fed05791d (patch)
tree5270299858b6a69a45c604a28208d128a0dd94d8 /media/tests/players
parentc7bebd15378d98104e6cd32666665fd60eaa8043 (diff)
downloadframeworks_base-bc7269278042e448299c2e80e4dbb16fed05791d.zip
frameworks_base-bc7269278042e448299c2e80e4dbb16fed05791d.tar.gz
frameworks_base-bc7269278042e448299c2e80e4dbb16fed05791d.tar.bz2
Added native metadata support.
Metadata.java: Fixed typo 8k != 8092. The comment was correct though. In Metadata.h, the new Metadata class is declared in the ns android::media to limit the chances of conflict with other packages. The MetadataType in MediaPlayerInterface is gone and moved to Metadata as an inner typedef. Similarly the SortedVector<MetadataType> instance have been replace by a new type Metadata::Filter. All the keys declared in the java counterpart are also in Metadata.h. Metadata.cpp: Contains the implementation of the native metadata packing. There an associated change in the opencore package that should go in at the same time as this one.
Diffstat (limited to 'media/tests/players')
-rw-r--r--media/tests/players/invoke_mock_media_player.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/media/tests/players/invoke_mock_media_player.cpp b/media/tests/players/invoke_mock_media_player.cpp
index 8d575a3..77bb5b2 100644
--- a/media/tests/players/invoke_mock_media_player.cpp
+++ b/media/tests/players/invoke_mock_media_player.cpp
@@ -27,7 +27,6 @@
using android::INVALID_OPERATION;
using android::ISurface;
using android::MediaPlayerBase;
-using android::MetadataType;
using android::OK;
using android::Parcel;
using android::SortedVector;
@@ -78,8 +77,6 @@ class Player: public MediaPlayerBase
virtual status_t setLooping(int loop) {return OK;}
virtual player_type playerType() {return TEST_PLAYER;}
virtual status_t invoke(const Parcel& request, Parcel *reply);
- virtual status_t getMetadata(const SortedVector<MetadataType>& ids,
- Parcel *records) {return INVALID_OPERATION;}
private:
// Take a request, copy it to the reply.