Chromium Code Reviews| Index: webrtc/video/video_receive_stream.cc |
| diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc |
| index 1be63e07d1e166f039e50e777489821d52b6cc59..3818b39984c5c6c29096bb14b67ca113305528cb 100644 |
| --- a/webrtc/video/video_receive_stream.cc |
| +++ b/webrtc/video/video_receive_stream.cc |
| @@ -19,7 +19,6 @@ |
| #include "webrtc/system_wrappers/interface/clock.h" |
| #include "webrtc/system_wrappers/interface/logging.h" |
| #include "webrtc/video/receive_statistics_proxy.h" |
| -#include "webrtc/video_encoder.h" |
| #include "webrtc/video_receive_stream.h" |
| namespace webrtc { |
| @@ -245,8 +244,7 @@ VideoReceiveStream::VideoReceiveStream(int num_cpu_cores, |
| incoming_video_stream_->SetExternalCallback(this); |
| vie_channel_->SetIncomingVideoStream(incoming_video_stream_.get()); |
| - if (config.pre_decode_callback) |
| - vie_channel_->RegisterPreDecodeImageCallback(&encoded_frame_proxy_); |
| + vie_channel_->RegisterPreDecodeImageCallback(this); |
| vie_channel_->RegisterPreRenderCallback(this); |
| } |
| @@ -324,6 +322,18 @@ int VideoReceiveStream::RenderFrame(const uint32_t /*stream_id*/, |
| return 0; |
| } |
| +int32_t VideoReceiveStream::Encoded( |
|
stefan-webrtc
2015/10/15 12:49:35
I find it a bit strange that we use an encode call
åsapersson
2015/10/16 09:33:59
Do this in a separate CL? Added comment.
stefan-webrtc
2015/10/16 09:40:10
Sounds good.
|
| + const EncodedImage& encoded_image, |
| + const CodecSpecificInfo* codec_specific_info, |
| + const RTPFragmentationHeader* fragmentation) { |
| + stats_proxy_->Encoded(encoded_image, codec_specific_info); |
| + if (config_.pre_decode_callback) { |
| + encoded_frame_proxy_.Encoded( |
| + encoded_image, codec_specific_info, fragmentation); |
| + } |
| + return 0; |
| +} |
| + |
| void VideoReceiveStream::SignalNetworkState(NetworkState state) { |
| if (state == kNetworkUp) |
| SetRtcpMode(config_.rtp.rtcp_mode); |