3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-14 17:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash during shutdown

Browse source
This commit is contained in:
badaix 2020-02-29 19:59:01 +01:00
parent a8998997e9
commit d9d403d729
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/encoder/flac_encoder.cpp
View file

@ -28,8 +28,9 @@ using namespace std;
namespace encoder namespace encoder
{ {
FlacEncoder::FlacEncoder(const std::string& codecOptions) : Encoder(codecOptions), encoder_(nullptr), pcmBufferSize_(0), encodedSamples_(0), flacChunk_(nullptr) FlacEncoder::FlacEncoder(const std::string& codecOptions) : Encoder(codecOptions), encoder_(nullptr), pcmBufferSize_(0), encodedSamples_(0)
{ {
flacChunk_ = new msg::PcmChunk();
headerChunk_.reset(new msg::CodecHeader("flac")); headerChunk_.reset(new msg::CodecHeader("flac"));
pcmBuffer_ = (FLAC__int32*)malloc(pcmBufferSize_ * sizeof(FLAC__int32)); pcmBuffer_ = (FLAC__int32*)malloc(pcmBufferSize_ * sizeof(FLAC__int32));
} }
@ -45,7 +46,6 @@ FlacEncoder::~FlacEncoder()
FLAC__stream_encoder_delete(encoder_); FLAC__stream_encoder_delete(encoder_);
} }
if (flacChunk_ != nullptr)
delete flacChunk_; delete flacChunk_;
free(pcmBuffer_); free(pcmBuffer_);
} }
@ -71,8 +71,8 @@ std::string FlacEncoder::name() const
void FlacEncoder::encode(const msg::PcmChunk* chunk) void FlacEncoder::encode(const msg::PcmChunk* chunk)
{ {
if (flacChunk_ == nullptr) if (!flacChunk_->format.isInitialized())
flacChunk_ = new msg::PcmChunk(chunk->format, 0); flacChunk_->format = chunk->format;
int samples = chunk->getSampleCount(); int samples = chunk->getSampleCount();
int frames = chunk->getFrameCount(); int frames = chunk->getFrameCount();
@ -113,7 +113,7 @@ void FlacEncoder::encode(const msg::PcmChunk* chunk)
// LOG(INFO) << "encoded: " << chunk->payloadSize << "\tframes: " << encodedSamples_ << "\tres: " << resMs << "\n"; // LOG(INFO) << "encoded: " << chunk->payloadSize << "\tframes: " << encodedSamples_ << "\tres: " << resMs << "\n";
encodedSamples_ = 0; encodedSamples_ = 0;
listener_->onChunkEncoded(this, flacChunk_, resMs); listener_->onChunkEncoded(this, flacChunk_, resMs);
flacChunk_ = nullptr; flacChunk_ = new msg::PcmChunk(chunk->format, 0);
} }
} }