Code Cleanup

diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c
index 3ebf880..6f8fb42 100644 (file)
--- a/channels/audin/client/audin_main.c
+++ b/channels/audin/client/audin_main.c
@@ -97,7 +97,6 @@ struct _AUDIN_PLUGIN
        rdpContext* rdpcontext;
        BOOL attached;
        wStream* data;
-       wStream* buffer;
        AUDIO_FORMAT* format;
        UINT32 FramesPerPacket;
 
@@ -739,7 +738,6 @@ static UINT audin_plugin_terminated(IWTSPlugin* pPlugin)
 
        freerdp_dsp_context_free(audin->dsp_context);
        Stream_Free(audin->data, TRUE);
-       Stream_Free(audin->buffer, TRUE);
        free(audin->subsystem);
        free(audin->device_name);
        free(audin->listener_callback);
@@ -1013,9 +1011,8 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 
        audin->log = WLog_Get(TAG);
        audin->data = Stream_New(NULL, 4096);
-       audin->buffer = Stream_New(NULL, 4096);
 
-       if (!audin->data || !audin->buffer)
+       if (!audin->data)
                goto out;
 
        audin->dsp_context = freerdp_dsp_context_new(TRUE);

diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c
index d53d8a0..68bfd06 100644 (file)
--- a/libfreerdp/codec/dsp_ffmpeg.c
+++ b/libfreerdp/codec/dsp_ffmpeg.c
@@ -553,22 +553,21 @@ BOOL freerdp_dsp_ffmpeg_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT*
        }
        else
        {
-               int samples, rest;
-               rest = samples = context->resampled->nb_samples;
+               int copied = 0;
+               int rest = context->resampled->nb_samples;
 
                do
                {
-                       int restSamples;
-                       int inSamples = samples;
+                       int inSamples = rest;
 
-                       if (samples + context->bufferedSamples > context->context->frame_size)
+                       if (inSamples + context->bufferedSamples > context->context->frame_size)
                                inSamples = context->context->frame_size - context->bufferedSamples;
 
-                       restSamples = samples - inSamples;
                        rc = av_samples_copy(context->buffered->extended_data, context->resampled->extended_data,
-                                            context->bufferedSamples, 0, inSamples,
+                                            context->bufferedSamples, copied, inSamples,
                                             context->context->channels, context->context->sample_fmt);
                        rest -= inSamples;
+                       copied += inSamples;
                        context->bufferedSamples += inSamples;
 
                        if (context->context->frame_size <= context->bufferedSamples)
@@ -580,15 +579,6 @@ BOOL freerdp_dsp_ffmpeg_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT*
 
                                context->bufferedSamples = 0;
                        }
-
-                       if (restSamples > 0)
-                       {
-                               rc = av_samples_copy(context->buffered->extended_data, context->resampled->extended_data,
-                                                    context->bufferedSamples, inSamples, restSamples,
-                                                    context->context->channels, context->context->sample_fmt);
-                               rest -= restSamples;
-                               context->bufferedSamples += restSamples;
-                       }
                }
                while (rest > 0);