extern "C" {
#include <libavfilter/buffersink.h>
#include <libavfilter/buffersrc.h>
+#include <libavutil/channel_layout.h>
}
-#include <boost/make_shared.hpp>
#include "i18n.h"
using std::string;
-using std::cout;
using boost::shared_ptr;
-using boost::make_shared;
AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels)
: _sample_rate (sample_rate)
string
AudioFilterGraph::src_parameters () const
{
- SafeStringStream a;
+ char layout[64];
+ av_get_channel_layout_string (layout, sizeof(layout), 0, _channel_layout);
- char buffer[64];
- av_get_channel_layout_string (buffer, sizeof(buffer), 0, _channel_layout);
+ char buffer[256];
+ snprintf (
+ buffer, sizeof(buffer), "time_base=1/1:sample_rate=%d:sample_fmt=%s:channel_layout=%s",
+ _sample_rate, av_get_sample_fmt_name(AV_SAMPLE_FMT_FLTP), layout
+ );
- a << "time_base=1/1:sample_rate=" << _sample_rate << ":"
- << "sample_fmt=" << av_get_sample_fmt_name(AV_SAMPLE_FMT_FLTP) << ":"
- << "channel_layout=" << buffer;
-
- return a.str ();
+ return buffer;
}
void *
the constructor) so we need to create new buffers with some extra
silent channels.
*/
- shared_ptr<AudioBuffers> extended_buffers = make_shared<AudioBuffers> (process_channels, buffers->frames());
+ shared_ptr<AudioBuffers> extended_buffers (new AudioBuffers (process_channels, buffers->frames()));
for (int i = 0; i < buffers->channels(); ++i) {
extended_buffers->copy_channel_from (buffers.get(), i, i);
}
if (r < 0) {
char buffer[256];
av_strerror (r, buffer, sizeof(buffer));
- throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)"), buffer));
+ throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)"), &buffer[0]));
}
while (true) {