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

Side by Side Diff: content/browser/media/media_internals.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/media/media_internals.h" 5 #include "content/browser/media/media_internals.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
18 #include "content/public/browser/notification_types.h" 18 #include "content/public/browser/notification_types.h"
19 #include "content/public/browser/render_frame_host.h" 19 #include "content/public/browser/render_frame_host.h"
20 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "content/public/browser/web_ui.h" 22 #include "content/public/browser/web_ui.h"
23 #include "media/audio/audio_parameters.h" 23 #include "media/base/audio_parameters.h"
24 #include "media/base/media_log_event.h" 24 #include "media/base/media_log_event.h"
25 #include "media/filters/gpu_video_decoder.h" 25 #include "media/filters/gpu_video_decoder.h"
26 26
27 #if !defined(OS_ANDROID) 27 #if !defined(OS_ANDROID)
28 #include "media/filters/decrypting_video_decoder.h" 28 #include "media/filters/decrypting_video_decoder.h"
29 #endif 29 #endif
30 30
31 namespace { 31 namespace {
32 32
33 static base::LazyInstance<content::MediaInternals>::Leaky g_media_internals = 33 static base::LazyInstance<content::MediaInternals>::Leaky g_media_internals =
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict)); 692 audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict));
693 existing_dict->MergeDictionary(value); 693 existing_dict->MergeDictionary(value);
694 } 694 }
695 } 695 }
696 696
697 if (CanUpdate()) 697 if (CanUpdate())
698 SendUpdate(SerializeUpdate(function, value)); 698 SendUpdate(SerializeUpdate(function, value));
699 } 699 }
700 700
701 } // namespace content 701 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/capture/audio_mirroring_manager_unittest.cc ('k') | content/browser/media/media_internals_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698