From 07b388f8d4a82a8a518b2a34eb0b1fdf79fa300d Mon Sep 17 00:00:00 2001 From: Viliam Mateicka Date: Thu, 3 Dec 2009 15:00:13 +0100 Subject: null_encoder: use pcm_buffer --- src/encoder/null_encoder.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'src/encoder') diff --git a/src/encoder/null_encoder.c b/src/encoder/null_encoder.c index b1c886a0..3a73e398 100644 --- a/src/encoder/null_encoder.c +++ b/src/encoder/null_encoder.c @@ -20,16 +20,15 @@ #include "config.h" #include "encoder_api.h" #include "encoder_plugin.h" +#include "pcm_buffer.h" #include #include -#define MAX_BUFFER 32768 - struct null_encoder { struct encoder encoder; - unsigned char buffer[MAX_BUFFER]; + struct pcm_buffer buffer; size_t buffer_length; }; @@ -61,6 +60,15 @@ null_encoder_finish(struct encoder *_encoder) g_free(encoder); } +static void +null_encoder_close(struct encoder *_encoder) +{ + struct null_encoder *encoder = (struct null_encoder *)_encoder; + + pcm_buffer_deinit(&encoder->buffer); +} + + static bool null_encoder_open(struct encoder *_encoder, G_GNUC_UNUSED struct audio_format *audio_format, @@ -69,6 +77,7 @@ null_encoder_open(struct encoder *_encoder, struct null_encoder *encoder = (struct null_encoder *)_encoder; encoder->buffer_length = 0; + pcm_buffer_init(&encoder->buffer); return true; } @@ -79,11 +88,9 @@ null_encoder_write(struct encoder *_encoder, G_GNUC_UNUSED GError **error) { struct null_encoder *encoder = (struct null_encoder *)_encoder; + char *buffer = pcm_buffer_get(&encoder->buffer, encoder->buffer_length + length); - assert(length + encoder->buffer_length < MAX_BUFFER); - - memcpy(encoder->buffer+encoder->buffer_length, - data, length); + memcpy(buffer+encoder->buffer_length, data, length); encoder->buffer_length += length; return true; @@ -93,15 +100,15 @@ static size_t null_encoder_read(struct encoder *_encoder, void *dest, size_t length) { struct null_encoder *encoder = (struct null_encoder *)_encoder; + char *buffer = pcm_buffer_get(&encoder->buffer, encoder->buffer_length); if (length > encoder->buffer_length) length = encoder->buffer_length; - memcpy(dest, encoder->buffer, length); + memcpy(dest, buffer, length); encoder->buffer_length -= length; - memmove(encoder->buffer, encoder->buffer + length, - encoder->buffer_length); + memmove(buffer, buffer + length, encoder->buffer_length); return length; } @@ -111,6 +118,7 @@ const struct encoder_plugin null_encoder_plugin = { .init = null_encoder_init, .finish = null_encoder_finish, .open = null_encoder_open, + .close = null_encoder_close, .write = null_encoder_write, .read = null_encoder_read, }; -- cgit v1.2.3