Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee3c639 authored by Andreas Huber's avatar Andreas Huber
Browse files

Squashed commit of the following: 

commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
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 <andih@google.com>
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 <andih@google.com>
Date:   Fri Jan 8 14:26:09 2010 -0800

    A first pass at supporting metadata through ID3 tags.

commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
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
parent 93aea696

include/media/stagefright/DataSource.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ class String8; 


class DataSource : public RefBase {

public:

    static sp<DataSource> CreateFromURI(const char *uri);



    DataSource() {}



    virtual status_t initCheck() const = 0;

include/media/stagefright/MediaExtractor.h

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ public: 
    virtual sp<MetaData> getTrackMetaData(

            size_t index, uint32_t flags = 0) = 0;



    // Return container specific meta-data. The default implementation

    // returns an empty metadata object.

    virtual sp<MetaData> getMetaData();



protected:

    MediaExtractor() {}

    virtual ~MediaExtractor() {}

include/media/stagefright/MetaData.h

+9 −0
Original line number Diff line number Diff line
@@ -48,6 +48,15 @@ enum { 
    kKeyBufferID          = 'bfID',

    kKeyMaxInputSize      = 'inpS',

    kKeyThumbnailTime     = 'thbT',  // int64_t (usecs)



    kKeyAlbum             = 'albu',  // cstring

    kKeyArtist            = 'arti',  // cstring

    kKeyComposer          = 'comp',  // cstring

    kKeyGenre             = 'genr',  // cstring

    kKeyTitle             = 'titl',  // cstring

    kKeyYear              = 'year',  // cstring

    kKeyAlbumArt          = 'albA',  // compressed image data

    kKeyAlbumArtMIME      = 'alAM',  // cstring

};



enum {

media/libstagefright/Android.mk

+7 −3
Original line number Diff line number Diff line
@@ -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 \

media/libstagefright/AudioPlayer.cpp

+4 −3
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ void AudioPlayer::stop() { 


    if (mAudioSink.get() != NULL) {

        mAudioSink->stop();

        mAudioSink->close();

    } else {

        mAudioTrack->stop();