oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

encoder/lame: use offset variable instead of memmove()

Browse Source
This commit is contained in:
Max Kellermann 2013-08-06 08:47:30 +02:00
parent 7e53934ce3
commit a32443c63b
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/encoder/LameEncoderPlugin.cxx
View File

@ -39,7 +39,7 @@ struct LameEncoder final {
lame_global_flags *gfp; lame_global_flags *gfp;
unsigned char output_buffer[32768]; unsigned char output_buffer[32768];
size_t output_buffer_length; size_t output_buffer_length, output_buffer_position;
LameEncoder():encoder(lame_encoder_plugin) {} LameEncoder():encoder(lame_encoder_plugin) {}
@ -210,6 +210,7 @@ lame_encoder_open(Encoder *_encoder, AudioFormat &audio_format,
} }
encoder->output_buffer_length = 0; encoder->output_buffer_length = 0;
encoder->output_buffer_position = 0;
return true; return true;
} }
@ -230,7 +231,8 @@ lame_encoder_write(Encoder *_encoder,
LameEncoder *encoder = (LameEncoder *)_encoder; LameEncoder *encoder = (LameEncoder *)_encoder;
const int16_t *src = (const int16_t*)data; const int16_t *src = (const int16_t*)data;
assert(encoder->output_buffer_length == 0); assert(encoder->output_buffer_position ==
encoder->output_buffer_length);
const unsigned num_frames = const unsigned num_frames =
length / encoder->audio_format.GetFrameSize(); length / encoder->audio_format.GetFrameSize();
@ -259,6 +261,7 @@ lame_encoder_write(Encoder *_encoder,
} }
encoder->output_buffer_length = (size_t)bytes_out; encoder->output_buffer_length = (size_t)bytes_out;
encoder->output_buffer_position = 0;
return true; return true;
} }
@ -267,14 +270,18 @@ lame_encoder_read(Encoder *_encoder, void *dest, size_t length)
{ {
LameEncoder *encoder = (LameEncoder *)_encoder; LameEncoder *encoder = (LameEncoder *)_encoder;
if (length > encoder->output_buffer_length) assert(encoder->output_buffer_position <=
length = encoder->output_buffer_length; encoder->output_buffer_length);
memcpy(dest, encoder->output_buffer, length); const size_t remainning = encoder->output_buffer_length
- encoder->output_buffer_position;
if (length > remainning)
length = remainning;
encoder->output_buffer_length -= length; memcpy(dest, encoder->output_buffer + encoder->output_buffer_position,
memmove(encoder->output_buffer, encoder->output_buffer + length, length);
encoder->output_buffer_length);
encoder->output_buffer_position += length;
return length; return length;
} }

30
src/encoder/TwolameEncoderPlugin.cxx
View File

@ -40,6 +40,7 @@ struct TwolameEncoder final {
unsigned char output_buffer[32768]; unsigned char output_buffer[32768];
size_t output_buffer_length; size_t output_buffer_length;
size_t output_buffer_position;
/** /**
* Call libtwolame's flush function when the output_buffer is * Call libtwolame's flush function when the output_buffer is
@ -211,6 +212,7 @@ twolame_encoder_open(Encoder *_encoder, AudioFormat &audio_format,
} }
encoder->output_buffer_length = 0; encoder->output_buffer_length = 0;
encoder->output_buffer_position = 0;
encoder->flush = false; encoder->flush = false;
return true; return true;
@ -241,7 +243,8 @@ twolame_encoder_write(Encoder *_encoder,
TwolameEncoder *encoder = (TwolameEncoder *)_encoder; TwolameEncoder *encoder = (TwolameEncoder *)_encoder;
const int16_t *src = (const int16_t*)data; const int16_t *src = (const int16_t*)data;
assert(encoder->output_buffer_length == 0); assert(encoder->output_buffer_position ==
encoder->output_buffer_length);
const unsigned num_frames = const unsigned num_frames =
length / encoder->audio_format.GetFrameSize(); length / encoder->audio_format.GetFrameSize();
@ -257,6 +260,7 @@ twolame_encoder_write(Encoder *_encoder,
} }
encoder->output_buffer_length = (size_t)bytes_out; encoder->output_buffer_length = (size_t)bytes_out;
encoder->output_buffer_position = 0;
return true; return true;
} }
@ -265,24 +269,32 @@ twolame_encoder_read(Encoder *_encoder, void *dest, size_t length)
{ {
TwolameEncoder *encoder = (TwolameEncoder *)_encoder; TwolameEncoder *encoder = (TwolameEncoder *)_encoder;
if (encoder->output_buffer_length == 0 && encoder->flush) { assert(encoder->output_buffer_position <=
encoder->output_buffer_length);
if (encoder->output_buffer_position == encoder->output_buffer_length &&
encoder->flush) {
int ret = twolame_encode_flush(encoder->options, int ret = twolame_encode_flush(encoder->options,
encoder->output_buffer, encoder->output_buffer,
sizeof(encoder->output_buffer)); sizeof(encoder->output_buffer));
if (ret > 0) if (ret > 0) {
encoder->output_buffer_length = (size_t)ret; encoder->output_buffer_length = (size_t)ret;
encoder->output_buffer_position = 0;
}
encoder->flush = false; encoder->flush = false;
} }
if (length > encoder->output_buffer_length)
length = encoder->output_buffer_length;
memcpy(dest, encoder->output_buffer, length); const size_t remainning = encoder->output_buffer_length
- encoder->output_buffer_position;
if (length > remainning)
length = remainning;
encoder->output_buffer_length -= length; memcpy(dest, encoder->output_buffer + encoder->output_buffer_position,
memmove(encoder->output_buffer, encoder->output_buffer + length, length);
encoder->output_buffer_length);
encoder->output_buffer_position += length;
return length; return length;
} }