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

Commit 5e5631bb authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Fix videos app bandwidth accounting for 4G streaming"

parents f3c2e3bd dce4161f

media/libstagefright/AwesomePlayer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2108,6 +2108,8 @@ status_t AwesomePlayer::finishSetDataSource_l() { 


        mWVMExtractor = new WVMExtractor(dataSource);

        mWVMExtractor->setAdaptiveStreamingMode(true);

        if (mUIDValid)

            mWVMExtractor->setUID(mUID);

        extractor = mWVMExtractor;

    } else {

        extractor = MediaExtractor::Create(

media/libstagefright/WVMExtractor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -123,6 +123,12 @@ void WVMExtractor::setAdaptiveStreamingMode(bool adaptive) { 
    }

}



void WVMExtractor::setUID(uid_t uid) {

    if (mImpl != NULL) {

        mImpl->setUID(uid);

    }

}



bool SniffWVM(

    const sp<DataSource> &source, String8 *mimeType, float *confidence,

        sp<AMessage> *) {

media/libstagefright/include/WVMExtractor.h

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ public: 


    virtual int64_t getCachedDurationUs(status_t *finalStatus) = 0;

    virtual void setAdaptiveStreamingMode(bool adaptive) = 0;

    virtual void setUID(uid_t uid) = 0;

};



class WVMExtractor : public MediaExtractor {
@@ -60,6 +61,8 @@ public: 
    // is used.

    void setAdaptiveStreamingMode(bool adaptive);



    void setUID(uid_t uid);



    static bool getVendorLibHandle();



protected: