diff options
| author | Andy Hung <hunga@google.com> | 2014-05-02 11:05:04 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@android.com> | 2014-06-12 13:26:03 -0700 |
| commit | 8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d (patch) | |
| tree | 6a22d7fcaacca08ef7b79c20bd0e6b3e72d9e7f0 /media/libstagefright/OMXClient.cpp | |
| parent | c323737dd46d724b4c1ec230b283f26ae2a22b4f (diff) | |
| download | frameworks_av-8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d.zip frameworks_av-8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d.tar.gz frameworks_av-8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d.tar.bz2 | |
Update OMX messages for 64 bit
Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.
Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Diffstat (limited to 'media/libstagefright/OMXClient.cpp')
| -rw-r--r-- | media/libstagefright/OMXClient.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp index 9f9352d..72f2306 100644 --- a/media/libstagefright/OMXClient.cpp +++ b/media/libstagefright/OMXClient.cpp @@ -141,7 +141,7 @@ private: const sp<IOMX> &getOMX(node_id node) const; const sp<IOMX> &getOMX_l(node_id node) const; - static bool IsSoftwareComponent(const char *name); + static bool CanLiveLocally(const char *name); DISALLOW_EVIL_CONSTRUCTORS(MuxOMX); }; @@ -164,7 +164,7 @@ bool MuxOMX::isLocalNode_l(node_id node) const { } // static -bool MuxOMX::IsSoftwareComponent(const char *name) { +bool MuxOMX::CanLiveLocally(const char *name) { return !strncasecmp(name, "OMX.google.", 11); } @@ -197,7 +197,7 @@ status_t MuxOMX::allocateNode( sp<IOMX> omx; - if (IsSoftwareComponent(name)) { + if (CanLiveLocally(name)) { if (mLocalOMX == NULL) { mLocalOMX = new OMX; } @@ -382,7 +382,7 @@ status_t OMXClient::connect() { mOMX = service->getOMX(); CHECK(mOMX.get() != NULL); - if (!mOMX->livesLocally(NULL /* node */, getpid())) { + if (!mOMX->livesLocally(0 /* node */, getpid())) { ALOGI("Using client-side OMX mux."); mOMX = new MuxOMX(mOMX); } |