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

Commit b4e880ab authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Remove start() parameter from extractors"

parents 4db16c96 3db2dccc

include/media/MediaExtractorPluginApi.h

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct CMediaTrack { 
    void *data;

    void (*free)(void *data);



    status_t (*start)(void *data, MetaDataBase *params);

    status_t (*start)(void *data);

    status_t (*stop)(void *data);

    status_t (*getFormat)(void *data, MetaDataBase &format);

    status_t (*read)(void *data, MediaBufferBase **buffer, uint32_t options, int64_t seekPosUs);
@@ -62,7 +62,7 @@ struct CMediaTrackV2 { 
    void *data;

    void (*free)(void *data);



    status_t (*start)(void *data, AMediaFormat *params);

    status_t (*start)(void *data);

    status_t (*stop)(void *data);

    status_t (*getFormat)(void *data, AMediaFormat *format);

    status_t (*read)(void *data, MediaBufferBase **buffer, uint32_t options, int64_t seekPosUs);

include/media/MediaExtractorPluginHelper.h

+6 −6
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct MediaTrack; 
class MediaTrackHelper {

public:

    virtual ~MediaTrackHelper() {};

    virtual status_t start(MetaDataBase *params = NULL) = 0;

    virtual status_t start() = 0;

    virtual status_t stop() = 0;

    virtual status_t getFormat(MetaDataBase& format) = 0;
@@ -82,8 +82,8 @@ inline CMediaTrack *wrap(MediaTrackHelper *track) { 
    wrapper->free = [](void *data) -> void {

        delete (MediaTrackHelper*)(data);

    };

    wrapper->start = [](void *data, MetaDataBase *params) -> status_t {

        return ((MediaTrackHelper*)data)->start(params);

    wrapper->start = [](void *data) -> status_t {

        return ((MediaTrackHelper*)data)->start();

    };

    wrapper->stop = [](void *data) -> status_t {

        return ((MediaTrackHelper*)data)->stop();
@@ -106,7 +106,7 @@ inline CMediaTrack *wrap(MediaTrackHelper *track) { 
class MediaTrackHelperV2 {

public:

    virtual ~MediaTrackHelperV2() {};

    virtual status_t start(AMediaFormat *params = NULL) = 0;

    virtual status_t start() = 0;

    virtual status_t stop() = 0;

    virtual status_t getFormat(AMediaFormat *format) = 0;
@@ -151,8 +151,8 @@ inline CMediaTrackV2 *wrapV2(MediaTrackHelperV2 *track) { 
    wrapper->free = [](void *data) -> void {

        delete (MediaTrackHelperV2*)(data);

    };

    wrapper->start = [](void *data, AMediaFormat *params) -> status_t {

        return ((MediaTrackHelperV2*)data)->start(params);

    wrapper->start = [](void *data) -> status_t {

        return ((MediaTrackHelperV2*)data)->start();

    };

    wrapper->stop = [](void *data) -> status_t {

        return ((MediaTrackHelperV2*)data)->stop();

include/media/MediaTrack.h

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct MediaTrack 


    // To be called before any other methods on this object, except

    // getFormat().

    virtual status_t start(MetaDataBase *params = NULL) = 0;

    virtual status_t start() = 0;



    // Any blocking read call returns immediately with a result of NO_INIT.

    // It is an error to call any methods other than start after this call
@@ -143,7 +143,7 @@ class MediaTrackCUnwrapper : public MediaTrack { 
public:

    explicit MediaTrackCUnwrapper(CMediaTrack *wrapper);



    virtual status_t start(MetaDataBase *params = NULL);

    virtual status_t start();

    virtual status_t stop();

    virtual status_t getFormat(MetaDataBase& format);

    virtual status_t read(MediaBufferBase **buffer, const ReadOptions *options = NULL);
@@ -161,7 +161,7 @@ class MediaTrackCUnwrapperV2 : public MediaTrack { 
public:

    explicit MediaTrackCUnwrapperV2(CMediaTrackV2 *wrapper);



    virtual status_t start(MetaDataBase *params = NULL);

    virtual status_t start();

    virtual status_t stop();

    virtual status_t getFormat(MetaDataBase& format);

    virtual status_t read(MediaBufferBase **buffer, const ReadOptions *options = NULL);

media/extractors/aac/AACExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
            const Vector<uint64_t> &offset_vector,

            int64_t frame_duration_us);



    virtual status_t start(MetaDataBase *params = NULL);

    virtual status_t start();

    virtual status_t stop();



    virtual status_t getFormat(MetaDataBase&);
@@ -238,7 +238,7 @@ AACSource::~AACSource() { 
    }

}



status_t AACSource::start(MetaDataBase * /* params */) {

status_t AACSource::start() {

    CHECK(!mStarted);



    if (mOffsetVector.empty()) {

media/extractors/amr/AMRExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
            const off64_t *offset_table,

            size_t offset_table_length);



    virtual status_t start(MetaDataBase *params = NULL);

    virtual status_t start();

    virtual status_t stop();



    virtual status_t getFormat(MetaDataBase &);
@@ -249,7 +249,7 @@ AMRSource::~AMRSource() { 
    }

}



status_t AMRSource::start(MetaDataBase * /* params */) {

status_t AMRSource::start() {

    CHECK(!mStarted);



    mOffset = mIsWide ? 9 : 6;