Wire up currently-received video codec to stats.

webrtc/video_engine/vie_channel.cc

Index: webrtc/video_engine/vie_channel.cc
diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
index b8664cecc8d1b9001e38a2eb4debc4ec9b224cab..b6455eea83a6fe688daeb4e572b11a51aa76f22c 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -105,7 +105,7 @@ ViEChannel::ViEChannel(int32_t channel_id,
       vie_receiver_(channel_id, vcm_, remote_bitrate_estimator, this),
       vie_sync_(vcm_),
       stats_observer_(new ChannelStatsObserver(this)),
-      vcm_receive_stats_callback_(NULL),
+      receive_stats_callback_(NULL),
       incoming_video_stream_(nullptr),
       codec_observer_(NULL),
       intra_frame_observer_(intra_frame_observer),
@@ -1069,6 +1069,8 @@ int32_t ViEChannel::ReceivedDecodedReferenceFrame(
 void ViEChannel::IncomingCodecChanged(const VideoCodec& codec) {
   CriticalSectionScoped cs(crit_.get());
   receive_codec_ = codec;
+  if (receive_stats_callback_)
+    receive_stats_callback_->OnIncomingPayloadType(codec.plType);

[mflodman, 2015/08/28 09:46:06]

We should either reuse 'ViEDecoderObserver::IncomingCodecChanged' or remove
'ViEDecoderObserver::IncomingCodecChanged', not have both.

[pbos-webrtc, 2015/08/28 10:41:20]

Durrr, good call. :D

 }
 
 void ViEChannel::OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) {
@@ -1079,15 +1081,15 @@ void ViEChannel::OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) {
 
 void ViEChannel::OnDiscardedPacketsUpdated(int discarded_packets) {
   CriticalSectionScoped cs(crit_.get());
-  if (vcm_receive_stats_callback_ != NULL)
-    vcm_receive_stats_callback_->OnDiscardedPacketsUpdated(discarded_packets);
+  if (receive_stats_callback_ != NULL)

[mflodman, 2015/08/28 09:46:06]

Can you remove != NULL to get the same style as what you added for this ptr.

[pbos-webrtc, 2015/08/28 10:41:20]

Done.

+    receive_stats_callback_->OnDiscardedPacketsUpdated(discarded_packets);
 }
 
 void ViEChannel::OnFrameCountsUpdated(const FrameCounts& frame_counts) {
   CriticalSectionScoped cs(crit_.get());
   receive_frame_counts_ = frame_counts;
-  if (vcm_receive_stats_callback_ != NULL)
-    vcm_receive_stats_callback_->OnFrameCountsUpdated(frame_counts);
+  if (receive_stats_callback_ != NULL)
+    receive_stats_callback_->OnFrameCountsUpdated(frame_counts);
 }
 
 void ViEChannel::OnDecoderTiming(int decode_ms,
@@ -1297,7 +1299,7 @@ void ViEChannel::RegisterSendFrameCountObserver(
 void ViEChannel::RegisterReceiveStatisticsProxy(
     ReceiveStatisticsProxy* receive_statistics_proxy) {
   CriticalSectionScoped cs(crit_.get());
-  vcm_receive_stats_callback_ = receive_statistics_proxy;
+  receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(