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

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

Issue 1417773002: Remove system_wrappers/interface/trace_event.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 | « no previous file | webrtc/base/event_tracer_unittest.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 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 25 matching lines...) Expand all
36 #include "talk/media/base/videorenderer.h" 36 #include "talk/media/base/videorenderer.h"
37 #include "talk/media/webrtc/constants.h" 37 #include "talk/media/webrtc/constants.h"
38 #include "talk/media/webrtc/simulcast.h" 38 #include "talk/media/webrtc/simulcast.h"
39 #include "talk/media/webrtc/webrtcvideoencoderfactory.h" 39 #include "talk/media/webrtc/webrtcvideoencoderfactory.h"
40 #include "talk/media/webrtc/webrtcvideoframe.h" 40 #include "talk/media/webrtc/webrtcvideoframe.h"
41 #include "talk/media/webrtc/webrtcvoiceengine.h" 41 #include "talk/media/webrtc/webrtcvoiceengine.h"
42 #include "webrtc/base/buffer.h" 42 #include "webrtc/base/buffer.h"
43 #include "webrtc/base/logging.h" 43 #include "webrtc/base/logging.h"
44 #include "webrtc/base/stringutils.h" 44 #include "webrtc/base/stringutils.h"
45 #include "webrtc/base/timeutils.h" 45 #include "webrtc/base/timeutils.h"
46 #include "webrtc/base/trace_event.h"
46 #include "webrtc/call.h" 47 #include "webrtc/call.h"
47 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 48 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
48 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" 49 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
49 #include "webrtc/system_wrappers/interface/field_trial.h" 50 #include "webrtc/system_wrappers/interface/field_trial.h"
50 #include "webrtc/system_wrappers/interface/trace_event.h"
51 #include "webrtc/video_decoder.h" 51 #include "webrtc/video_decoder.h"
52 #include "webrtc/video_encoder.h" 52 #include "webrtc/video_encoder.h"
53 53
54 namespace cricket { 54 namespace cricket {
55 namespace { 55 namespace {
56 56
57 // Wrap cricket::WebRtcVideoEncoderFactory as a webrtc::VideoEncoderFactory. 57 // Wrap cricket::WebRtcVideoEncoderFactory as a webrtc::VideoEncoderFactory.
58 class EncoderFactoryAdapter : public webrtc::VideoEncoderFactory { 58 class EncoderFactoryAdapter : public webrtc::VideoEncoderFactory {
59 public: 59 public:
60 // EncoderFactoryAdapter doesn't take ownership of |factory|, which is owned 60 // EncoderFactoryAdapter doesn't take ownership of |factory|, which is owned
(...skipping 2670 matching lines...) Expand 10 before | Expand all | Expand 10 after
2731 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2731 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2732 } 2732 }
2733 } 2733 }
2734 2734
2735 return video_codecs; 2735 return video_codecs;
2736 } 2736 }
2737 2737
2738 } // namespace cricket 2738 } // namespace cricket
2739 2739
2740 #endif // HAVE_WEBRTC_VIDEO 2740 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/event_tracer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698