bda7469d9b
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error. Do the same if start fails due to the same error after time out in obtainBuffer(). Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails. This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash. Same modifications for AudioRecord. Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
108 lines
2.9 KiB
C++
108 lines
2.9 KiB
C++
/*
|
|
**
|
|
** Copyright 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.
|
|
*/
|
|
|
|
#define LOG_TAG "IAudioRecord"
|
|
//#define LOG_NDEBUG 0
|
|
#include <utils/Log.h>
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <binder/Parcel.h>
|
|
|
|
#include <media/IAudioRecord.h>
|
|
|
|
namespace android {
|
|
|
|
enum {
|
|
GET_CBLK = IBinder::FIRST_CALL_TRANSACTION,
|
|
START,
|
|
STOP
|
|
};
|
|
|
|
class BpAudioRecord : public BpInterface<IAudioRecord>
|
|
{
|
|
public:
|
|
BpAudioRecord(const sp<IBinder>& impl)
|
|
: BpInterface<IAudioRecord>(impl)
|
|
{
|
|
}
|
|
|
|
virtual status_t start()
|
|
{
|
|
Parcel data, reply;
|
|
data.writeInterfaceToken(IAudioRecord::getInterfaceDescriptor());
|
|
status_t status = remote()->transact(START, data, &reply);
|
|
if (status == NO_ERROR) {
|
|
status = reply.readInt32();
|
|
} else {
|
|
LOGW("start() error: %s", strerror(-status));
|
|
}
|
|
return status;
|
|
}
|
|
|
|
virtual void stop()
|
|
{
|
|
Parcel data, reply;
|
|
data.writeInterfaceToken(IAudioRecord::getInterfaceDescriptor());
|
|
remote()->transact(STOP, data, &reply);
|
|
}
|
|
|
|
virtual sp<IMemory> getCblk() const
|
|
{
|
|
Parcel data, reply;
|
|
sp<IMemory> cblk;
|
|
data.writeInterfaceToken(IAudioRecord::getInterfaceDescriptor());
|
|
status_t status = remote()->transact(GET_CBLK, data, &reply);
|
|
if (status == NO_ERROR) {
|
|
cblk = interface_cast<IMemory>(reply.readStrongBinder());
|
|
}
|
|
return cblk;
|
|
}
|
|
};
|
|
|
|
IMPLEMENT_META_INTERFACE(AudioRecord, "android.media.IAudioRecord");
|
|
|
|
// ----------------------------------------------------------------------
|
|
|
|
status_t BnAudioRecord::onTransact(
|
|
uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)
|
|
{
|
|
switch(code) {
|
|
case GET_CBLK: {
|
|
CHECK_INTERFACE(IAudioRecord, data, reply);
|
|
reply->writeStrongBinder(getCblk()->asBinder());
|
|
return NO_ERROR;
|
|
} break;
|
|
case START: {
|
|
CHECK_INTERFACE(IAudioRecord, data, reply);
|
|
reply->writeInt32(start());
|
|
return NO_ERROR;
|
|
} break;
|
|
case STOP: {
|
|
CHECK_INTERFACE(IAudioRecord, data, reply);
|
|
stop();
|
|
return NO_ERROR;
|
|
} break;
|
|
default:
|
|
return BBinder::onTransact(code, data, reply, flags);
|
|
}
|
|
}
|
|
|
|
}; // namespace android
|
|
|