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

DecoderBuffer: add method _clear()

Browse Source
This commit is contained in:
Max Kellermann
2014-01-06 21:46:10 +01:00
parent e2a08fa824
commit eac9fabd48
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/decoder/FaadDecoderPlugin.cxx
View File

@@ -84,7 +84,7 @@ adts_find_frame(DecoderBuffer *buffer)
const uint8_t *p = (const uint8_t *)memchr(data, 0xff, length);
if (p == nullptr) {
/* no marker - discard the buffer */
decoder_buffer_consume(buffer, length);
decoder_buffer_clear(buffer);
continue;
}
@@ -111,10 +111,7 @@ adts_find_frame(DecoderBuffer *buffer)
/* not enough data; discard this frame
to prevent a possible buffer
overflow */
data = (const uint8_t *)
decoder_buffer_read(buffer, &length);
if (data != nullptr)
decoder_buffer_consume(buffer, length);
decoder_buffer_clear(buffer);
}
continue;
@@ -196,9 +193,7 @@ faad_song_duration(DecoderBuffer *buffer, InputStream &is)
is.LockSeek(tagsize, SEEK_SET, IgnoreError());
data = (const uint8_t *)decoder_buffer_read(buffer, &length);
if (data != nullptr)
decoder_buffer_consume(buffer, length);
decoder_buffer_clear(buffer);
decoder_buffer_fill(buffer);
return song_length;