diff options
| author | Andy McFadden <fadden@android.com> | 2013-05-17 09:50:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-17 09:50:37 -0700 |
| commit | b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc (patch) | |
| tree | ab4c5a1224d58ee88e046f765570aea138a5bca4 /media | |
| parent | b5b2d03fc2c154a613ba68b599cd474b3e6ccec3 (diff) | |
| parent | 4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd (diff) | |
| download | frameworks_av-b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc.zip frameworks_av-b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc.tar.gz frameworks_av-b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc.tar.bz2 | |
am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev
* commit '4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd':
Adjust timestamp scale
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 6 | ||||
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index 3854e52..45a70e7 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -288,7 +288,7 @@ bool GraphicBufferSource::fillCodecBuffer_l() { mBufferSlot[item.mBuf] = item.mGraphicBuffer; } - err = submitBuffer_l(mBufferSlot[item.mBuf], item.mTimestamp, cbi); + err = submitBuffer_l(mBufferSlot[item.mBuf], item.mTimestamp / 1000, cbi); if (err != OK) { ALOGV("submitBuffer_l failed, releasing bq buf %d", item.mBuf); mBufferQueue->releaseBuffer(item.mBuf, EGL_NO_DISPLAY, @@ -328,7 +328,7 @@ status_t GraphicBufferSource::signalEndOfInputStream() { } status_t GraphicBufferSource::submitBuffer_l(sp<GraphicBuffer>& graphicBuffer, - int64_t timestamp, int cbi) { + int64_t timestampUsec, int cbi) { ALOGV("submitBuffer_l cbi=%d", cbi); CodecBuffer& codecBuffer(mCodecBuffers.editItemAt(cbi)); codecBuffer.mGraphicBuffer = graphicBuffer; @@ -343,7 +343,7 @@ status_t GraphicBufferSource::submitBuffer_l(sp<GraphicBuffer>& graphicBuffer, status_t err = mNodeInstance->emptyDirectBuffer(header, 0, 4 + sizeof(buffer_handle_t), OMX_BUFFERFLAG_ENDOFFRAME, - timestamp); + timestampUsec); if (err != OK) { ALOGW("WARNING: emptyDirectBuffer failed: 0x%x", err); codecBuffer.mGraphicBuffer = NULL; diff --git a/media/libstagefright/omx/GraphicBufferSource.h b/media/libstagefright/omx/GraphicBufferSource.h index 7f1f22e..562d342 100644 --- a/media/libstagefright/omx/GraphicBufferSource.h +++ b/media/libstagefright/omx/GraphicBufferSource.h @@ -131,7 +131,7 @@ private: // Marks the mCodecBuffers entry as in-use, copies the GraphicBuffer // reference into the codec buffer, and submits the data to the codec. status_t submitBuffer_l(sp<GraphicBuffer>& graphicBuffer, - int64_t timestamp, int cbi); + int64_t timestampUsec, int cbi); // Submits an empty buffer, with the EOS flag set. Returns without // doing anything if we don't have a codec buffer available. |