OSDN Git Service

android: Add MTU data to Open Stream Audio IPC
authorAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Wed, 22 Jan 2014 10:34:44 +0000 (11:34 +0100)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Thu, 23 Jan 2014 09:34:19 +0000 (11:34 +0200)
MTU value for transport channel is sent in Open Stream response, which
is required to calculate number of frames which can be packed into
single media packet.

This is to avoid including GPLv2 licensed headers in Audio HAL
implementation.

android/a2dp.c
android/audio-msg.h

index a996f79..572e0d1 100644 (file)
@@ -1304,6 +1304,7 @@ static void bt_stream_open(const void *buf, uint16_t len)
        struct audio_rsp_open_stream *rsp;
        struct a2dp_setup *setup;
        int fd;
+       uint16_t omtu;
 
        DBG("");
 
@@ -1314,14 +1315,17 @@ static void bt_stream_open(const void *buf, uint16_t len)
                return;
        }
 
-       if (!avdtp_stream_get_transport(setup->stream, &fd, NULL, NULL, NULL)) {
+       if (!avdtp_stream_get_transport(setup->stream, &fd, NULL, &omtu,
+                                                               NULL)) {
                error("avdtp_stream_get_transport: failed");
                audio_ipc_send_rsp(AUDIO_OP_OPEN_STREAM, AUDIO_STATUS_FAILED);
                return;
        }
 
-       len = sizeof(struct audio_preset) + setup->preset->len;
+       len = sizeof(struct audio_rsp_open_stream) +
+                       sizeof(struct audio_preset) + setup->preset->len;
        rsp = g_malloc0(len);
+       rsp->mtu = omtu;
        rsp->preset->len = setup->preset->len;
        memcpy(rsp->preset->data, setup->preset->data, setup->preset->len);
 
index 8f03274..17cde09 100644 (file)
@@ -63,6 +63,7 @@ struct audio_cmd_open_stream {
 } __attribute__((packed));
 
 struct audio_rsp_open_stream {
+       uint16_t mtu;
        struct audio_preset preset[0];
 } __attribute__((packed));