diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 25 | ||||
| -rw-r--r-- | src/pcm/Interleave.cxx | 47 | ||||
| -rw-r--r-- | src/pcm/Interleave.hxx | 33 |
4 files changed, 87 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index c6bcfa1a6..39d4e71f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -492,6 +492,7 @@ endif libpcm_a_SOURCES = \ src/pcm/Domain.cxx src/pcm/Domain.hxx \ src/pcm/Traits.hxx \ + src/pcm/Interleave.cxx src/pcm/Interleave.hxx \ src/pcm/PcmBuffer.cxx src/pcm/PcmBuffer.hxx \ src/pcm/PcmExport.cxx src/pcm/PcmExport.hxx \ src/pcm/PcmConvert.cxx src/pcm/PcmConvert.hxx \ diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 88352bbb0..9493fee69 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -31,6 +31,7 @@ #include "../DecoderAPI.hxx" #include "FfmpegMetaData.hxx" #include "FfmpegIo.hxx" +#include "pcm/Interleave.hxx" #include "tag/TagBuilder.hxx" #include "tag/TagHandler.hxx" #include "tag/ReplayGain.hxx" @@ -103,20 +104,6 @@ start_time_fallback(const AVStream &stream) return FfmpegTimestampFallback(stream.start_time, 0); } -static void -copy_interleave_frame2(uint8_t *dest, uint8_t **src, - unsigned nframes, unsigned nchannels, - unsigned sample_size) -{ - for (unsigned frame = 0; frame < nframes; ++frame) { - for (unsigned channel = 0; channel < nchannels; ++channel) { - memcpy(dest, src[channel] + frame * sample_size, - sample_size); - dest += sample_size; - } - } -} - /** * Copy PCM data from a non-empty AVFrame to an interleaved buffer. */ @@ -150,11 +137,11 @@ copy_interleave_frame(const AVCodecContext &codec_context, return 0; } - copy_interleave_frame2((uint8_t *)output_buffer, - frame.extended_data, - frame.nb_samples, - codec_context.channels, - av_get_bytes_per_sample(codec_context.sample_fmt)); + PcmInterleave(output_buffer, + ConstBuffer<const void *>((const void *const*)frame.extended_data, + codec_context.channels), + frame.nb_samples, + av_get_bytes_per_sample(codec_context.sample_fmt)); } else { output_buffer = frame.extended_data[0]; } diff --git a/src/pcm/Interleave.cxx b/src/pcm/Interleave.cxx new file mode 100644 index 000000000..8f2b11bd7 --- /dev/null +++ b/src/pcm/Interleave.cxx @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2003-2015 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "Interleave.hxx" + +#include <stdint.h> +#include <string.h> + +static void +GenericPcmInterleave(uint8_t *dest, ConstBuffer<const uint8_t *> src, + size_t n_frames, size_t sample_size) +{ + for (size_t frame = 0; frame < n_frames; ++frame) { + for (size_t channel = 0; channel < src.size; ++channel) { + memcpy(dest, src[channel] + frame * sample_size, + sample_size); + dest += sample_size; + } + } +} + +void +PcmInterleave(void *dest, ConstBuffer<const void *> src, + size_t n_frames, size_t sample_size) +{ + GenericPcmInterleave((uint8_t *)dest, + ConstBuffer<const uint8_t *>((const uint8_t *const*)src.data, + src.size), + n_frames, sample_size); +} diff --git a/src/pcm/Interleave.hxx b/src/pcm/Interleave.hxx new file mode 100644 index 000000000..c8acbb3e8 --- /dev/null +++ b/src/pcm/Interleave.hxx @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2003-2015 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_PCM_INTERLEAVE_HXX +#define MPD_PCM_INTERLEAVE_HXX + +#include "check.h" +#include "util/ConstBuffer.hxx" + +/** + * Interleave planar PCM samples from #src to #dest. + */ +void +PcmInterleave(void *dest, ConstBuffer<const void *> src, + size_t n_frames, size_t sample_size); + +#endif |