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

decoder/*: use std::span instead of ConstBuffer

Browse Source
This commit is contained in:
Max Kellermann
2022-07-04 15:14:08 +02:00
parent 4ce1dae673
commit 9675cc77e2
9 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@@ -42,7 +42,6 @@
#include "input/InputStream.hxx"
#include "pcm/CheckAudioFormat.hxx"
#include "util/ScopeExit.hxx"
#include "util/ConstBuffer.hxx"
#include "util/StringAPI.hxx"
#include "Log.hxx"
@@ -216,23 +215,20 @@ FfmpegSendFrame(DecoderClient &client, InputStream *is,
size_t &skip_bytes,
FfmpegBuffer &buffer)
{
ConstBuffer<void> output_buffer =
Ffmpeg::InterleaveFrame(frame, buffer);
auto output_buffer = Ffmpeg::InterleaveFrame(frame, buffer);
if (skip_bytes > 0) {
if (skip_bytes >= output_buffer.size) {
skip_bytes -= output_buffer.size;
if (skip_bytes >= output_buffer.size()) {
skip_bytes -= output_buffer.size();
return DecoderCommand::NONE;
}
output_buffer.data =
(const uint8_t *)output_buffer.data + skip_bytes;
output_buffer.size -= skip_bytes;
output_buffer = output_buffer.subspan(skip_bytes);
skip_bytes = 0;
}
return client.SubmitData(is,
output_buffer.data, output_buffer.size,
output_buffer.data(), output_buffer.size(),
codec_context.bit_rate / 1000);
}