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

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

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Rebased. Created 4 years 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/base/copyonwritebuffer.h" 20 #include "webrtc/base/copyonwritebuffer.h"
20 #include "webrtc/base/logging.h" 21 #include "webrtc/base/logging.h"
21 #include "webrtc/base/stringutils.h" 22 #include "webrtc/base/stringutils.h"
22 #include "webrtc/base/timeutils.h" 23 #include "webrtc/base/timeutils.h"
23 #include "webrtc/base/trace_event.h" 24 #include "webrtc/base/trace_event.h"
24 #include "webrtc/call.h" 25 #include "webrtc/call.h"
25 #include "webrtc/common_video/h264/profile_level_id.h" 26 #include "webrtc/common_video/h264/profile_level_id.h"
26 #include "webrtc/media/engine/constants.h" 27 #include "webrtc/media/engine/constants.h"
27 #include "webrtc/media/engine/internalencoderfactory.h" 28 #include "webrtc/media/engine/internalencoderfactory.h"
28 #include "webrtc/media/engine/internaldecoderfactory.h" 29 #include "webrtc/media/engine/internaldecoderfactory.h"
(...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2564 rtx_mapping[video_codecs[i].codec.id] != 2565 rtx_mapping[video_codecs[i].codec.id] !=
2565 ulpfec_config.red_payload_type) { 2566 ulpfec_config.red_payload_type) {
2566 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2567 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2567 } 2568 }
2568 } 2569 }
2569 2570
2570 return video_codecs; 2571 return video_codecs;
2571 } 2572 }
2572 2573
2573 } // namespace cricket 2574 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698