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

Commit d9f3d60d authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I3b1b7873 into eclair-mr2 

* changes:
  New API to instantiate a MediaExtractor given a URI and optional MIME type.
parents 48153e7f 9a12baf9

include/media/stagefright/CachingDataSource.h

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ public: 
    CachingDataSource(

            const sp<DataSource> &source, size_t pageSize, int numPages);



    status_t InitCheck() const;

    virtual status_t initCheck() const;



    virtual ssize_t read_at(off_t offset, void *data, size_t size);

    virtual ssize_t readAt(off_t offset, void *data, size_t size);



protected:

    virtual ~CachingDataSource();

include/media/stagefright/DataSource.h

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ class DataSource : public RefBase { 
public:

    DataSource() {}



    virtual ssize_t read_at(off_t offset, void *data, size_t size) = 0;

    virtual status_t initCheck() const = 0;



    virtual ssize_t readAt(off_t offset, void *data, size_t size) = 0;



    // Convenience methods:

    bool getUInt16(off_t offset, uint16_t *x);

include/media/stagefright/FileSource.h

+5 −3
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ namespace android { 
class FileSource : public DataSource {

public:

    FileSource(const char *filename);

    virtual ~FileSource();



    status_t InitCheck() const;

    virtual status_t initCheck() const;



    virtual ssize_t readAt(off_t offset, void *data, size_t size);



    virtual ssize_t read_at(off_t offset, void *data, size_t size);

protected:

    virtual ~FileSource();



private:

    FILE *mFile;

include/media/stagefright/HTTPDataSource.h

+6 −4
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ public: 
    HTTPDataSource(const char *host, int port, const char *path);

    HTTPDataSource(const char *uri);



    virtual ~HTTPDataSource();

    virtual status_t initCheck() const;



    // XXXandih

    status_t InitCheck() const { return OK; }

    virtual ssize_t readAt(off_t offset, void *data, size_t size);



    virtual ssize_t read_at(off_t offset, void *data, size_t size);

protected:

    virtual ~HTTPDataSource();



private:

    enum {
@@ -50,6 +50,8 @@ private: 
    size_t mBufferLength;

    off_t mBufferOffset;



    status_t mInitCheck;



    HTTPDataSource(const HTTPDataSource &);

    HTTPDataSource &operator=(const HTTPDataSource &);

};

include/media/stagefright/MediaExtractor.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ public: 
    static sp<MediaExtractor> Create(

            const sp<DataSource> &source, const char *mime = NULL);



    static sp<MediaExtractor> CreateFromURI(

            const char *uri, const char *mime = NULL);



    virtual size_t countTracks() = 0;

    virtual sp<MediaSource> getTrack(size_t index) = 0;