swr: move silence buffer to context to avoid per use malloc/free

Michael Niedermayer committed 13 years ago

Commit db4e0ec1 parent dc658842 files · +9 −9Browse files

Unified · Split

2 files

libswresample/swresample.c +8 −9
libswresample/swresample_internal.h +1 −0

         free_temp(&s->midbuf);
         free_temp(&s->preout);
         free_temp(&s->in_buffer);
+        free_temp(&s->silence);
         free_temp(&s->drop_temp);
         free_temp(&s->dither.noise);
         free_temp(&s->dither.temp);
     free_temp(&s->midbuf);
     free_temp(&s->preout);
     free_temp(&s->in_buffer);
+    free_temp(&s->silence);
     free_temp(&s->drop_temp);
     free_temp(&s->dither.noise);
     free_temp(&s->dither.temp);
     s->resample_first= RSC*s->out.ch_count/s->in.ch_count - RSC < s->out_sample_rate/(float)s-> in_sample_rate - 1.0;
     s->in_buffer= s->in;
+    s->silence  = s->in;
     s->drop_temp= s->out;
     if(!s->resample && !s->rematrix && !s->channel_map && !s->dither.method){
 int swr_inject_silence(struct SwrContext *s, int count){
     int ret, i;
-    AudioData silence = s->in;
     uint8_t *tmp_arg[SWR_CH_MAX];
     if(count <= 0)
         return 0;
-    silence.count = 0;
+    if((ret=swri_realloc_audio(&s->silence, count))<0)
-    silence.data  = NULL;
-    if((ret=swri_realloc_audio(&silence, count))<0)
         return ret;
-    if(silence.planar) for(i=0; i<silence.ch_count; i++) {
+    if(s->silence.planar) for(i=0; i<s->silence.ch_count; i++) {
-        memset(silence.ch[i], silence.bps==1 ? 0x80 : 0, count*silence.bps);
+        memset(s->silence.ch[i], s->silence.bps==1 ? 0x80 : 0, count*s->silence.bps);
     } else
-        memset(silence.ch[0], silence.bps==1 ? 0x80 : 0, count*silence.bps*silence.ch_count);
+        memset(s->silence.ch[0], s->silence.bps==1 ? 0x80 : 0, count*s->silence.bps*s->silence.ch_count);
-    reversefill_audiodata(&silence, tmp_arg);
+    reversefill_audiodata(&s->silence, tmp_arg);
     av_log(s, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", count);
     ret = swr_convert(s, NULL, 0, (const uint8_t**)tmp_arg, count);
-    av_freep(&silence.data);
     return ret;
 }

libswresample/swresample_internal.h+1−0

@@ -113,6 +113,7 @@ struct SwrContext { · 112 unmodified lines
113	AudioData preout; ///< pre-output audio data: used for rematrix/resample	113	AudioData preout; ///< pre-output audio data: used for rematrix/resample
114	AudioData out; ///< converted output audio data	114	AudioData out; ///< converted output audio data
115	AudioData in_buffer; ///< cached audio data (convert and resample purpose)	115	AudioData in_buffer; ///< cached audio data (convert and resample purpose)
		116	AudioData silence; ///< temporary with silence
116	AudioData drop_temp; ///< temporary used to discard output	117	AudioData drop_temp; ///< temporary used to discard output
117	int in_buffer_index; ///< cached buffer position	118	int in_buffer_index; ///< cached buffer position
118	int in_buffer_count; ///< cached buffer length	119	int in_buffer_count; ///< cached buffer length

swr: move silence buffer to context to avoid per use malloc/free

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code