Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix b/138659536 - [All] RVC - CTS : 9 CtsNativeMidiTestCases are failing

Browse Source 
Bug: 138659536
Test: build, install, run CTS tests, pass
Change-Id: I8eeb88642c1d8d151c6c133ee133342b4ff7f0ef
This commit is contained in:
Paul McLean
2019-08-05 12:30:56 -06:00
parent 922859af1d
commit 5090a6d6b7
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
media/native/midi/amidi.cpp
View File

@@ -142,7 +142,7 @@ static media_status_t AMIDI_getDeviceInfo(const AMidiDevice *device,
return AMEDIA_OK;
}
media_status_t AMidiDevice_fromJava(JNIEnv *env, jobject j_midiDeviceObj,
media_status_t AMIDI_API AMidiDevice_fromJava(JNIEnv *env, jobject j_midiDeviceObj,
AMidiDevice** devicePtrPtr)
{
if (j_midiDeviceObj == nullptr) {
@@ -188,7 +188,7 @@ media_status_t AMidiDevice_fromJava(JNIEnv *env, jobject j_midiDeviceObj,
return AMEDIA_OK;
}
media_status_t AMidiDevice_release(const AMidiDevice *device)
media_status_t AMIDI_API AMidiDevice_release(const AMidiDevice *device)
{
if (device == nullptr || device->midiDeviceObj == nullptr) {
return AMEDIA_ERROR_INVALID_PARAMETER;
@@ -217,21 +217,21 @@ media_status_t AMidiDevice_release(const AMidiDevice *device)
return AMEDIA_OK;
}
int32_t AMidiDevice_getType(const AMidiDevice *device) {
int32_t AMIDI_API AMidiDevice_getType(const AMidiDevice *device) {
if (device == nullptr) {
return AMEDIA_ERROR_INVALID_PARAMETER;
}
return device->deviceInfo.type;
}
ssize_t AMidiDevice_getNumInputPorts(const AMidiDevice *device) {
ssize_t AMIDI_API AMidiDevice_getNumInputPorts(const AMidiDevice *device) {
if (device == nullptr) {
return AMEDIA_ERROR_INVALID_PARAMETER;
}
return device->deviceInfo.inputPortCount;
}
ssize_t AMidiDevice_getNumOutputPorts(const AMidiDevice *device) {
ssize_t AMIDI_API AMidiDevice_getNumOutputPorts(const AMidiDevice *device) {
if (device == nullptr) {
return AMEDIA_ERROR_INVALID_PARAMETER;
}
@@ -291,7 +291,7 @@ static void AMIDI_closePort(AMIDI_Port *port) {
/*
* Output (receiving) API
*/
media_status_t AMidiOutputPort_open(const AMidiDevice *device, int32_t portNumber,
media_status_t AMIDI_API AMidiOutputPort_open(const AMidiDevice *device, int32_t portNumber,
AMidiOutputPort **outOutputPortPtr) {
return AMIDI_openPort(device, portNumber, PORTTYPE_OUTPUT, (AMIDI_Port**)outOutputPortPtr);
}
@@ -350,7 +350,7 @@ private:
AMIDI_Port *mPort;
};
ssize_t AMidiOutputPort_receive(const AMidiOutputPort *outputPort, int32_t *opcodePtr,
ssize_t AMIDI_API AMidiOutputPort_receive(const AMidiOutputPort *outputPort, int32_t *opcodePtr,
uint8_t *buffer, size_t maxBytes, size_t* numBytesReceivedPtr, int64_t *timestampPtr) {
if (outputPort == nullptr || buffer == nullptr) {
@@ -361,19 +361,19 @@ ssize_t AMidiOutputPort_receive(const AMidiOutputPort *outputPort, int32_t *opco
numBytesReceivedPtr, timestampPtr);
}
void AMidiOutputPort_close(const AMidiOutputPort *outputPort) {
void AMIDI_API AMidiOutputPort_close(const AMidiOutputPort *outputPort) {
AMIDI_closePort((AMIDI_Port*)outputPort);
}
/*
* Input (sending) API
*/
media_status_t AMidiInputPort_open(const AMidiDevice *device, int32_t portNumber,
media_status_t AMIDI_API AMidiInputPort_open(const AMidiDevice *device, int32_t portNumber,
AMidiInputPort **outInputPortPtr) {
return AMIDI_openPort(device, portNumber, PORTTYPE_INPUT, (AMIDI_Port**)outInputPortPtr);
}
void AMidiInputPort_close(const AMidiInputPort *inputPort) {
void AMIDI_API AMidiInputPort_close(const AMidiInputPort *inputPort) {
AMIDI_closePort((AMIDI_Port*)inputPort);
}
@@ -386,12 +386,12 @@ static ssize_t AMIDI_makeSendBuffer(
return numBytes + AMIDI_PACKET_OVERHEAD;
}
ssize_t AMidiInputPort_send(const AMidiInputPort *inputPort, const uint8_t *buffer,
ssize_t AMIDI_API AMidiInputPort_send(const AMidiInputPort *inputPort, const uint8_t *buffer,
size_t numBytes) {
return AMidiInputPort_sendWithTimestamp(inputPort, buffer, numBytes, 0);
}
ssize_t AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
ssize_t AMIDI_API AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
const uint8_t *data, size_t numBytes, int64_t timestamp) {
if (inputPort == nullptr || data == nullptr) {
return AMEDIA_ERROR_INVALID_PARAMETER;
@@ -423,7 +423,7 @@ ssize_t AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
return numSent;
}
media_status_t AMidiInputPort_sendFlush(const AMidiInputPort *inputPort) {
media_status_t AMIDI_API AMidiInputPort_sendFlush(const AMidiInputPort *inputPort) {
if (inputPort == nullptr) {
return AMEDIA_ERROR_INVALID_PARAMETER;
}

28
media/native/midi/include/amidi/AMidi.h
View File

@@ -37,6 +37,8 @@
extern "C" {
#endif
#define AMIDI_API __attribute__((visibility("default")))
typedef struct AMidiDevice AMidiDevice;
typedef struct AMidiInputPort AMidiInputPort;
typedef struct AMidiOutputPort AMidiOutputPort;
@@ -78,7 +80,7 @@ enum {
* is null or already connected to a native AMidiDevice
* @see AMEDIA_ERROR_UNKNOWN - an unknown error occurred.
*/
media_status_t AMidiDevice_fromJava(
media_status_t AMIDI_API AMidiDevice_fromJava(
JNIEnv *env, jobject midiDeviceObj, AMidiDevice **outDevicePtrPtr) __INTRODUCED_IN(29);
/**
@@ -93,7 +95,7 @@ media_status_t AMidiDevice_fromJava(
* @see AMEDIA_ERROR_INVALID_OBJECT - the JNI interface initialization to the associated java MidiDevice failed.
* @see AMEDIA_ERROR_UNKNOWN - couldn't retrieve the device info.
*/
media_status_t AMidiDevice_release(const AMidiDevice *midiDevice) __INTRODUCED_IN(29);
media_status_t AMIDI_API AMidiDevice_release(const AMidiDevice *midiDevice) __INTRODUCED_IN(29);
/**
* Gets the MIDI device type.
@@ -108,7 +110,7 @@ media_status_t AMidiDevice_release(const AMidiDevice *midiDevice) __INTRODUCED_I
* @see AMEDIA_ERROR_INVALID_PARAMETER - the device parameter is NULL.
* @see AMEDIA_ERROR_UNKNOWN - Unknown error.
*/
int32_t AMidiDevice_getType(const AMidiDevice *device) __INTRODUCED_IN(29);
int32_t AMIDI_API AMidiDevice_getType(const AMidiDevice *device) __INTRODUCED_IN(29);
/**
* Gets the number of input (sending) ports available on the specified MIDI device.
@@ -120,7 +122,7 @@ int32_t AMidiDevice_getType(const AMidiDevice *device) __INTRODUCED_IN(29);
* @see AMEDIA_ERROR_INVALID_PARAMETER - the device parameter is NULL.
* @see AMEDIA_ERROR_UNKNOWN - couldn't retrieve the device info.
*/
ssize_t AMidiDevice_getNumInputPorts(const AMidiDevice *device) __INTRODUCED_IN(29);
ssize_t AMIDI_API AMidiDevice_getNumInputPorts(const AMidiDevice *device) __INTRODUCED_IN(29);
/**
* Gets the number of output (receiving) ports available on the specified MIDI device.
@@ -132,7 +134,7 @@ ssize_t AMidiDevice_getNumInputPorts(const AMidiDevice *device) __INTRODUCED_IN(
* @see AMEDIA_ERROR_INVALID_PARAMETER - the device parameter is NULL.
* @see AMEDIA_ERROR_UNKNOWN - couldn't retrieve the device info.
*/
ssize_t AMidiDevice_getNumOutputPorts(const AMidiDevice *device) __INTRODUCED_IN(29);
ssize_t AMIDI_API AMidiDevice_getNumOutputPorts(const AMidiDevice *device) __INTRODUCED_IN(29);
/*
* API for receiving data from the Output port of a device.
@@ -150,7 +152,7 @@ ssize_t AMidiDevice_getNumOutputPorts(const AMidiDevice *device) __INTRODUCED_IN
* @return AMEDIA_OK, or a negative error code:
* @see AMEDIA_ERROR_UNKNOWN - Unknown Error.
*/
media_status_t AMidiOutputPort_open(const AMidiDevice *device, int32_t portNumber,
media_status_t AMIDI_API AMidiOutputPort_open(const AMidiDevice *device, int32_t portNumber,
AMidiOutputPort **outOutputPortPtr) __INTRODUCED_IN(29);
/**
@@ -158,7 +160,7 @@ media_status_t AMidiOutputPort_open(const AMidiDevice *device, int32_t portNumbe
*
* @param outputPort The native API port identifier of the port.
*/
void AMidiOutputPort_close(const AMidiOutputPort *outputPort) __INTRODUCED_IN(29);
void AMIDI_API AMidiOutputPort_close(const AMidiOutputPort *outputPort) __INTRODUCED_IN(29);
/**
* Receives the next pending MIDI message. To retrieve all pending messages, the client should
@@ -178,7 +180,7 @@ void AMidiOutputPort_close(const AMidiOutputPort *outputPort) __INTRODUCED_IN(29
* @return the number of messages received (either 0 or 1), or a negative error code:
* @see AMEDIA_ERROR_UNKNOWN - Unknown Error.
*/
ssize_t AMidiOutputPort_receive(const AMidiOutputPort *outputPort, int32_t *opcodePtr,
ssize_t AMIDI_API AMidiOutputPort_receive(const AMidiOutputPort *outputPort, int32_t *opcodePtr,
uint8_t *buffer, size_t maxBytes, size_t* numBytesReceivedPtr, int64_t *outTimestampPtr) __INTRODUCED_IN(29);
/*
@@ -197,7 +199,7 @@ ssize_t AMidiOutputPort_receive(const AMidiOutputPort *outputPort, int32_t *opco
* @return AMEDIA_OK, or a negative error code:
* @see AMEDIA_ERROR_UNKNOWN - Unknown Error.
*/
media_status_t AMidiInputPort_open(const AMidiDevice *device, int32_t portNumber,
media_status_t AMIDI_API AMidiInputPort_open(const AMidiDevice *device, int32_t portNumber,
AMidiInputPort **outInputPortPtr) __INTRODUCED_IN(29);
/**
@@ -210,7 +212,7 @@ media_status_t AMidiInputPort_open(const AMidiDevice *device, int32_t portNumber
* @return The number of bytes sent, which could be less than specified or a negative error code:
* @see AMEDIA_ERROR_INVALID_PARAMETER - The specified port was NULL, the specified buffer was NULL.
*/
ssize_t AMidiInputPort_send(const AMidiInputPort *inputPort, const uint8_t *buffer,
ssize_t AMIDI_API AMidiInputPort_send(const AMidiInputPort *inputPort, const uint8_t *buffer,
size_t numBytes) __INTRODUCED_IN(29);
/**
@@ -224,7 +226,7 @@ ssize_t AMidiInputPort_send(const AMidiInputPort *inputPort, const uint8_t *buff
* @return The number of bytes sent, which could be less than specified or a negative error code:
* @see AMEDIA_ERROR_INVALID_PARAMETER - The specified port was NULL, the specified buffer was NULL.
*/
ssize_t AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
ssize_t AMIDI_API AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
const uint8_t *buffer, size_t numBytes, int64_t timestamp) __INTRODUCED_IN(29);
/**
@@ -238,14 +240,14 @@ ssize_t AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
* @see AMEDIA_ERROR_UNSUPPORTED - The FLUSH command couldn't
* be sent.
*/
media_status_t AMidiInputPort_sendFlush(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
media_status_t AMIDI_API AMidiInputPort_sendFlush(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
/**
* Closes the input port.
*
* @param inputPort Identifies the input (sending) port to close.
*/
void AMidiInputPort_close(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
void AMIDI_API AMidiInputPort_close(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
#endif /* __ANDROID_API__ >= 29 */