Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: webrtc/video/video_quality_test.cc

Issue 1362923002: Revert of Wire up send-side bandwidth estimation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Manual merge of revert Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/video_quality_test.h ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 14 matching lines...) Expand all
25 #include "webrtc/system_wrappers/interface/cpu_info.h" 25 #include "webrtc/system_wrappers/interface/cpu_info.h"
26 #include "webrtc/test/layer_filtering_transport.h" 26 #include "webrtc/test/layer_filtering_transport.h"
27 #include "webrtc/test/run_loop.h" 27 #include "webrtc/test/run_loop.h"
28 #include "webrtc/test/statistics.h" 28 #include "webrtc/test/statistics.h"
29 #include "webrtc/test/testsupport/fileutils.h" 29 #include "webrtc/test/testsupport/fileutils.h"
30 #include "webrtc/test/video_renderer.h" 30 #include "webrtc/test/video_renderer.h"
31 #include "webrtc/video/video_quality_test.h" 31 #include "webrtc/video/video_quality_test.h"
32 32
33 namespace webrtc { 33 namespace webrtc {
34 34
35 static const int kTransportSeqExtensionId =
36 VideoQualityTest::kAbsSendTimeExtensionId + 1;
37 static const int kSendStatsPollingIntervalMs = 1000; 35 static const int kSendStatsPollingIntervalMs = 1000;
38 static const int kPayloadTypeVP8 = 123; 36 static const int kPayloadTypeVP8 = 123;
39 static const int kPayloadTypeVP9 = 124; 37 static const int kPayloadTypeVP9 = 124;
40 38
41 class VideoAnalyzer : public PacketReceiver, 39 class VideoAnalyzer : public PacketReceiver,
42 public newapi::Transport, 40 public newapi::Transport,
43 public VideoRenderer, 41 public VideoRenderer,
44 public VideoCaptureInput, 42 public VideoCaptureInput,
45 public EncodedFrameObserver { 43 public EncodedFrameObserver {
46 public: 44 public:
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 return; 591 return;
594 } 592 }
595 send_config_.encoder_settings.encoder = encoder_.get(); 593 send_config_.encoder_settings.encoder = encoder_.get();
596 send_config_.encoder_settings.payload_name = params.common.codec; 594 send_config_.encoder_settings.payload_name = params.common.codec;
597 send_config_.encoder_settings.payload_type = payload_type; 595 send_config_.encoder_settings.payload_type = payload_type;
598 596
599 send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs; 597 send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
600 send_config_.rtp.rtx.ssrcs.push_back(kSendRtxSsrcs[0]); 598 send_config_.rtp.rtx.ssrcs.push_back(kSendRtxSsrcs[0]);
601 send_config_.rtp.rtx.payload_type = kSendRtxPayloadType; 599 send_config_.rtp.rtx.payload_type = kSendRtxPayloadType;
602 600
603 send_config_.rtp.extensions.clear();
604 if (params.common.send_side_bwe) {
605 send_config_.rtp.extensions.push_back(RtpExtension(
606 RtpExtension::kTransportSequenceNumber, kTransportSeqExtensionId));
607 } else {
608 send_config_.rtp.extensions.push_back(
609 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId));
610 }
611
612 // Automatically fill out streams[0] with params. 601 // Automatically fill out streams[0] with params.
613 VideoStream* stream = &encoder_config_.streams[0]; 602 VideoStream* stream = &encoder_config_.streams[0];
614 stream->width = params.common.width; 603 stream->width = params.common.width;
615 stream->height = params.common.height; 604 stream->height = params.common.height;
616 stream->min_bitrate_bps = params.common.min_bitrate_bps; 605 stream->min_bitrate_bps = params.common.min_bitrate_bps;
617 stream->target_bitrate_bps = params.common.target_bitrate_bps; 606 stream->target_bitrate_bps = params.common.target_bitrate_bps;
618 stream->max_bitrate_bps = params.common.max_bitrate_bps; 607 stream->max_bitrate_bps = params.common.max_bitrate_bps;
619 stream->max_framerate = static_cast<int>(params.common.fps); 608 stream->max_framerate = static_cast<int>(params.common.fps);
620 609
621 stream->temporal_layer_thresholds_bps.clear(); 610 stream->temporal_layer_thresholds_bps.clear();
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 send_stream_->Stop(); 819 send_stream_->Stop();
831 receive_stream->Stop(); 820 receive_stream->Stop();
832 821
833 call->DestroyVideoReceiveStream(receive_stream); 822 call->DestroyVideoReceiveStream(receive_stream);
834 call->DestroyVideoSendStream(send_stream_); 823 call->DestroyVideoSendStream(send_stream_);
835 824
836 transport.StopSending(); 825 transport.StopSending();
837 } 826 }
838 827
839 } // namespace webrtc 828 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_quality_test.h ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698