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

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

am 05eca1d4: Merge change Ie80e2381 into eclair 

Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp

* commit '05eca1d46a45723a57899dabad698537b7faef82':
  DO NOT MERGE: Squashed commit of the following:
parents ce66ca43 5b65c704

cmds/stagefright/stagefright.cpp

+3 −3
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ int main(int argc, char **argv) { 


        CHECK(service.get() != NULL);



        sp<IOMX> omx = service->createOMX();

        sp<IOMX> omx = service->getOMX();

        CHECK(omx.get() != NULL);



        const char *kMimeTypes[] = {
@@ -329,11 +329,11 @@ int main(int argc, char **argv) { 


        CHECK(service.get() != NULL);



        sp<IOMX> omx = service->createOMX();

        sp<IOMX> omx = service->getOMX();

        CHECK(omx.get() != NULL);



        List<String8> list;

        omx->list_nodes(&list);

        omx->listNodes(&list);



        for (List<String8>::iterator it = list.begin();

             it != list.end(); ++it) {

include/media/IMediaPlayerService.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public: 
    virtual sp<IMediaPlayer>    create(pid_t pid, const sp<IMediaPlayerClient>& client, int fd, int64_t offset, int64_t length) = 0;

    virtual sp<IMemory>         decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;

    virtual sp<IMemory>         decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;

    virtual sp<IOMX>            createOMX() = 0;

    virtual sp<IOMX>            getOMX() = 0;



    // Take a peek at currently playing audio, for visualization purposes.

    // This returns a buffer of 16 bit mono PCM data, or NULL if no visualization buffer is currently available.

include/media/IOMX.h

+19 −19
Original line number Diff line number Diff line
@@ -42,57 +42,57 @@ public: 
    typedef void *buffer_id;

    typedef void *node_id;



    virtual status_t list_nodes(List<String8> *list) = 0;

    virtual status_t listNodes(List<String8> *list) = 0;



    virtual status_t allocate_node(const char *name, node_id *node) = 0;

    virtual status_t free_node(node_id node) = 0;

    virtual status_t allocateNode(

            const char *name, const sp<IOMXObserver> &observer,

            node_id *node) = 0;



    virtual status_t send_command(

    virtual status_t freeNode(node_id node) = 0;



    virtual status_t sendCommand(

            node_id node, OMX_COMMANDTYPE cmd, OMX_S32 param) = 0;



    virtual status_t get_parameter(

    virtual status_t getParameter(

            node_id node, OMX_INDEXTYPE index,

            void *params, size_t size) = 0;



    virtual status_t set_parameter(

    virtual status_t setParameter(

            node_id node, OMX_INDEXTYPE index,

            const void *params, size_t size) = 0;



    virtual status_t get_config(

    virtual status_t getConfig(

            node_id node, OMX_INDEXTYPE index,

            void *params, size_t size) = 0;



    virtual status_t set_config(

    virtual status_t setConfig(

            node_id node, OMX_INDEXTYPE index,

            const void *params, size_t size) = 0;



    virtual status_t use_buffer(

    virtual status_t useBuffer(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer) = 0;



    virtual status_t allocate_buffer(

    virtual status_t allocateBuffer(

            node_id node, OMX_U32 port_index, size_t size,

            buffer_id *buffer) = 0;



    virtual status_t allocate_buffer_with_backup(

    virtual status_t allocateBufferWithBackup(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer) = 0;



    virtual status_t free_buffer(

    virtual status_t freeBuffer(

            node_id node, OMX_U32 port_index, buffer_id buffer) = 0;



    virtual status_t observe_node(

            node_id node, const sp<IOMXObserver> &observer) = 0;



    virtual void fill_buffer(node_id node, buffer_id buffer) = 0;

    virtual status_t fillBuffer(node_id node, buffer_id buffer) = 0;



    virtual void empty_buffer(

    virtual status_t emptyBuffer(

            node_id node,

            buffer_id buffer,

            OMX_U32 range_offset, OMX_U32 range_length,

            OMX_U32 flags, OMX_TICKS timestamp) = 0;



    virtual status_t get_extension_index(

    virtual status_t getExtensionIndex(

            node_id node,

            const char *parameter_name,

            OMX_INDEXTYPE *index) = 0;
@@ -162,7 +162,7 @@ class IOMXObserver : public IInterface { 
public:

    DECLARE_META_INTERFACE(OMXObserver);



    virtual void on_message(const omx_message &msg) = 0;

    virtual void onMessage(const omx_message &msg) = 0;

};



class IOMXRenderer : public IInterface {

include/media/stagefright/HTTPStream.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <sys/types.h>



#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/string.h>

#include <media/stagefright/stagefright_string.h>

#include <utils/KeyedVector.h>



namespace android {

include/media/stagefright/string.h→include/media/stagefright/stagefright_string.h

+3 −3
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



#ifndef STRING_H_

#ifndef STAGEFRIGHT_STRING_H_



#define STRING_H_

#define STAGEFRIGHT_STRING_H_



#include <utils/String8.h>
@@ -51,4 +51,4 @@ private: 


}  // namespace android



#endif  // STRING_H_
 
#endif  // STAGEFRIGHT_STRING_H_