Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two more locations that use the old setObject("buffer", ...) paradigm

Browse Source 
that I'd previously missed.

Change-Id: Ifbdbfb94d1bc1cbe8c0a403fed05ce99fca8397b
This commit is contained in:
Andreas Huber
2012-02-24 13:42:47 -08:00
parent 0862a56cae
commit 6281fa1d93
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/stagefright/codec.cpp
View File

@@ -107,9 +107,8 @@ static int decode(
CHECK_EQ(err, (status_t)OK);
size_t j = 0;
sp<RefBase> obj;
while (format->findObject(StringPrintf("csd-%d", j).c_str(), &obj)) {
sp<ABuffer> buffer = static_cast<ABuffer *>(obj.get());
sp<ABuffer> buffer;
while (format->findBuffer(StringPrintf("csd-%d", j).c_str(), &buffer)) {
state->mCSD.push_back(buffer);
++j;

14
cmds/stagefright/sf2.cpp
View File

@@ -358,7 +358,7 @@ private:
buffer->meta()->setInt32("csd", true);
mCSD.push(buffer);
msg->setObject("csd", buffer);
msg->setBuffer("csd", buffer);
} else if (meta->findData(kKeyESDS, &type, &data, &size)) {
ESDS esds((const char *)data, size);
CHECK_EQ(esds.InitCheck(), (status_t)OK);
@@ -408,9 +408,8 @@ private:
return;
}
sp<RefBase> obj;
CHECK(msg->findObject("buffer", &obj));
sp<ABuffer> outBuffer = static_cast<ABuffer *>(obj.get());
sp<ABuffer> outBuffer;
CHECK(msg->findBuffer("buffer", &outBuffer));
if (mCSDIndex < mCSD.size()) {
outBuffer = mCSD.editItemAt(mCSDIndex++);
@@ -509,15 +508,14 @@ private:
}
}
reply->setObject("buffer", outBuffer);
reply->setBuffer("buffer", outBuffer);
reply->post();
}
void onDrainThisBuffer(const sp<AMessage> &msg) {
sp<RefBase> obj;
CHECK(msg->findObject("buffer", &obj));
sp<ABuffer> buffer;
CHECK(msg->findBuffer("buffer", &buffer));
sp<ABuffer> buffer = static_cast<ABuffer *>(obj.get());
mTotalBytesReceived += buffer->size();
sp<AMessage> reply;