From fc9ba09e3bb368f823d473f5e2bb9aa32dba6289 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 11 Jan 2010 15:35:19 -0800 Subject: Squashed commit of the following: commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc Author: Andreas Huber Date: Mon Jan 11 14:55:56 2010 -0800 Support for duration metadata, midi and ogg-vorbis files (in mediascanner) commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39 Author: Andreas Huber Date: Mon Jan 11 14:20:45 2010 -0800 Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor. commit f9818dfac39c96e5fefe8c8295e60580692d5990 Author: Andreas Huber Date: Fri Jan 8 14:26:09 2010 -0800 A first pass at supporting metadata through ID3 tags. commit 476e9e253633336ab790f943e2d6c0cd8991d76a Author: Andreas Huber Date: Thu Jan 7 15:48:44 2010 -0800 Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright. related-to-bug: 2295456 --- media/libstagefright/Android.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'media/libstagefright/Android.mk') diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 30b4506..e36e78c 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -44,14 +44,17 @@ endif LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ - $(TOP)/external/opencore/android + $(TOP)/external/opencore/android \ + $(TOP)/external/tremor/Tremor LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ libutils \ libcutils \ - libui + libui \ + libsonivox \ + libvorbisidec ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) @@ -62,7 +65,8 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_amrwbdec \ libstagefright_avcdec \ libstagefright_m4vh263dec \ - libstagefright_mp3dec + libstagefright_mp3dec \ + libstagefright_id3 LOCAL_SHARED_LIBRARIES += \ libstagefright_amrnb_common \ -- cgit v1.1