commit 66c24fe1650c4c16d3b56276b709002d94341031
author Niels Möller <nisse@webrtc.org> Fri Mar 23 10:08:18 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Mar 23 10:06:25 2018 +0000
tree 51d1c7268a800248142b4be179d68c05d16f820c
parent 8458cff411a6a69a661993bbb479ed211fb602e8

Update SendStatisticsProxy to use Rtp::payload_name, if available.

Followup fix to https://webrtc-review.googlesource.com/64101.

Bug: webrtc:8830
Change-Id: I223310a554e260b929a9798e1abb9982b1f8c278
Reviewed-on: https://webrtc-review.googlesource.com/64400
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22577}

video/send_statistics_proxy.cc

diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc
index 8f36f46..097ae60 100644
--- a/video/send_statistics_proxy.cc
+++ b/video/send_statistics_proxy.cc
@@ -126,7 +126,11 @@
     const VideoSendStream::Config& config,
     VideoEncoderConfig::ContentType content_type)
     : clock_(clock),
-      payload_name_(config.encoder_settings.payload_name),
+      // TODO(nisse): This is a transition hack; encoder_settings.payload_name
+      // is soon to be deleted.
+      payload_name_(!config.rtp.payload_name.empty()
+                        ? config.rtp.payload_name
+                        : config.encoder_settings.payload_name),
       rtp_config_(config.rtp),
       fallback_max_pixels_(GetFallbackMaxPixelsIfFieldTrialEnabled()),
       fallback_max_pixels_disabled_(GetFallbackMaxPixelsIfFieldTrialDisabled()),