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

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

Merge change 23715 into eclair 

* changes:
  Setting the component role appears to be mandatory now for all mime types.
parents 8e65337d 4c483425

cmds/stagefright/record.cpp

+2 −7
Original line number Original line Diff line number Diff line
@@ -50,11 +50,6 @@ public: 
        return meta;

        return meta;

    }

    }





    virtual status_t getMaxSampleSize(size_t *max_size) {

        *max_size = mSize;

        return OK;

    }



    virtual status_t start(MetaData *params) {

    virtual status_t start(MetaData *params) {

        return OK;

        return OK;

    }

    }
@@ -209,7 +204,7 @@ int main(int argc, char **argv) { 




    return 0;

    return 0;

}

}

#endif

#else





int main(int argc, char **argv) {

int main(int argc, char **argv) {

    android::ProcessState::self()->startThreadPool();

    android::ProcessState::self()->startThreadPool();
@@ -265,4 +260,4 @@ int main(int argc, char **argv) { 




    return 0;

    return 0;

}

}

#endif

include/media/stagefright/OMXCodec.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,8 @@ private: 
    void addCodecSpecificData(const void *data, size_t size);

    void addCodecSpecificData(const void *data, size_t size);

    void clearCodecSpecificData();

    void clearCodecSpecificData();





    void setComponentRole();



    void setAMRFormat();

    void setAMRFormat();

    void setAACFormat(int32_t numChannels, int32_t sampleRate);

    void setAACFormat(int32_t numChannels, int32_t sampleRate);

media/libstagefright/OMXCodec.cpp

+120 −118

File changed.

Preview size limit exceeded, changes collapsed.