c2db119d0a
Add comments about which methods implement the AudioBufferProvider interface. Simplified the definition of kInvalidPts. <stdint.h> is very hard to work with, there seems to be no way to use it reliably to get INT64_MAX without having a separate source file, which is ugly because it means kInvalidPts is not a compile-time constant. So I just deleted AudioBufferProvider.cpp and used a hard-coded constant instead. Added a default constructor for Buffer so that the fields aren't random (especially .raw which is used to determine if the buffer is valid). Make the pts for getNextBuffer default to kInvalidPTS so code that doesn't need a pts doesn't have to specify a value. Rename the parameter to AudioMixer::setBufferProvider to make it clearer. Change-Id: I87e7290884d4ed975b019f62d1ab6ae2bc5065a5
56 lines
1.7 KiB
C++
56 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2007 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_AUDIO_BUFFER_PROVIDER_H
|
|
#define ANDROID_AUDIO_BUFFER_PROVIDER_H
|
|
|
|
#include <utils/Errors.h>
|
|
|
|
namespace android {
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class AudioBufferProvider
|
|
{
|
|
public:
|
|
|
|
struct Buffer {
|
|
Buffer() : raw(NULL), frameCount(0) { }
|
|
union {
|
|
void* raw;
|
|
short* i16;
|
|
int8_t* i8;
|
|
};
|
|
size_t frameCount;
|
|
};
|
|
|
|
virtual ~AudioBufferProvider() {}
|
|
|
|
// value representing an invalid presentation timestamp
|
|
static const int64_t kInvalidPTS = 0x7FFFFFFFFFFFFFFFLL; // <stdint.h> is too painful
|
|
|
|
// pts is the local time when the next sample yielded by getNextBuffer
|
|
// will be rendered.
|
|
// Pass kInvalidPTS if the PTS is unknown or not applicable.
|
|
virtual status_t getNextBuffer(Buffer* buffer, int64_t pts = kInvalidPTS) = 0;
|
|
|
|
virtual void releaseBuffer(Buffer* buffer) = 0;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_AUDIO_BUFFER_PROVIDER_H
|