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

Side by Side Diff: webrtc/modules/video_coding/generic_encoder.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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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/modules/video_coding/generic_encoder.h" 11 #include "webrtc/modules/video_coding/generic_encoder.h"
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "webrtc/api/optional.h"
15 #include "webrtc/api/video/i420_buffer.h" 16 #include "webrtc/api/video/i420_buffer.h"
16 #include "webrtc/modules/pacing/alr_detector.h" 17 #include "webrtc/modules/pacing/alr_detector.h"
17 #include "webrtc/modules/video_coding/encoded_frame.h" 18 #include "webrtc/modules/video_coding/encoded_frame.h"
18 #include "webrtc/modules/video_coding/media_optimization.h" 19 #include "webrtc/modules/video_coding/media_optimization.h"
19 #include "webrtc/rtc_base/checks.h" 20 #include "webrtc/rtc_base/checks.h"
20 #include "webrtc/rtc_base/logging.h" 21 #include "webrtc/rtc_base/logging.h"
21 #include "webrtc/rtc_base/optional.h"
22 #include "webrtc/rtc_base/timeutils.h" 22 #include "webrtc/rtc_base/timeutils.h"
23 #include "webrtc/rtc_base/trace_event.h" 23 #include "webrtc/rtc_base/trace_event.h"
24 #include "webrtc/system_wrappers/include/field_trial.h" 24 #include "webrtc/system_wrappers/include/field_trial.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 VCMGenericEncoder::VCMGenericEncoder( 28 VCMGenericEncoder::VCMGenericEncoder(
29 VideoEncoder* encoder, 29 VideoEncoder* encoder,
30 VCMEncodedFrameCallback* encoded_frame_callback, 30 VCMEncodedFrameCallback* encoded_frame_callback,
31 bool internal_source) 31 bool internal_source)
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 media_opt_->UpdateWithEncodedData(encoded_image); 345 media_opt_->UpdateWithEncodedData(encoded_image);
346 if (internal_source_) { 346 if (internal_source_) {
347 // Signal to encoder to drop next frame. 347 // Signal to encoder to drop next frame.
348 result.drop_next_frame = media_opt_->DropFrame(); 348 result.drop_next_frame = media_opt_->DropFrame();
349 } 349 }
350 } 350 }
351 return result; 351 return result;
352 } 352 }
353 353
354 } // namespace webrtc 354 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/frame_object.h ('k') | webrtc/modules/video_coding/sequence_number_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698