diff --git a/client/player/oboe_player.cpp b/client/player/oboe_player.cpp index 7fe874eb..0a6be00f 100644 --- a/client/player/oboe_player.cpp +++ b/client/player/oboe_player.cpp @@ -39,8 +39,8 @@ OboePlayer::OboePlayer(const PcmDevice& pcmDevice, std::shared_ptr strea if (env) oboe::DefaultStreamValues::FramesPerBurst = cpt::stoi(env, oboe::DefaultStreamValues::FramesPerBurst); - LOG(INFO) << "DefaultStreamValues::SampleRate: " << oboe::DefaultStreamValues::SampleRate - << ", DefaultStreamValues::FramesPerBurst: " << oboe::DefaultStreamValues::FramesPerBurst << "\n"; + LOG(INFO, LOG_TAG) << "DefaultStreamValues::SampleRate: " << oboe::DefaultStreamValues::SampleRate + << ", DefaultStreamValues::FramesPerBurst: " << oboe::DefaultStreamValues::FramesPerBurst << "\n"; // The builder set methods can be chained for convenience. oboe::AudioStreamBuilder builder; @@ -55,7 +55,7 @@ OboePlayer::OboePlayer(const PcmDevice& pcmDevice, std::shared_ptr strea //->setFramesPerCallback(2 * oboe::DefaultStreamValues::FramesPerBurst) //->setFramesPerCallback(960) // 2*192) ->openManagedStream(out_stream_); - LOG(INFO) << "BufferSizeInFrames: " << out_stream_->getBufferSizeInFrames() << ", FramesPerBurst: " << out_stream_->getFramesPerBurst() << "\n"; + LOG(INFO, LOG_TAG) << "BufferSizeInFrames: " << out_stream_->getBufferSizeInFrames() << ", FramesPerBurst: " << out_stream_->getFramesPerBurst() << "\n"; if (result != oboe::Result::OK) LOG(ERROR, LOG_TAG) << "Error building AudioStream: " << oboe::convertToText(result) << "\n"; @@ -77,6 +77,9 @@ OboePlayer::~OboePlayer() auto result = out_stream_->stop(std::chrono::nanoseconds(100ms).count()); if (result != oboe::Result::OK) LOG(ERROR, LOG_TAG) << "Error in AudioStream::stop: " << oboe::convertToText(result) << "\n"; + result = out_stream_->close(); + if (result != oboe::Result::OK) + LOG(ERROR, LOG_TAG) << "Error in AudioStream::stop: " << oboe::convertToText(result) << "\n"; } diff --git a/client/player/opensl_player.cpp b/client/player/opensl_player.cpp index 5b581df7..a8bc30b2 100644 --- a/client/player/opensl_player.cpp +++ b/client/player/opensl_player.cpp @@ -26,6 +26,7 @@ using namespace std; +static constexpr auto LOG_TAG = "OpenSlPlayer"; static constexpr auto kPhaseInit = "Init"; static constexpr auto kPhaseStart = "Start"; @@ -48,7 +49,6 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void* context) } - OpenslPlayer::OpenslPlayer(const PcmDevice& pcmDevice, std::shared_ptr stream) : Player(pcmDevice, stream), engineObject(NULL), engineEngine(NULL), outputMixObject(NULL), bqPlayerObject(NULL), bqPlayerPlay(NULL), bqPlayerBufferQueue(NULL), bqPlayerVolume(NULL), curBuffer(0), ms_(50), buff_size(0), pubStream_(stream) @@ -67,45 +67,17 @@ void OpenslPlayer::playerCallback(SLAndroidSimpleBufferQueueItf bq) { if (bq != bqPlayerBufferQueue) { - LOG(ERROR) << "Wrong bq!\n"; + LOG(ERROR, LOG_TAG) << "Wrong bq!\n"; return; } - /* static long lastTick = 0; - long now = chronos::getTickCount(); - int diff = 0; - if (lastTick != 0) - { - diff = now - lastTick; - // LOG(ERROR) << "diff: " << diff << ", frames: " << player->frames_ / 44.1 << "\n"; - // if (diff <= 50) - // { - // usleep(1000 * (50 - diff)); - // diff = 50; - // } - } - lastTick = chronos::getTickCount(); - */ - - // size_t d = player->frames_ / 0.48d; - // LOG(ERROR) << "Delay: " << d << "\n"; - // SLAndroidSimpleBufferQueueState state; - // (*bq)->GetState(bq, &state); - // cout << "bqPlayerCallback count: " << state.count << ", idx: " << state.index << "\n"; - - // diff = 0; - // chronos::usec delay((250 - diff) * 1000); - - // while (active_ && !stream_->waitForChunk(100)) - // LOG(INFO) << "Waiting for chunk\n"; - if (!active_) return; chronos::usec delay(ms_ * 1000); if (!pubStream_->getPlayerChunk(buffer[curBuffer], delay, frames_)) { - // LOG(INFO) << "Failed to get chunk. Playing silence.\n"; + // LOG(INFO, LOG_TAG) << "Failed to get chunk. Playing silence.\n"; memset(buffer[curBuffer], 0, buff_size); } else @@ -192,7 +164,7 @@ void OpenslPlayer::initOpensl() frames_ = format.rate / (1000 / ms_); // * format.channels; // 1920; // 48000 * 2 / 50 // => 50ms buff_size = frames_ * format.frameSize /* 2 -> sample size */; - LOG(INFO) << "frames: " << frames_ << ", channels: " << format.channels << ", rate: " << format.rate << ", buff: " << buff_size << "\n"; + LOG(INFO, LOG_TAG) << "frames: " << frames_ << ", channels: " << format.channels << ", rate: " << format.rate << ", buff: " << buff_size << "\n"; SLresult result; // create engine @@ -333,17 +305,17 @@ void OpenslPlayer::uninitOpensl() // if (!active_) // return; - LOG(INFO) << "uninitOpensl\n"; + LOG(INFO, LOG_TAG) << "uninitOpensl\n"; SLresult result; - LOG(INFO) << "OpenSLWrap_Shutdown - stopping playback\n"; + LOG(INFO, LOG_TAG) << "OpenSLWrap_Shutdown - stopping playback\n"; if (bqPlayerPlay != NULL) { result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_STOPPED); if (SL_RESULT_SUCCESS != result) - LOG(ERROR) << "SetPlayState failed\n"; + LOG(ERROR, LOG_TAG) << "SetPlayState failed\n"; } - LOG(INFO) << "OpenSLWrap_Shutdown - deleting player object\n"; + LOG(INFO, LOG_TAG) << "OpenSLWrap_Shutdown - deleting player object\n"; if (bqPlayerObject != NULL) { @@ -354,7 +326,7 @@ void OpenslPlayer::uninitOpensl() bqPlayerVolume = NULL; } - LOG(INFO) << "OpenSLWrap_Shutdown - deleting mix object\n"; + LOG(INFO, LOG_TAG) << "OpenSLWrap_Shutdown - deleting mix object\n"; if (outputMixObject != NULL) { @@ -362,7 +334,7 @@ void OpenslPlayer::uninitOpensl() outputMixObject = NULL; } - LOG(INFO) << "OpenSLWrap_Shutdown - deleting engine object\n"; + LOG(INFO, LOG_TAG) << "OpenSLWrap_Shutdown - deleting engine object\n"; if (engineObject != NULL) { @@ -377,7 +349,7 @@ void OpenslPlayer::uninitOpensl() delete[] buffer[1]; buffer[1] = NULL; - LOG(INFO) << "OpenSLWrap_Shutdown - finished\n"; + LOG(INFO, LOG_TAG) << "OpenSLWrap_Shutdown - finished\n"; active_ = false; } diff --git a/client/stream.cpp b/client/stream.cpp index 9892dd32..71ea8032 100644 --- a/client/stream.cpp +++ b/client/stream.cpp @@ -24,9 +24,11 @@ #include using namespace std; -// using namespace chronos; namespace cs = chronos; +static constexpr auto LOG_TAG = "Stream"; +static constexpr auto kCorrectionBegin = 100us; + Stream::Stream(const SampleFormat& in_format, const SampleFormat& out_format) : in_format_(in_format), sleep_(0), median_(0), shortMedian_(0), lastUpdate_(0), playedFrames_(0), bufferMs_(cs::msec(500)), soxr_(nullptr), frame_delta_(0) @@ -34,7 +36,6 @@ Stream::Stream(const SampleFormat& in_format, const SampleFormat& out_format) buffer_.setSize(500); shortBuffer_.setSize(100); miniBuffer_.setSize(20); - // cardBuffer_.setSize(50); if (out_format.rate != 0) format_ = out_format; @@ -52,7 +53,7 @@ Stream::Stream(const SampleFormat& in_format, const SampleFormat& out_format) if ((format_.rate != in_format_.rate) || (format_.bits != in_format_.bits)) { - LOG(INFO) << "Resampling from " << in_format_.getFormat() << " to " << format_.getFormat() << "\n"; + LOG(INFO, LOG_TAG) << "Resampling from " << in_format_.getFormat() << " to " << format_.getFormat() << "\n"; soxr_error_t error; soxr_datatype_t in_type = SOXR_INT16_I; @@ -67,7 +68,7 @@ Stream::Stream(const SampleFormat& in_format, const SampleFormat& out_format) soxr_ = soxr_create(static_cast(in_format_.rate), static_cast(format_.rate), format_.channels, &error, &iospec, &q_spec, NULL); if (error) { - LOG(ERROR) << "Error soxr_create: " << error << "\n"; + LOG(ERROR, LOG_TAG) << "Error soxr_create: " << error << "\n"; } // initialize the buffer with 20ms (~latency of the reampler) resample_buffer_.resize(format_.frameSize * ceil(format_.msRate()) * 20); @@ -88,7 +89,7 @@ void Stream::setRealSampleRate(double sampleRate) correctAfterXFrames_ = 0; else correctAfterXFrames_ = round((format_.rate / sampleRate) / (format_.rate / sampleRate - 1.)); - // LOG(DEBUG) << "Correct after X: " << correctAfterXFrames_ << " (Real rate: " << sampleRate << ", rate: " << format_.rate << ")\n"; + // LOG(DEBUG, LOG_TAG) << "Correct after X: " << correctAfterXFrames_ << " (Real rate: " << sampleRate << ", rate: " << format_.rate << ")\n"; } @@ -112,7 +113,7 @@ void Stream::addChunk(unique_ptr chunk) chunks_.pop(); // chunks_.push(move(chunk)); - // LOG(DEBUG) << "new chunk: " << chunk->duration().count() << ", Chunks: " << chunks_.size() << "\n"; + // LOG(DEBUG, LOG_TAG) << "new chunk: " << chunk->duration().count() << ", Chunks: " << chunks_.size() << "\n"; if (soxr_ == nullptr) { @@ -120,9 +121,6 @@ void Stream::addChunk(unique_ptr chunk) } else { - size_t idone; - size_t odone; - if (in_format_.bits == 24) { // sox expects 32 bit input, shift 8 bits left @@ -131,17 +129,19 @@ void Stream::addChunk(unique_ptr chunk) frames[n] = frames[n] << 8; } + size_t idone; + size_t odone; auto resample_buffer_framesize = resample_buffer_.size() / format_.frameSize; auto error = soxr_process(soxr_, chunk->payload, chunk->getFrameCount(), &idone, resample_buffer_.data(), resample_buffer_framesize, &odone); if (error) { - LOG(ERROR) << "Error soxr_process: " << error << "\n"; + LOG(ERROR, LOG_TAG) << "Error soxr_process: " << error << "\n"; // delete out; } else { - LOG(TRACE) << "Resample idone: " << idone << "/" << chunk->getFrameCount() << ", odone: " << odone << "/" - << resample_buffer_.size() / format_.frameSize << ", delay: " << soxr_delay(soxr_) << "\n"; + LOG(TRACE, LOG_TAG) << "Resample idone: " << idone << "/" << chunk->getFrameCount() << ", odone: " << odone << "/" + << resample_buffer_.size() / format_.frameSize << ", delay: " << soxr_delay(soxr_) << "\n"; // some data has been resampled (odone frames) and some is still in the pipe (soxr_delay frames) if (odone > 0) @@ -180,12 +180,13 @@ void Stream::addChunk(unique_ptr chunk) { // buffer for resampled data too small, add space for 5ms resample_buffer_.resize(resample_buffer_.size() + format_.frameSize * ceil(format_.msRate()) * 5); - LOG(INFO) << "Resample buffer completely filled, adding space for 5ms; new buffer size: " << resample_buffer_.size() << " bytes\n"; + LOG(INFO, LOG_TAG) << "Resample buffer completely filled, adding space for 5ms; new buffer size: " << resample_buffer_.size() << " bytes\n"; } - // //LOG(TRACE) << "ts: " << out->timestamp.sec << "s, " << out->timestamp.usec/1000.f << " ms, duration: " << odone / format_.msRate() << "\n"; + // //LOG(TRACE, LOG_TAG) << "ts: " << out->timestamp.sec << "s, " << out->timestamp.usec/1000.f << " ms, duration: " << odone / format_.msRate() + // << "\n"; // int64_t next_us = us + static_cast(odone / format_.msRate() * 1000); - // LOG(TRACE) << "ts: " << us << ", next: " << next_us << ", diff: " << next_us_ - us << "\n"; + // LOG(TRACE, LOG_TAG) << "ts: " << us << ", next: " << next_us << ", diff: " << next_us_ - us << "\n"; // next_us_ = next_us; } } @@ -199,7 +200,6 @@ bool Stream::waitForChunk(size_t ms) const } - cs::time_point_clk Stream::getSilentPlayerChunk(void* outputBuffer, unsigned long frames) { if (!chunk_) @@ -219,8 +219,8 @@ time_point_ms Stream::seekTo(const time_point_ms& to) while (to > chunk_->timePoint())// + std::chrono::milliseconds((long int)chunk_->getDuration()))// { chunk_ = chunks_.pop(); - LOG(DEBUG) << "\nto: " << Chunk::getAge(to) << "\t chunk: " << Chunk::getAge(chunk_->timePoint()) << "\n"; - LOG(DEBUG) << "diff: " << std::chrono::duration_cast((to - chunk_->timePoint())).count() << "\n"; + LOG(DEBUG, LOG_TAG) << "\nto: " << Chunk::getAge(to) << "\t chunk: " << Chunk::getAge(chunk_->timePoint()) << "\n"; + LOG(DEBUG, LOG_TAG) << "diff: " << std::chrono::duration_cast((to - chunk_->timePoint())).count() << "\n"; } chunk_->seek(std::chrono::duration_cast(to - chunk_->timePoint()).count() * format_.msRate()); return chunk_->timePoint(); @@ -296,7 +296,7 @@ cs::time_point_clk Stream::getNextPlayerChunk(void* outputBuffer, const cs::usec // Size of each slice. The last slice may be bigger. int size = max / slices; - // LOG(TRACE) << "getNextPlayerChunk, frames: " << frames << ", correction: " << framesCorrection << " (" << toRead << "), slices: " << slices + // LOG(TRACE, LOG_TAG) << "getNextPlayerChunk, frames: " << frames << ", correction: " << framesCorrection << " (" << toRead << "), slices: " << slices // << "\n"; size_t pos = 0; @@ -309,14 +309,16 @@ cs::time_point_clk Stream::getNextPlayerChunk(void* outputBuffer, const cs::usec if (framesCorrection < 0) { // Read one frame less per slice from the input, but write a duplicated frame per slice to the output - // LOG(TRACE) << "duplicate - requested: " << frames << ", read: " << toRead << ", slice: " << n << ", size: " << size << ", out pos: " << pos << ", + // LOG(TRACE, LOG_TAG) << "duplicate - requested: " << frames << ", read: " << toRead << ", slice: " << n << ", size: " << size << ", out pos: " << + // pos << ", // source pos: " << pos - n << "\n"; memcpy(static_cast(outputBuffer) + pos * format_.frameSize, buffer + (pos - n) * format_.frameSize, size * format_.frameSize); } else { // Read all input frames, but skip a frame per slice when writing to the output. - // LOG(TRACE) << "remove - requested: " << frames << ", read: " << toRead << ", slice: " << n << ", size: " << size << ", out pos: " << pos - n << + // LOG(TRACE, LOG_TAG) << "remove - requested: " << frames << ", read: " << toRead << ", slice: " << n << ", size: " << size << ", out pos: " << pos + // - n << // ", source pos: " << pos << "\n"; memcpy(static_cast(outputBuffer) + (pos - n) * format_.frameSize, buffer + pos * format_.frameSize, size * format_.frameSize); } @@ -376,14 +378,15 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT { if (outputBufferDacTime > bufferMs_) { - LOG(INFO) << "outputBufferDacTime > bufferMs: " << cs::duration(outputBufferDacTime) << " > " << cs::duration(bufferMs_) << "\n"; + LOG(INFO, LOG_TAG) << "outputBufferDacTime > bufferMs: " << cs::duration(outputBufferDacTime) << " > " << cs::duration(bufferMs_) + << "\n"; sleep_ = cs::usec(0); return false; } if (!chunk_ && !chunks_.try_pop(chunk_, outputBufferDacTime)) { - // LOG(INFO) << "no chunks available\n"; + // LOG(INFO, LOG_TAG) << "no chunks available\n"; sleep_ = cs::usec(0); return false; } @@ -396,19 +399,19 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT /// age < 0 => play in -age /// age > 0 => too old cs::usec age = std::chrono::duration_cast(TimeProvider::serverNow() - chunk_->start()) - bufferMs_ + outputBufferDacTime; - // LOG(INFO) << "age: " << age.count() / 1000 << "\n"; + // LOG(INFO, LOG_TAG) << "age: " << age.count() / 1000 << "\n"; if ((sleep_.count() == 0) && (cs::abs(age) > cs::msec(200))) { - LOG(INFO) << "age > 200: " << cs::duration(age) << "\n"; + LOG(INFO, LOG_TAG) << "age > 200: " << cs::duration(age) << "\n"; sleep_ = age; } try { - // LOG(DEBUG) << "frames: " << frames << "\tms: " << frames*2 / PLAYER_CHUNK_MS_SIZE << "\t" << PLAYER_CHUNK_SIZE << "\n"; + // LOG(DEBUG, LOG_TAG) << "frames: " << frames << "\tms: " << frames*2 / PLAYER_CHUNK_MS_SIZE << "\t" << PLAYER_CHUNK_SIZE << "\n"; cs::nsec bufferDuration = cs::nsec(static_cast(frames / format_.nsRate())); - // LOG(DEBUG) << "buffer duration: " << bufferDuration.count() << "\n"; + // LOG(DEBUG, LOG_TAG) << "buffer duration: " << bufferDuration.count() << "\n"; cs::usec correction = cs::usec(0); if (sleep_.count() != 0) @@ -416,27 +419,29 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT resetBuffers(); if (sleep_ < -bufferDuration / 2) { - LOG(INFO) << "sleep < -bufferDuration/2: " << cs::duration(sleep_) << " < " << -cs::duration(bufferDuration) / 2 << ", "; + LOG(INFO, LOG_TAG) << "sleep < -bufferDuration/2: " << cs::duration(sleep_) << " < " << -cs::duration(bufferDuration) / 2 + << ", "; // We're early: not enough chunks_. play silence. Reference chunk_ is the oldest (front) one sleep_ = chrono::duration_cast(TimeProvider::serverNow() - getSilentPlayerChunk(outputBuffer, frames) - bufferMs_ + outputBufferDacTime); - LOG(INFO) << "sleep: " << cs::duration(sleep_) << "\n"; + LOG(INFO, LOG_TAG) << "sleep: " << cs::duration(sleep_) << "\n"; if (sleep_ < -bufferDuration / 2) return true; } else if (sleep_ > bufferDuration / 2) { - LOG(INFO) << "sleep > bufferDuration/2: " << cs::duration(sleep_) << " > " << cs::duration(bufferDuration) / 2 << "\n"; + LOG(INFO, LOG_TAG) << "sleep > bufferDuration/2: " << cs::duration(sleep_) << " > " << cs::duration(bufferDuration) / 2 + << "\n"; // We're late: discard oldest chunks while (sleep_ > chunk_->duration()) { - LOG(INFO) << "sleep > chunkDuration: " << cs::duration(sleep_) << " > " << chunk_->duration().count() - << ", chunks: " << chunks_.size() << ", out: " << cs::duration(outputBufferDacTime) - << ", needed: " << cs::duration(bufferDuration) << "\n"; + LOG(INFO, LOG_TAG) << "sleep > chunkDuration: " << cs::duration(sleep_) << " > " << chunk_->duration().count() + << ", chunks: " << chunks_.size() << ", out: " << cs::duration(outputBufferDacTime) + << ", needed: " << cs::duration(bufferDuration) << "\n"; sleep_ = std::chrono::duration_cast(TimeProvider::serverNow() - chunk_->start() - bufferMs_ + outputBufferDacTime); if (!chunks_.try_pop(chunk_, outputBufferDacTime)) { - LOG(INFO) << "no chunks available\n"; + LOG(INFO, LOG_TAG) << "no chunks available\n"; chunk_ = nullptr; sleep_ = cs::usec(0); return false; @@ -457,7 +462,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT } else { - LOG(INFO) << "Sleep " << cs::duration(sleep_) << "\n"; + LOG(INFO, LOG_TAG) << "Sleep " << cs::duration(sleep_) << "\n"; correction = sleep_; sleep_ = cs::usec(0); } @@ -483,7 +488,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT { if (cs::usec(abs(median_)) > cs::msec(2)) { - LOG(INFO) << "pBuffer->full() && (abs(median_) > 2): " << median_ << "\n"; + LOG(INFO, LOG_TAG) << "pBuffer->full() && (abs(median_) > 2): " << median_ << "\n"; sleep_ = cs::usec(median_); } // else if (cs::usec(median_) > cs::usec(300)) @@ -499,7 +504,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT { if (cs::usec(abs(shortMedian_)) > cs::msec(5)) { - LOG(INFO) << "pShortBuffer->full() && (abs(shortMedian_) > 5): " << shortMedian_ << "\n"; + LOG(INFO, LOG_TAG) << "pShortBuffer->full() && (abs(shortMedian_) > 5): " << shortMedian_ << "\n"; sleep_ = cs::usec(shortMedian_); } // else @@ -509,7 +514,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT } else if (miniBuffer_.full() && (cs::usec(abs(miniBuffer_.median())) > cs::msec(50))) { - LOG(INFO) << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer_.median() << "\n"; + LOG(INFO, LOG_TAG) << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer_.median() << "\n"; sleep_ = cs::usec(static_cast(miniBuffer_.mean())); } } @@ -521,25 +526,25 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT if (lastAge != msAge) { lastAge = msAge; - LOG(INFO) << "Sleep " << cs::duration(sleep_) << ", age: " << msAge << ", bufferDuration: " << cs::duration(bufferDuration) - << "\n"; + LOG(INFO, LOG_TAG) << "Sleep " << cs::duration(sleep_) << ", age: " << msAge + << ", bufferDuration: " << cs::duration(bufferDuration) << "\n"; } } else if (shortBuffer_.full()) { auto miniMedian = miniBuffer_.median(); - if ((cs::usec(shortMedian_) > cs::usec(100)) && (cs::usec(miniMedian) > cs::usec(50)) && (cs::usec(age) > cs::usec(50))) + if ((cs::usec(shortMedian_) > kCorrectionBegin) && (cs::usec(miniMedian) > cs::usec(50)) && (cs::usec(age) > cs::usec(50))) { double rate = (shortMedian_ / 100) * 0.00005; rate = 1.0 - std::min(rate, 0.0005); - // LOG(INFO) << "Rate: " << rate << "\n"; + // LOG(INFO, LOG_TAG) << "Rate: " << rate << "\n"; setRealSampleRate(format_.rate * rate); // 0.9999); } - else if ((cs::usec(shortMedian_) < -cs::usec(100)) && (cs::usec(miniMedian) < -cs::usec(50)) && (cs::usec(age) < -cs::usec(50))) + else if ((cs::usec(shortMedian_) < -kCorrectionBegin) && (cs::usec(miniMedian) < -cs::usec(50)) && (cs::usec(age) < -cs::usec(50))) { double rate = (-shortMedian_ / 100) * 0.00005; rate = 1.0 + std::min(rate, 0.0005); - // LOG(INFO) << "Rate: " << rate << "\n"; + // LOG(INFO, LOG_TAG) << "Rate: " << rate << "\n"; setRealSampleRate(format_.rate * rate); // 1.0001); } } @@ -553,9 +558,10 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT lastUpdate_ = now; median_ = buffer_.median(); shortMedian_ = shortBuffer_.median(); - LOG(INFO) << "Chunk: " << age.count() / 100 << "\t" << miniBuffer_.median() / 100 << "\t" << shortMedian_ / 100 << "\t" << median_ / 100 << "\t" - << buffer_.size() << "\t" << cs::duration(outputBufferDacTime) << "\t" << frame_delta_ << "\n"; - // LOG(INFO) << "Chunk: " << age.count()/1000 << "\t" << miniBuffer_.median()/1000 << "\t" << shortMedian_/1000 << "\t" << median_/1000 << "\t" << + LOG(INFO, LOG_TAG) << "Chunk: " << age.count() / 100 << "\t" << miniBuffer_.median() / 100 << "\t" << shortMedian_ / 100 << "\t" << median_ / 100 + << "\t" << buffer_.size() << "\t" << cs::duration(outputBufferDacTime) << "\t" << frame_delta_ << "\n"; + // LOG(INFO, LOG_TAG) << "Chunk: " << age.count()/1000 << "\t" << miniBuffer_.median()/1000 << "\t" << shortMedian_/1000 << "\t" << median_/1000 << + // "\t" << // buffer_.size() << "\t" << cs::duration(outputBufferDacTime) << "\n"; frame_delta_ = 0; }