diff options
| author | Pannag Sanketi <psanketi@google.com> | 2011-09-08 15:33:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-08 15:33:31 -0700 |
| commit | 7280088b2315b6c2eccd39f0f0363d498ec82f0d (patch) | |
| tree | 99130d99c527c29e2819002421f077f338cb3a7a /media | |
| parent | f7eade99250520f2c9c8366a20a9256c4b34abc1 (diff) | |
| parent | 7dc9b309f1ce01308bcfde9948ebfece32dc2870 (diff) | |
| download | frameworks_av-7280088b2315b6c2eccd39f0f0363d498ec82f0d.zip frameworks_av-7280088b2315b6c2eccd39f0f0363d498ec82f0d.tar.gz frameworks_av-7280088b2315b6c2eccd39f0f0363d498ec82f0d.tar.bz2 | |
Merge "Always set geometry in queuebuffer"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 50dd804..306f1f6 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// #define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "SurfaceMediaSource" #include <media/stagefright/SurfaceMediaSource.h> @@ -458,6 +458,10 @@ status_t SurfaceMediaSource::queueBuffer(int bufIndex, int64_t timestamp, LOGV("queueBuffer"); Mutex::Autolock lock(mMutex); + *outWidth = mDefaultWidth; + *outHeight = mDefaultHeight; + *outTransform = 0; + if (bufIndex < 0 || bufIndex >= mBufferCount) { LOGE("queueBuffer: slot index out of range [0, %d]: %d", mBufferCount, bufIndex); @@ -518,9 +522,6 @@ status_t SurfaceMediaSource::queueBuffer(int bufIndex, int64_t timestamp, // buffer is available onFrameReceivedLocked(); - *outWidth = mDefaultWidth; - *outHeight = mDefaultHeight; - *outTransform = 0; return OK; } |