mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-01 05:18:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: warning as error

Browse source
This commit is contained in:
rankun 2020-04-18 10:52:02 +08:00
commit ea91f36917
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
QtScrcpy/QtScrcpy.pro
View file

@ -26,6 +26,11 @@ msvc{
QMAKE_CFLAGS += -source-charset:utf-8 QMAKE_CFLAGS += -source-charset:utf-8
QMAKE_CXXFLAGS += -source-charset:utf-8 QMAKE_CXXFLAGS += -source-charset:utf-8
} }
# warning as error
*g++*: QMAKE_CXXFLAGS += -Werror
*msvc*: QMAKE_CXXFLAGS += /WX
# 源码 # 源码
SOURCES += \ SOURCES += \
main.cpp \ main.cpp \

17
QtScrcpy/device/stream/stream.cpp
View file

@ -9,7 +9,7 @@
#define BUFSIZE 0x10000 #define BUFSIZE 0x10000
#define HEADER_SIZE 12 #define HEADER_SIZE 12
#define NO_PTS UINT64_C(-1) #define NO_PTS UINT64_MAX
typedef qint32 (*ReadPacketFunc)(void *, quint8 *, qint32); typedef qint32 (*ReadPacketFunc)(void *, quint8 *, qint32);
@ -28,6 +28,7 @@ static void avLogCallback(void *avcl, int level, const char *fmt, va_list vl)
case AV_LOG_PANIC: case AV_LOG_PANIC:
case AV_LOG_FATAL: case AV_LOG_FATAL:
qFatal("%s", localFmt.toUtf8().data()); qFatal("%s", localFmt.toUtf8().data());
break;
case AV_LOG_ERROR: case AV_LOG_ERROR:
qCritical() << localFmt.toUtf8(); qCritical() << localFmt.toUtf8();
break; break;
@ -70,14 +71,14 @@ void Stream::setDecoder(Decoder *decoder)
static quint32 bufferRead32be(quint8 *buf) static quint32 bufferRead32be(quint8 *buf)
{ {
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; return static_cast<quint32>((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]);
} }
static quint64 bufferRead64be(quint8 *buf) static quint64 bufferRead64be(quint8 *buf)
{ {
quint32 msb = bufferRead32be(buf); quint32 msb = bufferRead32be(buf);
quint32 lsb = bufferRead32be(&buf[4]); quint32 lsb = bufferRead32be(&buf[4]);
return ((quint64)msb << 32) | lsb; return (static_cast<quint64>(msb) << 32) | lsb;
} }
void Stream::setVideoSocket(VideoSocket *videoSocket) void Stream::setVideoSocket(VideoSocket *videoSocket)
@ -230,16 +231,16 @@ bool Stream::recvPacket(AVPacket *packet)
quint64 pts = bufferRead64be(header); quint64 pts = bufferRead64be(header);
quint32 len = bufferRead32be(&header[8]); quint32 len = bufferRead32be(&header[8]);
Q_ASSERT(pts == static_cast<quint64>(NO_PTS) || (pts & 0x8000000000000000) == 0); Q_ASSERT(pts == NO_PTS || (pts & 0x8000000000000000) == 0);
Q_ASSERT(len); Q_ASSERT(len);
if (av_new_packet(packet, len)) { if (av_new_packet(packet, static_cast<int>(len))) {
qCritical("Could not allocate packet"); qCritical("Could not allocate packet");
return false; return false;
} }
r = recvData(packet->data, len); r = recvData(packet->data, static_cast<qint32>(len));
if (r < 0 || ((uint32_t)r) < len) { if (r < 0 || static_cast<quint32>(r) < len) {
av_packet_unref(packet); av_packet_unref(packet);
return false; return false;
} }
@ -272,7 +273,7 @@ bool Stream::pushPacket(AVPacket *packet)
m_hasPending = true; m_hasPending = true;
} }
memcpy(m_pending.data + offset, packet->data, packet->size); memcpy(m_pending.data + offset, packet->data, static_cast<unsigned int>(packet->size));
if (!isConfig) { if (!isConfig) {
// prepare the concat packet to send to the decoder // prepare the concat packet to send to the decoder