diff options
author | Paul McLean <pmclean@google.com> | 2019-08-05 12:30:56 -0600 |
---|---|---|
committer | Paul McLean <pmclean@google.com> | 2019-08-05 12:30:56 -0600 |
commit | 5090a6d6b71f5996f83814e15e98b97a7b7643f7 (patch) | |
tree | c9d85f806e2fb67a489ed0e015c62a30ee74083a /media/native/midi/amidi.cpp | |
parent | 922859af1d5df5e04e0adc87332aa3bbc57e0f14 (diff) |
Fix b/138659536 - [All] RVC - CTS : 9 CtsNativeMidiTestCases are failing
Bug: 138659536
Test: build, install, run CTS tests, pass
Change-Id: I8eeb88642c1d8d151c6c133ee133342b4ff7f0ef
Diffstat (limited to 'media/native/midi/amidi.cpp')
-rw-r--r-- | media/native/midi/amidi.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/media/native/midi/amidi.cpp b/media/native/midi/amidi.cpp index 357bb5e50eee..46f28152cd6d 100644 --- a/media/native/midi/amidi.cpp +++ b/media/native/midi/amidi.cpp @@ -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; } |