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

Commit fc70138c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ie33ca07f,I9cc0f1bd 

* changes:
  Remove RefBase from plugin-side MediaSource
  Remove RefBase from MediaExtractor
parents 8ec3d5d4 cb30d847

include/media/MediaSourceBase.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../media/libmediaextractor/include/media/MediaSourceBase.h
 
 No newline at end of file

media/extractors/aac/AACExtractor.cpp

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "AACExtractor.h"

#include <media/DataSource.h>

#include <media/MediaSource.h>

#include <media/MediaSourceBase.h>

#include <media/stagefright/foundation/avc_utils.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/AMessage.h>
@@ -33,7 +33,7 @@ 


namespace android {



class AACSource : public MediaSource {

class AACSource : public MediaSourceBase {

public:

    AACSource(const sp<DataSource> &source,

              const sp<MetaData> &meta,
@@ -207,7 +207,7 @@ size_t AACExtractor::countTracks() { 
    return mInitCheck == OK ? 1 : 0;

}



sp<MediaSource> AACExtractor::getTrack(size_t index) {

MediaSourceBase *AACExtractor::getTrack(size_t index) {

    if (mInitCheck != OK || index != 0) {

        return NULL;

    }

media/extractors/aac/AACExtractor.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public: 
    AACExtractor(const sp<DataSource> &source, const sp<AMessage> &meta);



    virtual size_t countTracks();

    virtual sp<MediaSource> getTrack(size_t index);

    virtual MediaSourceBase *getTrack(size_t index);

    virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);



    virtual sp<MetaData> getMetaData();

media/extractors/amr/AMRExtractor.cpp

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "AMRExtractor.h"



#include <media/DataSource.h>

#include <media/MediaSource.h>

#include <media/MediaSourceBase.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDefs.h>
@@ -31,7 +31,7 @@ 


namespace android {



class AMRSource : public MediaSource {

class AMRSource : public MediaSourceBase {

public:

    AMRSource(const sp<DataSource> &source,

              const sp<MetaData> &meta,
@@ -186,7 +186,7 @@ size_t AMRExtractor::countTracks() { 
    return mInitCheck == OK ? 1 : 0;

}



sp<MediaSource> AMRExtractor::getTrack(size_t index) {

MediaSourceBase *AMRExtractor::getTrack(size_t index) {

    if (mInitCheck != OK || index != 0) {

        return NULL;

    }

media/extractors/amr/AMRExtractor.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public: 
    explicit AMRExtractor(const sp<DataSource> &source);



    virtual size_t countTracks();

    virtual sp<MediaSource> getTrack(size_t index);

    virtual MediaSourceBase *getTrack(size_t index);

    virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);



    virtual sp<MetaData> getMetaData();