mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renames for clarity.

Browse Source
This commit is contained in:
casey langen 2020-03-01 12:47:45 -08:00
parent 2e415a17b2
commit 7a68bb1d44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/server/Transcoder.cpp
View File

@ -275,14 +275,14 @@ IDataStream* Transcoder::TranscodeAndWait(
else {
IBlockingEncoder* blockingEncoder = dynamic_cast<IBlockingEncoder*>(encoder);
if (blockingEncoder) {
bool waitForExisting = false;
bool alreadyTranscoding = false;
{
/* see if there's already a blocking transcoder running for the specified
uri. if there is, wait for it to complete. if there's not, add it to the
running set */
std::unique_lock<std::mutex> lock(transcoderMutex);
waitForExisting = runningBlockingTranscoders.find(uri) != runningBlockingTranscoders.end();
if (waitForExisting) {
alreadyTranscoding = runningBlockingTranscoders.find(uri) != runningBlockingTranscoders.end();
if (alreadyTranscoding) {
while (runningBlockingTranscoders.find(uri) != runningBlockingTranscoders.end()) {
waitForTranscode.wait(lock);
}
@ -292,7 +292,7 @@ IDataStream* Transcoder::TranscodeAndWait(
}
}
if (!waitForExisting) {
if (!alreadyTranscoding) {
BlockingTranscoder blockingTranscoder(
context, blockingEncoder, uri, tempFilename, expectedFilename, bitrate);

2
src/plugins/server/Transcoder.h
View File

@ -64,6 +64,7 @@ class Transcoder {
size_t bitrate,
const std::string& format);
private:
static IDataStream* TranscodeOnDemand(
Context& context,
IStreamingEncoder* encoder,
@ -71,7 +72,6 @@ class Transcoder {
size_t bitrate,
const std::string& format);
private:
Transcoder() { }
~Transcoder() { }
};