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

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

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 // 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 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 14 matching lines...) Expand all
25 #include "chrome/common/extensions/api/cast_streaming_receiver_session.h" 25 #include "chrome/common/extensions/api/cast_streaming_receiver_session.h"
26 #include "chrome/common/extensions/api/cast_streaming_rtp_stream.h" 26 #include "chrome/common/extensions/api/cast_streaming_rtp_stream.h"
27 #include "chrome/common/extensions/api/cast_streaming_udp_transport.h" 27 #include "chrome/common/extensions/api/cast_streaming_udp_transport.h"
28 #include "chrome/renderer/media/cast_receiver_session.h" 28 #include "chrome/renderer/media/cast_receiver_session.h"
29 #include "chrome/renderer/media/cast_rtp_stream.h" 29 #include "chrome/renderer/media/cast_rtp_stream.h"
30 #include "chrome/renderer/media/cast_session.h" 30 #include "chrome/renderer/media/cast_session.h"
31 #include "chrome/renderer/media/cast_udp_transport.h" 31 #include "chrome/renderer/media/cast_udp_transport.h"
32 #include "content/public/child/v8_value_converter.h" 32 #include "content/public/child/v8_value_converter.h"
33 #include "content/public/renderer/media_stream_utils.h" 33 #include "content/public/renderer/media_stream_utils.h"
34 #include "extensions/renderer/script_context.h" 34 #include "extensions/renderer/script_context.h"
35 #include "media/audio/audio_parameters.h" 35 #include "media/base/audio_parameters.h"
36 #include "net/base/host_port_pair.h" 36 #include "net/base/host_port_pair.h"
37 #include "net/base/ip_address.h" 37 #include "net/base/ip_address.h"
38 #include "third_party/WebKit/public/platform/WebMediaStream.h" 38 #include "third_party/WebKit/public/platform/WebMediaStream.h"
39 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 39 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
40 #include "third_party/WebKit/public/platform/WebURL.h" 40 #include "third_party/WebKit/public/platform/WebURL.h"
41 #include "third_party/WebKit/public/web/WebDOMMediaStreamTrack.h" 41 #include "third_party/WebKit/public/web/WebDOMMediaStreamTrack.h"
42 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" 42 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
43 #include "url/gurl.h" 43 #include "url/gurl.h"
44 44
45 using content::V8ValueConverter; 45 using content::V8ValueConverter;
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 LOG(ERROR) << "Failed to add Cast audio track to media stream."; 879 LOG(ERROR) << "Failed to add Cast audio track to media stream.";
880 } 880 }
881 if (!content::AddVideoTrackToMediaStream(std::move(video), true, // is_remote 881 if (!content::AddVideoTrackToMediaStream(std::move(video), true, // is_remote
882 true, // is_readonly 882 true, // is_readonly
883 &web_stream)) { 883 &web_stream)) {
884 LOG(ERROR) << "Failed to add Cast video track to media stream."; 884 LOG(ERROR) << "Failed to add Cast video track to media stream.";
885 } 885 }
886 } 886 }
887 887
888 } // namespace extensions 888 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_audio.cc ('k') | chrome/renderer/media/cast_receiver_audio_valve.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698