From b59ec2b89fbc8a2fbccaaa42d623db97a241a54b Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Thu, 13 Oct 2016 18:00:03 +0200 Subject: [PATCH] [ffmpeg_producer] Moved negation from method to operator ! for clarity. --- modules/ffmpeg/producer/ffmpeg_producer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp index a2d4afef0..48facf644 100644 --- a/modules/ffmpeg/producer/ffmpeg_producer.cpp +++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp @@ -521,20 +521,20 @@ public: !video_decoder_->is_progressive()) : L""; } - bool not_all_audio_decoders_ready() const + bool all_audio_decoders_ready() const { for (auto& audio_decoder : audio_decoders_) if (!audio_decoder->ready()) - return true; + return false; - return false; + return true; } void try_decode_frame() { std::shared_ptr pkt; - for (int n = 0; n < 32 && ((video_decoder_ && !video_decoder_->ready()) || not_all_audio_decoders_ready()) && input_.try_pop(pkt); ++n) + for (int n = 0; n < 32 && ((video_decoder_ && !video_decoder_->ready()) || !all_audio_decoders_ready()) && input_.try_pop(pkt); ++n) { if (video_decoder_) video_decoder_->push(pkt); -- 2.39.2