aboutsummaryrefslogtreecommitdiffstats
path: root/src/encoder
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-08-06 08:47:51 +0200
committerMax Kellermann <max@duempel.org>2013-08-06 09:02:48 +0200
commit7e53934ce3a673e77d12f4e1595dc75192c23098 (patch)
treecb678c3ef81add98bd67cd837860f7574b6f1a4f /src/encoder
parent7c2b5533649cc5337a0c548e5171b348177bd6a9 (diff)
downloadmpd-7e53934ce3a673e77d12f4e1595dc75192c23098.tar.gz
mpd-7e53934ce3a673e77d12f4e1595dc75192c23098.tar.xz
mpd-7e53934ce3a673e77d12f4e1595dc75192c23098.zip
encoder/lame: rename "buffer" to "output_buffer"
Diffstat (limited to 'src/encoder')
-rw-r--r--src/encoder/LameEncoderPlugin.cxx27
-rw-r--r--src/encoder/TwolameEncoderPlugin.cxx37
2 files changed, 33 insertions, 31 deletions
diff --git a/src/encoder/LameEncoderPlugin.cxx b/src/encoder/LameEncoderPlugin.cxx
index db93b93a3..9028fcac4 100644
--- a/src/encoder/LameEncoderPlugin.cxx
+++ b/src/encoder/LameEncoderPlugin.cxx
@@ -38,8 +38,8 @@ struct LameEncoder final {
lame_global_flags *gfp;
- unsigned char buffer[32768];
- size_t buffer_length;
+ unsigned char output_buffer[32768];
+ size_t output_buffer_length;
LameEncoder():encoder(lame_encoder_plugin) {}
@@ -209,7 +209,7 @@ lame_encoder_open(Encoder *_encoder, AudioFormat &audio_format,
return false;
}
- encoder->buffer_length = 0;
+ encoder->output_buffer_length = 0;
return true;
}
@@ -230,7 +230,7 @@ lame_encoder_write(Encoder *_encoder,
LameEncoder *encoder = (LameEncoder *)_encoder;
const int16_t *src = (const int16_t*)data;
- assert(encoder->buffer_length == 0);
+ assert(encoder->output_buffer_length == 0);
const unsigned num_frames =
length / encoder->audio_format.GetFrameSize();
@@ -245,8 +245,9 @@ lame_encoder_write(Encoder *_encoder,
}
int bytes_out = lame_encode_buffer_float(encoder->gfp, left, right,
- num_frames, encoder->buffer,
- sizeof(encoder->buffer));
+ num_frames,
+ encoder->output_buffer,
+ sizeof(encoder->output_buffer));
g_free(left);
g_free(right);
@@ -257,7 +258,7 @@ lame_encoder_write(Encoder *_encoder,
return false;
}
- encoder->buffer_length = (size_t)bytes_out;
+ encoder->output_buffer_length = (size_t)bytes_out;
return true;
}
@@ -266,14 +267,14 @@ lame_encoder_read(Encoder *_encoder, void *dest, size_t length)
{
LameEncoder *encoder = (LameEncoder *)_encoder;
- if (length > encoder->buffer_length)
- length = encoder->buffer_length;
+ if (length > encoder->output_buffer_length)
+ length = encoder->output_buffer_length;
- memcpy(dest, encoder->buffer, length);
+ memcpy(dest, encoder->output_buffer, length);
- encoder->buffer_length -= length;
- memmove(encoder->buffer, encoder->buffer + length,
- encoder->buffer_length);
+ encoder->output_buffer_length -= length;
+ memmove(encoder->output_buffer, encoder->output_buffer + length,
+ encoder->output_buffer_length);
return length;
}
diff --git a/src/encoder/TwolameEncoderPlugin.cxx b/src/encoder/TwolameEncoderPlugin.cxx
index cd85e43b6..3cf7b5db7 100644
--- a/src/encoder/TwolameEncoderPlugin.cxx
+++ b/src/encoder/TwolameEncoderPlugin.cxx
@@ -38,11 +38,12 @@ struct TwolameEncoder final {
twolame_options *options;
- unsigned char buffer[32768];
- size_t buffer_length;
+ unsigned char output_buffer[32768];
+ size_t output_buffer_length;
/**
- * Call libtwolame's flush function when the buffer is empty?
+ * Call libtwolame's flush function when the output_buffer is
+ * empty?
*/
bool flush;
@@ -209,7 +210,7 @@ twolame_encoder_open(Encoder *_encoder, AudioFormat &audio_format,
return false;
}
- encoder->buffer_length = 0;
+ encoder->output_buffer_length = 0;
encoder->flush = false;
return true;
@@ -240,22 +241,22 @@ twolame_encoder_write(Encoder *_encoder,
TwolameEncoder *encoder = (TwolameEncoder *)_encoder;
const int16_t *src = (const int16_t*)data;
- assert(encoder->buffer_length == 0);
+ assert(encoder->output_buffer_length == 0);
const unsigned num_frames =
length / encoder->audio_format.GetFrameSize();
int bytes_out = twolame_encode_buffer_interleaved(encoder->options,
src, num_frames,
- encoder->buffer,
- sizeof(encoder->buffer));
+ encoder->output_buffer,
+ sizeof(encoder->output_buffer));
if (bytes_out < 0) {
g_set_error(error, twolame_encoder_quark(), 0,
"twolame encoder failed");
return false;
}
- encoder->buffer_length = (size_t)bytes_out;
+ encoder->output_buffer_length = (size_t)bytes_out;
return true;
}
@@ -264,24 +265,24 @@ twolame_encoder_read(Encoder *_encoder, void *dest, size_t length)
{
TwolameEncoder *encoder = (TwolameEncoder *)_encoder;
- if (encoder->buffer_length == 0 && encoder->flush) {
+ if (encoder->output_buffer_length == 0 && encoder->flush) {
int ret = twolame_encode_flush(encoder->options,
- encoder->buffer,
- sizeof(encoder->buffer));
+ encoder->output_buffer,
+ sizeof(encoder->output_buffer));
if (ret > 0)
- encoder->buffer_length = (size_t)ret;
+ encoder->output_buffer_length = (size_t)ret;
encoder->flush = false;
}
- if (length > encoder->buffer_length)
- length = encoder->buffer_length;
+ if (length > encoder->output_buffer_length)
+ length = encoder->output_buffer_length;
- memcpy(dest, encoder->buffer, length);
+ memcpy(dest, encoder->output_buffer, length);
- encoder->buffer_length -= length;
- memmove(encoder->buffer, encoder->buffer + length,
- encoder->buffer_length);
+ encoder->output_buffer_length -= length;
+ memmove(encoder->output_buffer, encoder->output_buffer + length,
+ encoder->output_buffer_length);
return length;
}