wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1033335: Don't send IDRs to change bitrates or periodic ones to fix encoder errors r=pkerr

Browse Source
This commit is contained in:
Randell Jesup 2014-10-07 14:14:01 -04:00
parent a3e56631f0
commit d3c25b549e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
View File

@ -788,7 +788,9 @@ WebrtcOMXH264VideoEncoder::WebrtcOMXH264VideoEncoder()
, mHeight(0)
, mFrameRate(0)
, mBitRateKbps(0)
#ifdef OMX_IDR_NEEDED_FOR_BITRATE
, mBitRateAtLastIDR(0)
#endif
, mOMXConfigured(false)
, mOMXReconfigure(false)
{
@ -903,13 +905,16 @@ WebrtcOMXH264VideoEncoder::Encode(const webrtc::I420VideoFrame& aInputImage,
return WEBRTC_VIDEO_CODEC_ERROR;
}
mOMXConfigured = true;
#ifdef OMX_IDR_NEEDED_FOR_BITRATE
mLastIDRTime = TimeStamp::Now();
mBitRateAtLastIDR = mBitRateKbps;
#endif
}
if (aFrameTypes && aFrameTypes->size() &&
((*aFrameTypes)[0] == webrtc::kKeyFrame)) {
mOMX->RequestIDRFrame();
#ifdef OMX_IDR_NEEDED_FOR_BITRATE
mLastIDRTime = TimeStamp::Now();
mBitRateAtLastIDR = mBitRateKbps;
} else if (mBitRateKbps != mBitRateAtLastIDR) {
@ -942,6 +947,7 @@ WebrtcOMXH264VideoEncoder::Encode(const webrtc::I420VideoFrame& aInputImage,
mLastIDRTime = now;
mBitRateAtLastIDR = mBitRateKbps;
}
#endif
}
// Wrap I420VideoFrame input with PlanarYCbCrImage for OMXVideoEncoder.

3
media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.h
View File

@ -26,6 +26,7 @@ class OMXOutputDrain;
// XXX see if we can reduce this
#define WEBRTC_OMX_H264_MIN_DECODE_BUFFERS 10
#define OMX_IDR_NEEDED_FOR_BITRATE 0
class WebrtcOMXH264VideoEncoder : public WebrtcVideoEncoder
{
@ -64,8 +65,10 @@ private:
uint32_t mHeight;
uint32_t mFrameRate;
uint32_t mBitRateKbps;
#ifdef OMX_IDR_NEEDED_FOR_BITRATE
uint32_t mBitRateAtLastIDR;
TimeStamp mLastIDRTime;
#endif
bool mOMXConfigured;
bool mOMXReconfigure;
webrtc::EncodedImage mEncodedImage;