zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always set render delay in ViEChannel::RegisterExternalDecoder.

Browse Source 
BUG=1523

Review URL: https://webrtc-codereview.appspot.com/1219007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3790 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-09 00:34:42 +00:00
parent 0946a56023
commit 29758de9b6
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/video_engine/vie_channel.cc
View File

@ -483,19 +483,20 @@ WebRtc_Word32 ViEChannel::RegisterCodecObserver(ViEDecoderObserver* observer) {
WebRtc_Word32 ViEChannel::RegisterExternalDecoder(const WebRtc_UWord8 pl_type, WebRtc_Word32 ViEChannel::RegisterExternalDecoder(const WebRtc_UWord8 pl_type,
VideoDecoder* decoder, VideoDecoder* decoder,
bool decoder_render, bool buffered_rendering,
WebRtc_Word32 render_delay) { WebRtc_Word32 render_delay) {
WEBRTC_TRACE(kTraceInfo, kTraceVideo, ViEId(engine_id_, channel_id_), WEBRTC_TRACE(kTraceInfo, kTraceVideo, ViEId(engine_id_, channel_id_),
"%s", __FUNCTION__); "%s", __FUNCTION__);
WebRtc_Word32 result = 0; WebRtc_Word32 result;
result = vcm_.RegisterExternalDecoder(decoder, pl_type, decoder_render); result = vcm_.RegisterExternalDecoder(decoder, pl_type, buffered_rendering);
if (decoder_render && result == 0) { if (result != VCM_OK) {
// Let VCM know how long before the actual render time the decoder needs WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, channel_id_),
// to get a frame for decoding. "%s: Could not register external decoder with VCM.",
result = vcm_.SetRenderDelay(render_delay); __FUNCTION__);
}
return result; return result;
}
return vcm_.SetRenderDelay(render_delay);
} }
WebRtc_Word32 ViEChannel::DeRegisterExternalDecoder( WebRtc_Word32 ViEChannel::DeRegisterExternalDecoder(

9
webrtc/video_engine/vie_channel.h
View File

@ -83,12 +83,13 @@ class ViEChannel
WebRtc_Word32 SetReceiveCodec(const VideoCodec& video_codec); WebRtc_Word32 SetReceiveCodec(const VideoCodec& video_codec);
WebRtc_Word32 GetReceiveCodec(VideoCodec* video_codec); WebRtc_Word32 GetReceiveCodec(VideoCodec* video_codec);
WebRtc_Word32 RegisterCodecObserver(ViEDecoderObserver* observer); WebRtc_Word32 RegisterCodecObserver(ViEDecoderObserver* observer);
// Registers an external decoder. |decoder_render| is set to true if the // Registers an external decoder. |buffered_rendering| means that the decoder
// decoder will do the rendering. If |decoder_render| is set,|render_delay| // will render frames after decoding according to the render timestamp
// indicates the time needed to decode and render a frame. // provided by the video coding module. |render_delay| indicates the time
// needed to decode and render a frame.
WebRtc_Word32 RegisterExternalDecoder(const WebRtc_UWord8 pl_type, WebRtc_Word32 RegisterExternalDecoder(const WebRtc_UWord8 pl_type,
VideoDecoder* decoder, VideoDecoder* decoder,
bool decoder_render, bool buffered_rendering,
WebRtc_Word32 render_delay); WebRtc_Word32 render_delay);
WebRtc_Word32 DeRegisterExternalDecoder(const WebRtc_UWord8 pl_type); WebRtc_Word32 DeRegisterExternalDecoder(const WebRtc_UWord8 pl_type);
WebRtc_Word32 ReceiveCodecStatistics(WebRtc_UWord32* num_key_frames, WebRtc_Word32 ReceiveCodecStatistics(WebRtc_UWord32* num_key_frames,