diff options
author | John Grossman <johngro@google.com> | 2012-02-10 13:46:24 -0800 |
---|---|---|
committer | John Grossman <johngro@google.com> | 2012-02-10 13:46:24 -0800 |
commit | 7719f633bd8747b2f56c7be0f102ff131c074c2e (patch) | |
tree | 69bafd0561f9a048c960236d18646bdeb9e5de7c /libvideoeditor | |
parent | 49f000409c48afd40366baef2e8fc8ea838b782f (diff) | |
download | frameworks_av-7719f633bd8747b2f56c7be0f102ff131c074c2e.zip frameworks_av-7719f633bd8747b2f56c7be0f102ff131c074c2e.tar.gz frameworks_av-7719f633bd8747b2f56c7be0f102ff131c074c2e.tar.bz2 |
Update method sigs.
Update the getNextBuffer signatures to have an additional (but
ignorable) parameter used to implement timed audio output.
Change-Id: Icb98e4af4d136c234ae8c5cbb4a5de4350b436bb
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorSRC.cpp | 2 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorSRC.h | 2 | ||||
-rwxr-xr-x | libvideoeditor/vss/src/VideoEditorResampler.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorSRC.cpp b/libvideoeditor/lvpp/VideoEditorSRC.cpp index 1d34ca5..f8578b2 100755 --- a/libvideoeditor/lvpp/VideoEditorSRC.cpp +++ b/libvideoeditor/lvpp/VideoEditorSRC.cpp @@ -199,7 +199,7 @@ status_t VideoEditorSRC::read( return OK; } -status_t VideoEditorSRC::getNextBuffer(AudioBufferProvider::Buffer *pBuffer) { +status_t VideoEditorSRC::getNextBuffer(AudioBufferProvider::Buffer *pBuffer, int64_t pts) { ALOGV("getNextBuffer %d, chan = %d", pBuffer->frameCount, mChannelCnt); uint32_t done = 0; uint32_t want = pBuffer->frameCount * mChannelCnt * 2; diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h index 3eb8c6c..2b7e9b6 100755 --- a/libvideoeditor/lvpp/VideoEditorSRC.h +++ b/libvideoeditor/lvpp/VideoEditorSRC.h @@ -35,7 +35,7 @@ public: virtual status_t read ( MediaBuffer **buffer, const ReadOptions *options = NULL); - virtual status_t getNextBuffer(Buffer* buffer); + virtual status_t getNextBuffer(Buffer* buffer, int64_t pts); virtual void releaseBuffer(Buffer* buffer); // Sampling freqencies diff --git a/libvideoeditor/vss/src/VideoEditorResampler.cpp b/libvideoeditor/vss/src/VideoEditorResampler.cpp index ff018eb..38dffb7 100755 --- a/libvideoeditor/vss/src/VideoEditorResampler.cpp +++ b/libvideoeditor/vss/src/VideoEditorResampler.cpp @@ -26,7 +26,7 @@ struct VideoEditorResampler : public AudioBufferProvider { public: - virtual status_t getNextBuffer(Buffer* buffer); + virtual status_t getNextBuffer(Buffer* buffer, int64_t pts); virtual void releaseBuffer(Buffer* buffer); enum { //Sampling freq @@ -53,7 +53,7 @@ struct VideoEditorResampler : public AudioBufferProvider { #define MAX_SAMPLEDURATION_FOR_CONVERTION 40 //ms -status_t VideoEditorResampler::getNextBuffer(AudioBufferProvider::Buffer *pBuffer) { +status_t VideoEditorResampler::getNextBuffer(AudioBufferProvider::Buffer *pBuffer, int64_t pts) { uint32_t dataSize = pBuffer->frameCount * this->nbChannels * sizeof(int16_t); mTmpInBuffer = (int16_t*)malloc(dataSize); |