Bug 1252737 - use size_t instead of uint32_t for InitEncode(). r?jesup
Although 3rd parameter VideoEncodeer::InitEncode() is defiend as size_t, WebrtcIMXH264VideoCodec and WebrtcMediaCodecVP8VideoCodec uses uint32_t. This will cause build error for 64bit platform.
MozReview-Commit-ID: 20NgE5e7Cuz
--- a/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
@@ -618,17 +618,17 @@ WebrtcMediaCodecVP8VideoEncoder::VerifyA
mEncodedImage._size = minimumSize;
}
return 0;
}
int32_t WebrtcMediaCodecVP8VideoEncoder::InitEncode(
const webrtc::VideoCodec* codecSettings,
int32_t numberOfCores,
- uint32_t maxPayloadSize) {
+ size_t maxPayloadSize) {
mMaxPayloadSize = maxPayloadSize;
CSFLogDebug(logTag, "%s, w = %d, h = %d", __FUNCTION__, codecSettings->width, codecSettings->height);
return WEBRTC_VIDEO_CODEC_OK;
}
int32_t WebrtcMediaCodecVP8VideoEncoder::Encode(
const webrtc::I420VideoFrame& inputImage,
--- a/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.h
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.h
@@ -29,18 +29,18 @@ public:
WebrtcMediaCodecVP8VideoEncoder();
virtual ~WebrtcMediaCodecVP8VideoEncoder() override;
// Implement VideoEncoder interface.
virtual uint64_t PluginID() const override { return 0; }
virtual int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
- int32_t numberOfCores,
- uint32_t maxPayloadSize) override;
+ int32_t numberOfCores,
+ size_t maxPayloadSize) override;
virtual int32_t Encode(const webrtc::I420VideoFrame& inputImage,
const webrtc::CodecSpecificInfo* codecSpecificInfo,
const std::vector<webrtc::VideoFrameType>* frame_types) override;
virtual int32_t RegisterEncodeCompleteCallback(webrtc::EncodedImageCallback* callback) override;
virtual int32_t Release() override;
--- a/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
@@ -836,17 +836,17 @@ WebrtcOMXH264VideoEncoder::WebrtcOMXH264
{
mReservation = new OMXCodecReservation(true);
CODEC_LOGD("WebrtcOMXH264VideoEncoder:%p constructed", this);
}
int32_t
WebrtcOMXH264VideoEncoder::InitEncode(const webrtc::VideoCodec* aCodecSettings,
int32_t aNumOfCores,
- uint32_t aMaxPayloadSize)
+ size_t aMaxPayloadSize)
{
CODEC_LOGD("WebrtcOMXH264VideoEncoder:%p init", this);
if (mOMX == nullptr) {
nsAutoPtr<OMXVideoEncoder> omx(OMXCodecWrapper::CreateAVCEncoder());
if (NS_WARN_IF(omx == nullptr)) {
return WEBRTC_VIDEO_CODEC_ERROR;
}
--- a/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.h
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.h
@@ -35,17 +35,17 @@ public:
virtual ~WebrtcOMXH264VideoEncoder();
// Implement VideoEncoder interface.
virtual uint64_t PluginID() const override { return 0; }
virtual int32_t InitEncode(const webrtc::VideoCodec* aCodecSettings,
int32_t aNumOfCores,
- uint32_t aMaxPayloadSize) override;
+ size_t aMaxPayloadSize) override;
virtual int32_t Encode(const webrtc::I420VideoFrame& aInputImage,
const webrtc::CodecSpecificInfo* aCodecSpecificInfo,
const std::vector<webrtc::VideoFrameType>* aFrameTypes) override;
virtual int32_t RegisterEncodeCompleteCallback(webrtc::EncodedImageCallback* aCallback) override;
virtual int32_t Release() override;