postprocess: fix preallocating audio_frame2

to 6 seconds - it was thought so always but written in a wrong way

Author: MartinPulec

src/audio/postprocess.c

@@ -426,6 +426,7 @@ decode_audio_frame_postprocess(struct state_audio_postprocess *postprocess,
                     audio_frame2_get_channel_count(decompressed), AC_PCM,
                     audio_frame2_get_bps(decompressed),
                     audio_frame2_get_sample_rate(decompressed));
+                audio_frame2_reserve(postprocess->decoded, 6);
         }
         audio_frame2_append(postprocess->decoded, decompressed);
 
@@ -455,6 +456,7 @@ decode_audio_frame_postprocess(struct state_audio_postprocess *postprocess,
                     audio_frame2_get_channel_count(decompressed), AC_PCM,
                     audio_frame2_get_bps(decompressed),
                     audio_frame2_get_sample_rate(decompressed));
+                audio_frame2_reserve(d->frame, 6);
                 SWAP_PTR(d->frame, postprocess->decoded);
                 d->seconds = NS_TO_SEC_DBL(postprocess->t0 - t);
                 d->bytes_received = *received_bytes_cum;

src/audio/types.cpp

@@ -174,10 +174,10 @@ void audio_frame2::replace(int channel, size_t offset, const char *data, size_t
 /**
  * Reserves data for every channel with the specified length.
  */
-void audio_frame2::reserve(size_t length)
+void audio_frame2::reserve(size_t bytes)
 {
         for (size_t channel = 0; channel < channels.size(); ++channel) {
-                reserve(channel, length);
+                reserve(channel, bytes);
         }
 }
 
@@ -450,7 +450,6 @@ audio_frame2_alloc(int ch_count, audio_codec_t codec, int bps, int sample_rate)
 
         auto *ret = new audio_frame2();
         ret->init(ch_count, codec, bps, sample_rate);
-        ret->reserve(bps * ch_count * 6); ///< @todo
         return ret;
 }
 
@@ -559,6 +558,15 @@ audio_frame2_replace(struct audio_frame2 *dst, struct audio_frame2 **src)
         src = nullptr;
 }
 
+void
+audio_frame2_reserve(struct audio_frame2 *frame, double seconds)
+{
+        int bytes =
+            (int) (seconds * frame->get_sample_rate()) * frame->get_bps();
+
+        frame->reserve(bytes);
+}
+
 struct audio_frame2_resampler *
 audio_frame2_resampler_init()
 {

src/audio/types.h

@@ -159,7 +159,7 @@ struct audio_frame2
         void append(int channel, const char *data, size_t length);
         void append(audio_frame const &frame);
         void replace(int channel, size_t offset, const char *data, size_t length);
-        void reserve(size_t len);
+        void reserve(size_t bytes);
         void resize(int channel, size_t len);
         void reset();
         void set_timestamp(int64_t ts);
@@ -250,6 +250,8 @@ int             audio_frame2_get_sample_count(const struct audio_frame2 *frame);
 int             audio_frame2_get_sample_rate(const struct audio_frame2 *frame);
 int64_t         audio_frame2_get_timestamp(const struct audio_frame2 *frame);
 void audio_frame2_replace(struct audio_frame2 *dst, struct audio_frame2 **src);
+void audio_frame2_reserve(struct audio_frame2 *frame, double seconds);
+
 struct audio_frame2_resampler *audio_frame2_resampler_init();
 void delete_resampler(struct audio_frame2_resampler *resampler);
 bool audio_frame2_resample(struct audio_frame2_resampler *resampler,