apply struct base memory access for audio encoding into interface3

Change-Id: I6839b242fa4dd988e07ac171284aedce249881a9
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --git a/src/gstmaruinterface3.c b/src/gstmaruinterface3.c
index 1e23864..b9c52b6 100644 (file)
--- a/src/gstmaruinterface3.c
+++ b/src/gstmaruinterface3.c
@@ -480,6 +480,16 @@ struct audio_decode_output {
     uint8_t data;           // for pointing data address
 } __attribute__((packed));
 
+struct audio_encode_input {
+    int32_t inbuf_size;
+    uint8_t inbuf;          // for pointing inbuf address
+} __attribute__((packed));
+
+struct audio_encode_output {
+    int32_t len;
+    uint8_t data;           // for pointing data address
+} __attribute__((packed));
+
 static int
 decode_audio (CodecContext *ctx, int16_t *samples,
                     int *have_data, uint8_t *inbuf,
@@ -535,23 +545,28 @@ decode_audio (CodecContext *ctx, int16_t *samples,
 }
 
 static int
-encode_audio (CodecContext *ctx, uint8_t *out_buf,
-                    int max_size, uint8_t *in_buf,
-                    int in_size, int64_t timestamp,
+encode_audio (CodecContext *ctx, uint8_t *outbuf,
+                    int max_size, uint8_t *inbuf,
+                    int inbuf_size, int64_t timestamp,
                     CodecDevice *dev)
 {
-  int ret = 0;
+  int len = 0, ret = 0;
   gpointer buffer = NULL;
   uint32_t mem_offset;
+  size_t size = sizeof(inbuf_size) + inbuf_size;
 
   CODEC_LOG (DEBUG, "enter: %s\n", __func__);
 
-  ret = secure_device_mem(dev->fd, ctx->index, in_size, &buffer);
+  ret = secure_device_mem(dev->fd, ctx->index, inbuf_size, &buffer);
   if (ret < 0) {
+    GST_ERROR ("failed to get available memory to write inbuf");
     return -1;
   }
 
-  codec_encode_audio_data_to (in_size, max_size, in_buf, timestamp, buffer);
+  fill_size_header(buffer, size);
+  struct audio_encode_input *encode_input = buffer + sizeof(int32_t);
+  encode_input->inbuf_size = inbuf_size;
+  memcpy(&encode_input->inbuf, inbuf, inbuf_size);
 
   mem_offset = GET_OFFSET(buffer);
 
@@ -563,13 +578,19 @@ encode_audio (CodecContext *ctx, uint8_t *out_buf,
 
   GST_DEBUG ("encode_audio. mem_offset = 0x%x", mem_offset);
 
-  ret = codec_encode_audio_data_from (out_buf, device_mem + mem_offset);
+  struct audio_encode_output *encode_output = device_mem + mem_offset;
+  len = encode_output->len;
+  if (len > 0) {
+    memcpy (outbuf, &encode_output->data, len);
+  }
+
+  GST_DEBUG ("encode_audio. len: %d", len);
 
   release_device_mem(dev->fd, device_mem + mem_offset);
 
   CODEC_LOG (DEBUG, "leave: %s\n", __func__);
 
-  return ret;
+  return len;
 }
 
 //

diff --git a/src/gstmarumem.c b/src/gstmarumem.c
index 053b5e3..b8f80f8 100644 (file)
--- a/src/gstmarumem.c
+++ b/src/gstmarumem.c
@@ -260,6 +260,9 @@ codec_encode_audio_data_to (int in_size, int max_size, uint8_t *in_buf, int64_t
   memcpy (buffer + size, &in_size, sizeof(in_size));
   size += sizeof(in_size);
 
+  memcpy (buffer + size, &timestamp, sizeof(timestamp));
+  size += sizeof(timestamp);
+
   if (in_size > 0) {
     memcpy (buffer + size, in_buf, in_size);
     size += in_size;