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

Merge "Default W, H allowed in SurfaceMediaSource dequeue"

Browse Source
This commit is contained in:
Pannag Sanketi
2011-08-28 14:40:26 -07:00
committed by Android (Google) Code Review
parent b8a9e15c2a 886530788c
commit 3451df1a5c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/SurfaceMediaSource.cpp
View File

@@ -179,9 +179,11 @@ status_t SurfaceMediaSource::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,
// TODO: Currently just uses mDefaultWidth/Height. In the future // TODO: Currently just uses mDefaultWidth/Height. In the future
// we might declare mHeight and mWidth and check against those here. // we might declare mHeight and mWidth and check against those here.
if ((w != 0) || (h != 0)) { if ((w != 0) || (h != 0)) {
LOGE("dequeuebuffer: invalid buffer size! Req: %dx%d, Found: %dx%d", if ((w != mDefaultWidth) || (h != mDefaultHeight)) {
mDefaultWidth, mDefaultHeight, w, h); LOGE("dequeuebuffer: invalid buffer size! Req: %dx%d, Found: %dx%d",
return BAD_VALUE; mDefaultWidth, mDefaultHeight, w, h);
return BAD_VALUE;
}
} }
status_t returnFlags(OK); status_t returnFlags(OK);