From f70e5c59f6f4ac2ba00f9ac3a5b656c636195ba6 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Sun, 18 Sep 2016 23:45:49 -0700
Subject: aac working

---
 channels/rdpsnd/pulse/rdpsnd_pulse.c |  2 +-
 libfreerdp-utils/nrdp_avcodec.c      | 38 ------------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/channels/rdpsnd/pulse/rdpsnd_pulse.c b/channels/rdpsnd/pulse/rdpsnd_pulse.c
index 5e45c3a..98c1b27 100644
--- a/channels/rdpsnd/pulse/rdpsnd_pulse.c
+++ b/channels/rdpsnd/pulse/rdpsnd_pulse.c
@@ -593,7 +593,7 @@ static void rdpsnd_pulse_play(rdpsndDevicePlugin* device, uint8* data, int size)
 					printf("not ok nrdp_avcodec_audio_get_frame_data\n");
 					return;
 				}
-				size = bytes / 2;
+				size = bytes;
 				src = decoded_data;
 			}
 			else
diff --git a/libfreerdp-utils/nrdp_avcodec.c b/libfreerdp-utils/nrdp_avcodec.c
index 0646597..69e0e16 100644
--- a/libfreerdp-utils/nrdp_avcodec.c
+++ b/libfreerdp-utils/nrdp_avcodec.c
@@ -385,45 +385,7 @@ nrdp_avcodec_audio_get_frame_data(void* obj, void* data, int data_bytes)
     }
     if (self->frame->format == AV_SAMPLE_FMT_S16)
     {
-#if 0
-        int index;
-        int* src32;
-        short* src16;
-        short* dst16;
-
-        src32 = (int*)(self->frame->data[0]);
-        src16 = (short*)(self->frame->data[0]);
-        dst16 = (short*)data;
-        for (index = 0; index < data_bytes / 2; index++)
-        {
-            //dst16[index] = src32[index] >> 16;
-            dst16[index] = src16[index * 2];
-        }
-#endif
         memcpy(data, self->frame->data[0], data_bytes);
-        freerdp_hexdump(self->frame->data[0], 64);
-//	//printf("hi %d\n", frame->);
-#if 0
-     float* src[8];
-     short* dst;
-     int index;
-
-     src[0] = (float*)(self->frame->data[0]);
-     //src[1] = (float*)(self->frame->data[1]);
-     dst = (short*)data;
-
-	 for (index = 0; index < self->frame->nb_samples; index++)
-            {
-                if (data_bytes < 4) /* 2 shorts */
-                {
-                    break;
-                }
-                dst[0] = src[0][index] * 32768;
-                //dst[1] = src[1][index] * 32768;
-                dst += 2;
-                data_bytes -= 4; /* 2 shorts */
-            }
-#endif
     }
     else if (self->frame->format == AV_SAMPLE_FMT_FLTP)
     {
-- 
cgit v1.2.3