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

Side by Side Diff: content/renderer/pepper/pepper_media_stream_video_track_host.cc

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « content/renderer/p2p/socket_client_impl.cc ('k') | jingle/glue/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h" 5 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "content/renderer/media/media_stream_video_track.h" 11 #include "content/renderer/media/media_stream_video_track.h"
12 #include "media/base/bind_to_current_loop.h" 12 #include "media/base/bind_to_current_loop.h"
13 #include "media/base/yuv_convert.h" 13 #include "media/base/yuv_convert.h"
14 #include "ppapi/c/pp_errors.h" 14 #include "ppapi/c/pp_errors.h"
15 #include "ppapi/c/ppb_media_stream_video_track.h" 15 #include "ppapi/c/ppb_media_stream_video_track.h"
16 #include "ppapi/c/ppb_video_frame.h" 16 #include "ppapi/c/ppb_video_frame.h"
17 #include "ppapi/host/dispatch_host_message.h" 17 #include "ppapi/host/dispatch_host_message.h"
18 #include "ppapi/host/host_message_context.h" 18 #include "ppapi/host/host_message_context.h"
19 #include "ppapi/proxy/ppapi_messages.h" 19 #include "ppapi/proxy/ppapi_messages.h"
20 #include "ppapi/shared_impl/media_stream_buffer.h" 20 #include "ppapi/shared_impl/media_stream_buffer.h"
21 21
22 // IS_ALIGNED is also defined in 22 // IS_ALIGNED is also defined in
23 // third_party/webrtc/overrides/webrtc/base/basictypes.h 23 // third_party/libjingle/overrides/talk/base/basictypes.h
24 // TODO(ronghuawu): Avoid undef. 24 // TODO(ronghuawu): Avoid undef.
25 #undef IS_ALIGNED 25 #undef IS_ALIGNED
26 #include "third_party/libyuv/include/libyuv.h" 26 #include "third_party/libyuv/include/libyuv.h"
27 27
28 using media::VideoFrame; 28 using media::VideoFrame;
29 using ppapi::host::HostMessageContext; 29 using ppapi::host::HostMessageContext;
30 using ppapi::MediaStreamVideoTrackShared; 30 using ppapi::MediaStreamVideoTrackShared;
31 31
32 namespace { 32 namespace {
33 33
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 base::Unretained(this)), 536 base::Unretained(this)),
537 enabled); 537 enabled);
538 } 538 }
539 539
540 void PepperMediaStreamVideoTrackHost::OnTrackStarted( 540 void PepperMediaStreamVideoTrackHost::OnTrackStarted(
541 MediaStreamSource* source, bool success) { 541 MediaStreamSource* source, bool success) {
542 DVLOG(3) << "OnTrackStarted result: " << success; 542 DVLOG(3) << "OnTrackStarted result: " << success;
543 } 543 }
544 544
545 } // namespace content 545 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/p2p/socket_client_impl.cc ('k') | jingle/glue/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698