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

Merge change If68c168d into eclair-mr2

Browse Source 
* changes:
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
This commit is contained in:
Android (Google) Code Review
2009-10-21 18:17:01 -04:00
parent 3f9faf4737 f68c168d36
commit bfd5b38673
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/media/stagefright/OMXCodec.h
View File

@@ -106,7 +106,6 @@ private:
sp<IOMX> mOMX; sp<IOMX> mOMX;
IOMX::node_id mNode; IOMX::node_id mNode;
sp<OMXCodecObserver> mObserver;
uint32_t mQuirks; uint32_t mQuirks;
bool mIsEncoder; bool mIsEncoder;
char *mMIME; char *mMIME;

12
media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
View File

@@ -129,11 +129,19 @@ VideoFrame *StagefrightMetadataRetriever::captureFrame() {
decoder->start(); decoder->start();
MediaBuffer *buffer; // Read one output buffer, ignore format change notifications
// and spurious empty buffers.
MediaBuffer *buffer = NULL;
status_t err; status_t err;
do { do {
if (buffer != NULL) {
buffer->release();
buffer = NULL;
}
err = decoder->read(&buffer); err = decoder->read(&buffer);
} while (err == INFO_FORMAT_CHANGED); } while (err == INFO_FORMAT_CHANGED
|| (buffer != NULL && buffer->range_length() == 0));
if (err != OK) { if (err != OK) {
CHECK_EQ(buffer, NULL); CHECK_EQ(buffer, NULL);

4
media/libstagefright/OMXCodec.cpp
View File

@@ -1065,8 +1065,8 @@ static bool formatHasNotablyChanged(
return false; return false;
} }
if (from.get() == NULL && to.get() != NULL if ((from.get() == NULL && to.get() != NULL)
|| from.get() != NULL && to.get() == NULL) { || (from.get() != NULL && to.get() == NULL)) {
return true; return true;
} }