diff options
| author | niko <niko@google.com> | 2009-07-20 15:07:26 -0700 |
|---|---|---|
| committer | niko <niko@google.com> | 2009-07-22 15:03:22 -0700 |
| commit | bc7269278042e448299c2e80e4dbb16fed05791d (patch) | |
| tree | 5270299858b6a69a45c604a28208d128a0dd94d8 /media/libmedia/Android.mk | |
| parent | c7bebd15378d98104e6cd32666665fd60eaa8043 (diff) | |
| download | frameworks_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/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index cdaab04..07c81f7 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -2,24 +2,25 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - AudioTrack.cpp \ - IAudioFlinger.cpp \ - IAudioFlingerClient.cpp \ - IAudioTrack.cpp \ - IAudioRecord.cpp \ - AudioRecord.cpp \ - AudioSystem.cpp \ - mediaplayer.cpp \ - IMediaPlayerService.cpp \ - IMediaPlayerClient.cpp \ - IMediaPlayer.cpp \ - IMediaRecorder.cpp \ - mediarecorder.cpp \ - IMediaMetadataRetriever.cpp \ - mediametadataretriever.cpp \ - ToneGenerator.cpp \ - JetPlayer.cpp \ - IOMX.cpp + AudioTrack.cpp \ + IAudioFlinger.cpp \ + IAudioFlingerClient.cpp \ + IAudioTrack.cpp \ + IAudioRecord.cpp \ + AudioRecord.cpp \ + AudioSystem.cpp \ + mediaplayer.cpp \ + IMediaPlayerService.cpp \ + IMediaPlayerClient.cpp \ + IMediaPlayer.cpp \ + IMediaRecorder.cpp \ + Metadata.cpp \ + mediarecorder.cpp \ + IMediaMetadataRetriever.cpp \ + mediametadataretriever.cpp \ + ToneGenerator.cpp \ + JetPlayer.cpp \ + IOMX.cpp LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox |