Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1066935 - Part 1: Fix -Wsign-compare and -Wunreachable-code warnings in webrtc/signaling. r=jesup

Browse Source
This commit is contained in:
Chris Peterson 2014-09-12 23:17:08 -07:00
parent 2ac8d46cbb
commit c228a42c0a
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp
View File

@ -101,8 +101,7 @@ WebrtcFrameTypeToGmpFrameType(webrtc::VideoFrameType aIn,
*aOut = kGMPSkipFrame; *aOut = kGMPSkipFrame;
break; break;
default: default:
MOZ_CRASH(); MOZ_CRASH("Unexpected VideoFrameType");
return WEBRTC_VIDEO_CODEC_ERROR;
} }
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
@ -130,14 +129,12 @@ GmpFrameTypeToWebrtcFrameType(GMPVideoFrameType aIn,
*aOut = webrtc::kSkipFrame; *aOut = webrtc::kSkipFrame;
break; break;
default: default:
MOZ_CRASH(); MOZ_CRASH("Unexpected GMPVideoFrameType");
return WEBRTC_VIDEO_CODEC_ERROR;
} }
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
} }
int32_t int32_t
WebrtcGmpVideoEncoder::InitEncode(const webrtc::VideoCodec* aCodecSettings, WebrtcGmpVideoEncoder::InitEncode(const webrtc::VideoCodec* aCodecSettings,
int32_t aNumberOfCores, int32_t aNumberOfCores,
@ -233,7 +230,6 @@ WebrtcGmpVideoEncoder::Encode(const webrtc::I420VideoFrame& aInputImage,
return ret; return ret;
} }
int32_t int32_t
WebrtcGmpVideoEncoder::Encode_g(const webrtc::I420VideoFrame* aInputImage, WebrtcGmpVideoEncoder::Encode_g(const webrtc::I420VideoFrame* aInputImage,
const webrtc::CodecSpecificInfo* aCodecSpecificInfo, const webrtc::CodecSpecificInfo* aCodecSpecificInfo,
@ -245,9 +241,10 @@ WebrtcGmpVideoEncoder::Encode_g(const webrtc::I420VideoFrame* aInputImage,
return WEBRTC_VIDEO_CODEC_ERROR; return WEBRTC_VIDEO_CODEC_ERROR;
} }
if (aInputImage->width() != mCodecParams.mWidth || MOZ_ASSERT(aInputImage->width() >= 0 && aInputImage->height() >= 0);
aInputImage->height() != mCodecParams.mHeight) { if (static_cast<uint32_t>(aInputImage->width()) != mCodecParams.mWidth ||
LOGD(("GMP Encode: resolution change from %ux%u to %ux%u", static_cast<uint32_t>(aInputImage->height()) != mCodecParams.mHeight) {
LOGD(("GMP Encode: resolution change from %ux%u to %dx%d",
mCodecParams.mWidth, mCodecParams.mHeight, aInputImage->width(), aInputImage->height())); mCodecParams.mWidth, mCodecParams.mHeight, aInputImage->width(), aInputImage->height()));
mGMP->Close(); mGMP->Close();
@ -329,8 +326,6 @@ WebrtcGmpVideoEncoder::Encode_g(const webrtc::I420VideoFrame* aInputImage,
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
} }
int32_t int32_t
WebrtcGmpVideoEncoder::RegisterEncodeCompleteCallback(webrtc::EncodedImageCallback* aCallback) WebrtcGmpVideoEncoder::RegisterEncodeCompleteCallback(webrtc::EncodedImageCallback* aCallback)
{ {