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

Commit bbc68082 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f6190284: Merge change 23715 into eclair 

Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp

* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
  Setting the component role appears to be mandatory now for all mime types.
parents 1d71746e 7a6b9e2e

cmds/stagefright/record.cpp

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

    }



    virtual status_t getMaxSampleSize(size_t *max_size) {

        *max_size = mSize;

        return OK;

    }



    virtual status_t start(MetaData *params) {

        return OK;

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


    return 0;

}

#endif

#else



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

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


    return 0;

}

#endif

include/media/stagefright/OMXCodec.h

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

    void clearCodecSpecificData();



    void setComponentRole();



    void setAMRFormat();

    void setAACFormat(int32_t numChannels, int32_t sampleRate);

media/libstagefright/OMXCodec.cpp

+120 −118

File changed.

Preview size limit exceeded, changes collapsed.