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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 2780943003: Move video_encoder.h and video_decoder.h to /api and create GN targets for them (Closed)
Patch Set: Add missing TODO Created 3 years, 8 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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/media/engine/webrtcvideoengine2.h" 11 #include "webrtc/media/engine/webrtcvideoengine2.h"
12 12
13 #include <stdio.h> 13 #include <stdio.h>
14 #include <algorithm> 14 #include <algorithm>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <utility> 17 #include <utility>
18 18
19 #include "webrtc/api/video/i420_buffer.h" 19 #include "webrtc/api/video/i420_buffer.h"
20 #include "webrtc/api/video_codecs/video_decoder.h"
21 #include "webrtc/api/video_codecs/video_encoder.h"
20 #include "webrtc/base/copyonwritebuffer.h" 22 #include "webrtc/base/copyonwritebuffer.h"
21 #include "webrtc/base/logging.h" 23 #include "webrtc/base/logging.h"
22 #include "webrtc/base/stringutils.h" 24 #include "webrtc/base/stringutils.h"
23 #include "webrtc/base/timeutils.h" 25 #include "webrtc/base/timeutils.h"
24 #include "webrtc/base/trace_event.h" 26 #include "webrtc/base/trace_event.h"
25 #include "webrtc/call/call.h" 27 #include "webrtc/call/call.h"
26 #include "webrtc/common_video/h264/profile_level_id.h" 28 #include "webrtc/common_video/h264/profile_level_id.h"
27 #include "webrtc/media/engine/constants.h" 29 #include "webrtc/media/engine/constants.h"
28 #include "webrtc/media/engine/internalencoderfactory.h" 30 #include "webrtc/media/engine/internalencoderfactory.h"
29 #include "webrtc/media/engine/internaldecoderfactory.h" 31 #include "webrtc/media/engine/internaldecoderfactory.h"
30 #include "webrtc/media/engine/simulcast.h" 32 #include "webrtc/media/engine/simulcast.h"
31 #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" 33 #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
32 #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h" 34 #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
33 #include "webrtc/media/engine/webrtcmediaengine.h" 35 #include "webrtc/media/engine/webrtcmediaengine.h"
34 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 36 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
35 #include "webrtc/media/engine/webrtcvoiceengine.h" 37 #include "webrtc/media/engine/webrtcvoiceengine.h"
36 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" 38 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
37 #include "webrtc/system_wrappers/include/field_trial.h" 39 #include "webrtc/system_wrappers/include/field_trial.h"
38 #include "webrtc/video_decoder.h"
39 #include "webrtc/video_encoder.h"
40 40
41 namespace cricket { 41 namespace cricket {
42 namespace { 42 namespace {
43 43
44 // If this field trial is enabled, we will enable sending FlexFEC and disable 44 // If this field trial is enabled, we will enable sending FlexFEC and disable
45 // sending ULPFEC whenever the former has been negotiated. Receiving FlexFEC 45 // sending ULPFEC whenever the former has been negotiated. Receiving FlexFEC
46 // is enabled whenever FlexFEC has been negotiated. 46 // is enabled whenever FlexFEC has been negotiated.
47 bool IsFlexfecFieldTrialEnabled() { 47 bool IsFlexfecFieldTrialEnabled() {
48 return webrtc::field_trial::FindFullName("WebRTC-FlexFEC-03") == "Enabled"; 48 return webrtc::field_trial::FindFullName("WebRTC-FlexFEC-03") == "Enabled";
49 } 49 }
(...skipping 2509 matching lines...) Expand 10 before | Expand all | Expand 10 after
2559 rtx_mapping[video_codecs[i].codec.id] != 2559 rtx_mapping[video_codecs[i].codec.id] !=
2560 ulpfec_config.red_payload_type) { 2560 ulpfec_config.red_payload_type) {
2561 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2561 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2562 } 2562 }
2563 } 2563 }
2564 2564
2565 return video_codecs; 2565 return video_codecs;
2566 } 2566 }
2567 2567
2568 } // namespace cricket 2568 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/videoencodersoftwarefallbackwrapper.h ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698