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

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

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 years, 3 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.cc ('k') | webrtc/voice_engine/BUILD.gn » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 10
11 #include "webrtc/video/video_receive_stream.h" 11 #include "webrtc/video/video_receive_stream.h"
12 12
13 #include <stdlib.h> 13 #include <stdlib.h>
14 14
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <utility> 17 #include <utility>
18 18
19 #include "webrtc/api/optional.h"
19 #include "webrtc/call/rtp_stream_receiver_controller_interface.h" 20 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
20 #include "webrtc/common_types.h" 21 #include "webrtc/common_types.h"
21 #include "webrtc/common_video/h264/profile_level_id.h" 22 #include "webrtc/common_video/h264/profile_level_id.h"
22 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 23 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
23 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" 24 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
25 #include "webrtc/modules/utility/include/process_thread.h" 26 #include "webrtc/modules/utility/include/process_thread.h"
26 #include "webrtc/modules/video_coding/frame_object.h" 27 #include "webrtc/modules/video_coding/frame_object.h"
27 #include "webrtc/modules/video_coding/include/video_coding.h" 28 #include "webrtc/modules/video_coding/include/video_coding.h"
28 #include "webrtc/modules/video_coding/jitter_estimator.h" 29 #include "webrtc/modules/video_coding/jitter_estimator.h"
29 #include "webrtc/modules/video_coding/timing.h" 30 #include "webrtc/modules/video_coding/timing.h"
30 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h" 31 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
31 #include "webrtc/rtc_base/checks.h" 32 #include "webrtc/rtc_base/checks.h"
32 #include "webrtc/rtc_base/location.h" 33 #include "webrtc/rtc_base/location.h"
33 #include "webrtc/rtc_base/logging.h" 34 #include "webrtc/rtc_base/logging.h"
34 #include "webrtc/rtc_base/optional.h"
35 #include "webrtc/rtc_base/trace_event.h" 35 #include "webrtc/rtc_base/trace_event.h"
36 #include "webrtc/system_wrappers/include/clock.h" 36 #include "webrtc/system_wrappers/include/clock.h"
37 #include "webrtc/system_wrappers/include/field_trial.h" 37 #include "webrtc/system_wrappers/include/field_trial.h"
38 #include "webrtc/video/call_stats.h" 38 #include "webrtc/video/call_stats.h"
39 #include "webrtc/video/receive_statistics_proxy.h" 39 #include "webrtc/video/receive_statistics_proxy.h"
40 40
41 namespace webrtc { 41 namespace webrtc {
42 42
43 namespace { 43 namespace {
44 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) { 44 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) {
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 if (stream_is_active && !receiving_keyframe) { 437 if (stream_is_active && !receiving_keyframe) {
438 LOG(LS_WARNING) << "No decodable frame in " << wait_ms 438 LOG(LS_WARNING) << "No decodable frame in " << wait_ms
439 << " ms, requesting keyframe."; 439 << " ms, requesting keyframe.";
440 RequestKeyFrame(); 440 RequestKeyFrame();
441 } 441 }
442 } 442 }
443 return true; 443 return true;
444 } 444 }
445 } // namespace internal 445 } // namespace internal
446 } // namespace webrtc 446 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_quality_test.cc ('k') | webrtc/voice_engine/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698