зеркало из https://github.com/mozilla/gecko-dev.git
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 --HG-- extra : rebase_source : 6da7b73504843b1062daff2b6977743114c2591e
This commit is contained in:
Родитель
9dabe43310
Коммит
89dd964ab1
|
@ -623,7 +623,7 @@ WebrtcMediaCodecVP8VideoEncoder::VerifyAndAllocate(const uint32_t minimumSize)
|
|||
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);
|
||||
|
||||
|
|
|
@ -34,8 +34,8 @@ public:
|
|||
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,
|
||||
|
|
|
@ -841,7 +841,7 @@ WebrtcOMXH264VideoEncoder::WebrtcOMXH264VideoEncoder()
|
|||
int32_t
|
||||
WebrtcOMXH264VideoEncoder::InitEncode(const webrtc::VideoCodec* aCodecSettings,
|
||||
int32_t aNumOfCores,
|
||||
uint32_t aMaxPayloadSize)
|
||||
size_t aMaxPayloadSize)
|
||||
{
|
||||
CODEC_LOGD("WebrtcOMXH264VideoEncoder:%p init", this);
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ public:
|
|||
|
||||
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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче