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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/renderer_host/media/media_stream_manager.h" 5 #include "content/browser/renderer_host/media/media_stream_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h> 9 #include <string.h>
10 #include <cctype> 10 #include <cctype>
(...skipping 30 matching lines...) Expand all
41 #include "content/public/browser/desktop_media_id.h" 41 #include "content/public/browser/desktop_media_id.h"
42 #include "content/public/browser/media_observer.h" 42 #include "content/public/browser/media_observer.h"
43 #include "content/public/browser/media_request_state.h" 43 #include "content/public/browser/media_request_state.h"
44 #include "content/public/browser/render_process_host.h" 44 #include "content/public/browser/render_process_host.h"
45 #include "content/public/browser/web_contents_media_capture_id.h" 45 #include "content/public/browser/web_contents_media_capture_id.h"
46 #include "content/public/common/content_client.h" 46 #include "content/public/common/content_client.h"
47 #include "content/public/common/content_switches.h" 47 #include "content/public/common/content_switches.h"
48 #include "content/public/common/media_stream_request.h" 48 #include "content/public/common/media_stream_request.h"
49 #include "crypto/hmac.h" 49 #include "crypto/hmac.h"
50 #include "media/audio/audio_manager_base.h" 50 #include "media/audio/audio_manager_base.h"
51 #include "media/audio/audio_parameters.h" 51 #include "media/base/audio_parameters.h"
52 #include "media/base/channel_layout.h" 52 #include "media/base/channel_layout.h"
53 #include "media/base/media_switches.h" 53 #include "media/base/media_switches.h"
54 #include "media/capture/video/video_capture_device_factory.h" 54 #include "media/capture/video/video_capture_device_factory.h"
55 #include "url/gurl.h" 55 #include "url/gurl.h"
56 56
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 #include "base/win/scoped_com_initializer.h" 58 #include "base/win/scoped_com_initializer.h"
59 #endif 59 #endif
60 60
61 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
(...skipping 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 const std::string& device_guid, 2112 const std::string& device_guid,
2113 const std::string& raw_unique_id) { 2113 const std::string& raw_unique_id) {
2114 DCHECK(security_origin.is_valid()); 2114 DCHECK(security_origin.is_valid());
2115 DCHECK(!raw_unique_id.empty()); 2115 DCHECK(!raw_unique_id.empty());
2116 std::string guid_from_raw_device_id = 2116 std::string guid_from_raw_device_id =
2117 GetHMACForMediaDeviceID(sc, security_origin, raw_unique_id); 2117 GetHMACForMediaDeviceID(sc, security_origin, raw_unique_id);
2118 return guid_from_raw_device_id == device_guid; 2118 return guid_from_raw_device_id == device_guid;
2119 } 2119 }
2120 2120
2121 } // namespace content 2121 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_sync_reader.cc ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698