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

Side by Side Diff: chrome/renderer/extensions/cast_streaming_native_handler.cc

Issue 1773273007: Cleanup: media_stream_api.* ==> media_stream_utils.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +headers in blink_test_runner.cc Created 4 years, 9 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 | content/content_renderer.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/renderer/extensions/cast_streaming_native_handler.h" 5 #include "chrome/renderer/extensions/cast_streaming_native_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <functional> 10 #include <functional>
11 #include <iterator> 11 #include <iterator>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
20 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
21 #include "base/thread_task_runner_handle.h" 21 #include "base/thread_task_runner_handle.h"
22 #include "chrome/common/extensions/api/cast_streaming_receiver_session.h" 22 #include "chrome/common/extensions/api/cast_streaming_receiver_session.h"
23 #include "chrome/common/extensions/api/cast_streaming_rtp_stream.h" 23 #include "chrome/common/extensions/api/cast_streaming_rtp_stream.h"
24 #include "chrome/common/extensions/api/cast_streaming_udp_transport.h" 24 #include "chrome/common/extensions/api/cast_streaming_udp_transport.h"
25 #include "chrome/renderer/media/cast_receiver_session.h" 25 #include "chrome/renderer/media/cast_receiver_session.h"
26 #include "chrome/renderer/media/cast_rtp_stream.h" 26 #include "chrome/renderer/media/cast_rtp_stream.h"
27 #include "chrome/renderer/media/cast_session.h" 27 #include "chrome/renderer/media/cast_session.h"
28 #include "chrome/renderer/media/cast_udp_transport.h" 28 #include "chrome/renderer/media/cast_udp_transport.h"
29 #include "content/public/child/v8_value_converter.h" 29 #include "content/public/child/v8_value_converter.h"
30 #include "content/public/renderer/media_stream_api.h" 30 #include "content/public/renderer/media_stream_utils.h"
31 #include "extensions/renderer/script_context.h" 31 #include "extensions/renderer/script_context.h"
32 #include "media/audio/audio_parameters.h" 32 #include "media/audio/audio_parameters.h"
33 #include "net/base/host_port_pair.h" 33 #include "net/base/host_port_pair.h"
34 #include "third_party/WebKit/public/platform/WebMediaStream.h" 34 #include "third_party/WebKit/public/platform/WebMediaStream.h"
35 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 35 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
36 #include "third_party/WebKit/public/platform/WebURL.h" 36 #include "third_party/WebKit/public/platform/WebURL.h"
37 #include "third_party/WebKit/public/web/WebDOMMediaStreamTrack.h" 37 #include "third_party/WebKit/public/web/WebDOMMediaStreamTrack.h"
38 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" 38 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
39 #include "url/gurl.h" 39 #include "url/gurl.h"
40 40
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 LOG(ERROR) << "Failed to add Cast audio track to media stream."; 876 LOG(ERROR) << "Failed to add Cast audio track to media stream.";
877 } 877 }
878 if (!content::AddVideoTrackToMediaStream(std::move(video), true, // is_remote 878 if (!content::AddVideoTrackToMediaStream(std::move(video), true, // is_remote
879 true, // is_readonly 879 true, // is_readonly
880 &web_stream)) { 880 &web_stream)) {
881 LOG(ERROR) << "Failed to add Cast video track to media stream."; 881 LOG(ERROR) << "Failed to add Cast video track to media stream.";
882 } 882 }
883 } 883 }
884 884
885 } // namespace extensions 885 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698