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

Merge branch 'fix-oggflac-serial' of https://github.com/anthonyde/MPD into v0.23.x

This commit is contained in:
Max Kellermann 2022-09-20 14:42:49 +02:00
parent 88d92aceab 9ab9b97f20
commit 15ff7c4cad
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.23.10 (not yet released) ver 0.23.10 (not yet released)
* encoder
- flac: fix failure when libFLAC is built without Ogg support
* Windows * Windows
- log to stdout by default, don't require "log_file" setting - log to stdout by default, don't require "log_file" setting

12
src/encoder/plugins/FlacEncoderPlugin.cxx
View File

@ -38,6 +38,7 @@ class FlacEncoder final : public Encoder {
FLAC__StreamEncoder *const fse; FLAC__StreamEncoder *const fse;
const unsigned compression; const unsigned compression;
const bool oggflac;
PcmBuffer expand_buffer; PcmBuffer expand_buffer;
@ -122,7 +123,7 @@ flac_encoder_init(const ConfigBlock &block)
} }
static void static void
flac_encoder_setup(FLAC__StreamEncoder *fse, unsigned compression, flac_encoder_setup(FLAC__StreamEncoder *fse, unsigned compression, bool oggflac,
const AudioFormat &audio_format) const AudioFormat &audio_format)
{ {
unsigned bits_per_sample; unsigned bits_per_sample;
@ -157,7 +158,7 @@ flac_encoder_setup(FLAC__StreamEncoder *fse, unsigned compression,
throw FormatRuntimeError("error setting flac sample rate to %d", throw FormatRuntimeError("error setting flac sample rate to %d",
audio_format.sample_rate); audio_format.sample_rate);
if (!FLAC__stream_encoder_set_ogg_serial_number(fse, if (oggflac && !FLAC__stream_encoder_set_ogg_serial_number(fse,
GenerateSerial())) GenerateSerial()))
throw FormatRuntimeError("error setting ogg serial number"); throw FormatRuntimeError("error setting ogg serial number");
} }
@ -166,11 +167,12 @@ FlacEncoder::FlacEncoder(AudioFormat _audio_format, FLAC__StreamEncoder *_fse, u
:Encoder(_oggchaining), :Encoder(_oggchaining),
audio_format(_audio_format), fse(_fse), audio_format(_audio_format), fse(_fse),
compression(_compression), compression(_compression),
oggflac(_oggflac),
output_buffer(8192) output_buffer(8192)
{ {
/* this immediately outputs data through callback */ /* this immediately outputs data through callback */
auto init_status = _oggflac ? auto init_status = oggflac ?
FLAC__stream_encoder_init_ogg_stream(fse, FLAC__stream_encoder_init_ogg_stream(fse,
nullptr, WriteCallback, nullptr, WriteCallback,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
@ -209,7 +211,7 @@ PreparedFlacEncoder::Open(AudioFormat &audio_format)
throw std::runtime_error("FLAC__stream_encoder_new() failed"); throw std::runtime_error("FLAC__stream_encoder_new() failed");
try { try {
flac_encoder_setup(fse, compression, audio_format); flac_encoder_setup(fse, compression, oggflac, audio_format);
} catch (...) { } catch (...) {
FLAC__stream_encoder_delete(fse); FLAC__stream_encoder_delete(fse);
throw; throw;
@ -222,7 +224,7 @@ void
FlacEncoder::SendTag(const Tag &tag) FlacEncoder::SendTag(const Tag &tag)
{ {
/* re-initialize encoder since flac_encoder_finish resets everything */ /* re-initialize encoder since flac_encoder_finish resets everything */
flac_encoder_setup(fse, compression, audio_format); flac_encoder_setup(fse, compression, oggflac, audio_format);
FLAC__StreamMetadata *metadata = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); FLAC__StreamMetadata *metadata = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
FLAC__StreamMetadata_VorbisComment_Entry entry; FLAC__StreamMetadata_VorbisComment_Entry entry;