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

Side by Side Diff: webrtc/video/video_send_stream.h

Issue 2995433002: Rename ViEEncoder to VideoStreamEncoder. (Closed)
Patch Set: Created 3 years, 4 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/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_send_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) 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 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
12 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 12 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory> 15 #include <memory>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/call/bitrate_allocator.h" 18 #include "webrtc/call/bitrate_allocator.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/video_coding/protection_bitrate_calculator.h" 20 #include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
21 #include "webrtc/rtc_base/criticalsection.h" 21 #include "webrtc/rtc_base/criticalsection.h"
22 #include "webrtc/rtc_base/event.h" 22 #include "webrtc/rtc_base/event.h"
23 #include "webrtc/rtc_base/task_queue.h" 23 #include "webrtc/rtc_base/task_queue.h"
24 #include "webrtc/video/encoder_rtcp_feedback.h" 24 #include "webrtc/video/encoder_rtcp_feedback.h"
25 #include "webrtc/video/send_delay_stats.h" 25 #include "webrtc/video/send_delay_stats.h"
26 #include "webrtc/video/send_statistics_proxy.h" 26 #include "webrtc/video/send_statistics_proxy.h"
27 #include "webrtc/video/vie_encoder.h" 27 #include "webrtc/video/video_stream_encoder.h"
28 #include "webrtc/video_receive_stream.h" 28 #include "webrtc/video_receive_stream.h"
29 #include "webrtc/video_send_stream.h" 29 #include "webrtc/video_send_stream.h"
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 class CallStats; 33 class CallStats;
34 class SendSideCongestionController; 34 class SendSideCongestionController;
35 class IvfFileWriter; 35 class IvfFileWriter;
36 class ProcessThread; 36 class ProcessThread;
37 class RtpRtcp; 37 class RtpRtcp;
38 class RtpTransportControllerSendInterface; 38 class RtpTransportControllerSendInterface;
39 class RtcEventLog; 39 class RtcEventLog;
40 40
41 namespace internal { 41 namespace internal {
42 42
43 class VideoSendStreamImpl; 43 class VideoSendStreamImpl;
44 44
45 // VideoSendStream implements webrtc::VideoSendStream. 45 // VideoSendStream implements webrtc::VideoSendStream.
46 // Internally, it delegates all public methods to VideoSendStreamImpl and / or 46 // Internally, it delegates all public methods to VideoSendStreamImpl and / or
47 // VieEncoder. VideoSendStreamInternal is created and deleted on |worker_queue|. 47 // VideoStreamEncoder. VideoSendStreamInternal is created and deleted on
48 // |worker_queue|.
48 class VideoSendStream : public webrtc::VideoSendStream { 49 class VideoSendStream : public webrtc::VideoSendStream {
49 public: 50 public:
50 VideoSendStream(int num_cpu_cores, 51 VideoSendStream(int num_cpu_cores,
51 ProcessThread* module_process_thread, 52 ProcessThread* module_process_thread,
52 rtc::TaskQueue* worker_queue, 53 rtc::TaskQueue* worker_queue,
53 CallStats* call_stats, 54 CallStats* call_stats,
54 RtpTransportControllerSendInterface* transport, 55 RtpTransportControllerSendInterface* transport,
55 BitrateAllocator* bitrate_allocator, 56 BitrateAllocator* bitrate_allocator,
56 SendDelayStats* send_delay_stats, 57 SendDelayStats* send_delay_stats,
57 RtcEventLog* event_log, 58 RtcEventLog* event_log,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 class DestructAndGetRtpStateTask; 96 class DestructAndGetRtpStateTask;
96 97
97 rtc::ThreadChecker thread_checker_; 98 rtc::ThreadChecker thread_checker_;
98 rtc::TaskQueue* const worker_queue_; 99 rtc::TaskQueue* const worker_queue_;
99 rtc::Event thread_sync_event_; 100 rtc::Event thread_sync_event_;
100 101
101 SendStatisticsProxy stats_proxy_; 102 SendStatisticsProxy stats_proxy_;
102 const VideoSendStream::Config config_; 103 const VideoSendStream::Config config_;
103 const VideoEncoderConfig::ContentType content_type_; 104 const VideoEncoderConfig::ContentType content_type_;
104 std::unique_ptr<VideoSendStreamImpl> send_stream_; 105 std::unique_ptr<VideoSendStreamImpl> send_stream_;
105 std::unique_ptr<ViEEncoder> vie_encoder_; 106 std::unique_ptr<VideoStreamEncoder> video_stream_encoder_;
106 }; 107 };
107 108
108 } // namespace internal 109 } // namespace internal
109 } // namespace webrtc 110 } // namespace webrtc
110 111
111 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 112 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698