generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates to VP8 wrapper:

Browse Source 
1) Added VP8E_SET_STATIC_THRESHOLD which sets threshold for
   forcing static macroblocks to skipped mode
   (useful for encoding of static background).
2) Removed some code in decoding to allow for 
   decoding of incomplete frames.
3) Minor change to MaxIntraTarget()
4) Added control setting for maximum (target) size of 
   intra-frame.
5) Increased kf_max_dist(reduce/remove key-frame periodicity)  
   since we use kf_auto_mode. 
Review URL: http://webrtc-codereview.appspot.com/101001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@314 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@google.com 2011-08-05 20:51:32 +00:00
parent 9f726b9d78
commit a1ec48dec2
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/video_coding/codecs/vp8/main/interface/vp8.h
View File

@ -135,8 +135,8 @@ public:
WebRtc_Word32 length);
private:
// Call encoder initialize function and set speed.
WebRtc_Word32 InitAndSetSpeed();
// Call encoder initialize function and set control settings.
WebRtc_Word32 InitAndSetControlSettings();
// Determine maximum target for Intra frames
//
@ -144,9 +144,8 @@ private:
// - optimalBuffersize : Optimal buffer size
// Return Value : Max target size for Intra frames represented as
// percentage of the per frame bandwidth
#ifdef VP8_LATEST
WebRtc_Word32 MaxIntraTarget(WebRtc_Word32 optimalBuffersize);
#endif
WebRtc_UWord32 MaxIntraTarget(WebRtc_UWord32 optimalBuffersize);
EncodedImage _encodedImage;
EncodedImageCallback* _encodedCompleteCallback;
WebRtc_Word32 _width;
@ -164,6 +163,7 @@ private:
WebRtc_UWord16 _pictureIDLastSentRef;
WebRtc_UWord16 _pictureIDLastAcknowledgedRef;
int _cpuSpeed;
WebRtc_UWord32 _rcMaxIntraTarget;
vpx_codec_ctx_t* _encoder;
vpx_codec_enc_cfg_t* _cfg;

58
src/modules/video_coding/codecs/vp8/main/source/vp8.cc
View File

@ -51,6 +51,7 @@ VP8Encoder::VP8Encoder():
_pictureIDLastSentRef(0),
_pictureIDLastAcknowledgedRef(0),
_cpuSpeed(-6), // default value
_rcMaxIntraTarget(0),
_encoder(NULL),
_cfg(NULL),
_raw(NULL)
@ -137,7 +138,7 @@ VP8Encoder::Reset()
_encoder = new vpx_codec_ctx_t;
return InitAndSetSpeed();
return InitAndSetControlSettings();
}
WebRtc_Word32
@ -291,10 +292,8 @@ VP8Encoder::InitEncode(const VideoCodec* inst,
_cfg->rc_buf_initial_sz = 500;
_cfg->rc_buf_optimal_sz = 600;
_cfg->rc_buf_sz = 1000;
#ifdef VP8_LATEST
_cfg->rc_max_intra_bitrate_pct = MaxIntraTarget(_cfg->rc_buf_optimal_sz);
#endif
// set the maximum target size of any key-frame.
_rcMaxIntraTarget = MaxIntraTarget(_cfg->rc_buf_optimal_sz);
#ifdef DEV_PIC_LOSS
// this can only be off if we know we use feedback
@ -307,7 +306,7 @@ VP8Encoder::InitEncode(const VideoCodec* inst,
#endif
{
_cfg->kf_mode = VPX_KF_AUTO;
_cfg->kf_max_dist = 300;
_cfg->kf_max_dist = 3000;
}
switch (inst->codecSpecific.VP8.complexity)
@ -334,11 +333,13 @@ VP8Encoder::InitEncode(const VideoCodec* inst,
}
}
return InitAndSetSpeed();
return InitAndSetControlSettings();
}
WebRtc_Word32
VP8Encoder::InitAndSetSpeed()
VP8Encoder::InitAndSetControlSettings()
{
// construct encoder context
vpx_codec_enc_cfg_t cfg_copy = *_cfg;
@ -346,9 +347,12 @@ VP8Encoder::InitAndSetSpeed()
{
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
vpx_codec_control(_encoder, VP8E_SET_STATIC_THRESHOLD, 800);
vpx_codec_control(_encoder, VP8E_SET_CPUUSED, _cpuSpeed);
#ifdef VP8_LATEST
vpx_codec_control(_encoder, VP8E_SET_MAX_INTRA_BITRATE_PCT,
_rcMaxIntraTarget);
#endif
*_cfg = cfg_copy;
_inited = true;
@ -356,18 +360,22 @@ VP8Encoder::InitAndSetSpeed()
}
#ifdef VP8_LATEST
WebRtc_Word32
VP8Encoder::MaxIntraTarget(WebRtc_Word32 optimalBuffersize)
WebRtc_UWord32
VP8Encoder::MaxIntraTarget(WebRtc_UWord32 optimalBuffersize)
{
// Set max to 1 / 2 of the optimal buffer level (normalize by target BR).
// Max target size = 0.5 * optimalBufferSize * targetBR[Kbps].
// This values is presented in percentage of perFrameBw.
// Set max to the optimal buffer level (normalized by target BR),
// and scaled by a scalePar.
// Max target size = scalePar * optimalBufferSize * targetBR[Kbps].
// This values is presented in percentage of perFrameBw:
// perFrameBw = targetBR[Kbps] * 1000 / frameRate.
// The target in % is as follows:
WebRtc_Word32 targetPct = (optimalBuffersize >> 1) * _maxFrameRate / 10;
float scalePar = 0.5;
WebRtc_UWord32 targetPct = (optimalBuffersize * scalePar) *
_maxFrameRate / 10;
// Don't go below 3 times the per frame bandwidth.
const WebRtc_Word32 minIntraTh = 300;
const WebRtc_UWord32 minIntraTh = 300;
targetPct = (targetPct < minIntraTh) ? minIntraTh: targetPct;
return targetPct;
@ -663,7 +671,7 @@ VP8Decoder::InitDecode(const VideoCodec* inst,
// TODO(mikhal): evaluate post-proc settings
// config post-processing settings for decoder
ppcfg.post_proc_flag = VP8_DEBLOCK;
ppcfg.post_proc_flag = VP8_DEBLOCK;
// Strength of deblocking filter. Valid range:[0,16]
ppcfg.deblocking_level = 5;
// ppcfg.NoiseLevel = 1; //Noise intensity. Valid range: [0,7]
@ -706,19 +714,7 @@ VP8Decoder::Decode(const EncodedImage& inputImage,
{
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}
if (inputImage._completeFrame == false)
{
// future improvement
// we can't decode this frame
if (_feedbackModeOn)
{
return WEBRTC_VIDEO_CODEC_ERR_REQUEST_SLI;
}
else
{
return WEBRTC_VIDEO_CODEC_ERROR;
}
}
vpx_dec_iter_t _iter = NULL;
vpx_image_t* img;