From 764f54092923fe401243a49d5b8e25e30d513313 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Mon, 15 Aug 2022 16:12:52 +0000 Subject: [PATCH] CWFs --- src/audioomx.cc | 4 ++++ src/osdvector.cc | 6 +++--- src/vepg.cc | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/audioomx.cc b/src/audioomx.cc index 4cc0438..dfa1d7e 100644 --- a/src/audioomx.cc +++ b/src/audioomx.cc @@ -2138,6 +2138,7 @@ u4 AudioOMX::DeliverMediaPacket(MediaPacket mpacket, const u1* buffer, if ((int)gotframesize <= incoming_paket_libav.size) { if (gotframesize>0) incoming_paket_libav.size=gotframesize; + // FIXME deprecated len = avcodec_decode_audio4(current_context, decode_frame_libav, &gotta, &incoming_paket_libav); } else { @@ -2165,6 +2166,9 @@ u4 AudioOMX::DeliverMediaPacket(MediaPacket mpacket, const u1* buffer, if (decompress_buffer_filled) { // reset to normal decoding if (len>0) { + + // FIXME + // len is int // decompress_buffer_filled is unsigned int // so if decompress_buffer_filled > len, len can go negative. diff --git a/src/osdvector.cc b/src/osdvector.cc index c3e26b5..da12c10 100644 --- a/src/osdvector.cc +++ b/src/osdvector.cc @@ -602,10 +602,10 @@ void OsdVector::dumpStyles() logger->debug(TAG, "DumpStyles: {} {}", (void*)test , i->second); } - std::map::iterator i2; - for (i2 = drawstyleHandlesRefCounts.begin(); i2 != drawstyleHandlesRefCounts.end(); i2++) + std::map::iterator ib; + for (ib = drawstyleHandlesRefCounts.begin(); ib != drawstyleHandlesRefCounts.end(); ib++) { - logger->debug(TAG, "DumpStylesRef: {} {}", i2->first, i2->second); + logger->debug(TAG, "DumpStylesRef: {} {}", ib->first, ib->second); } } #endif diff --git a/src/vepg.cc b/src/vepg.cc index a5646c9..0019f40 100644 --- a/src/vepg.cc +++ b/src/vepg.cc @@ -458,6 +458,8 @@ int VEpg::handleCommand(int command) if(command == Input::GO) return BoxStack::COMMAND_HANDLED; // GO just changes channel in preview, PLAY changes channel and returns to normal TV + + FALLTHROUGH } case Input::BACK: case Input::GUIDE: -- 2.39.2