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: media/base/media.h

Issue 1690063002: Fix mime type mappings when the unified media pipeline is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include MSE fixes. Created 4 years, 10 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 // Contains code that should be used for initializing, or querying the state 5 // Contains code that should be used for initializing, or querying the state
6 // of the media library as a whole. 6 // of the media library as a whole.
7 7
8 #ifndef MEDIA_BASE_MEDIA_H_ 8 #ifndef MEDIA_BASE_MEDIA_H_
9 #define MEDIA_BASE_MEDIA_H_ 9 #define MEDIA_BASE_MEDIA_H_
10 10
11 #include "build/build_config.h"
11 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
12 13
13 namespace base { 14 namespace base {
14 class FilePath; 15 class FilePath;
15 } 16 }
16 17
17 namespace media { 18 namespace media {
18 19
19 // Initializes media libraries (e.g. ffmpeg) as well as CPU specific media 20 // Initializes media libraries (e.g. ffmpeg) as well as CPU specific media
20 // features. 21 // features.
21 MEDIA_EXPORT void InitializeMediaLibrary(); 22 MEDIA_EXPORT void InitializeMediaLibrary();
22 23
24 #if defined(OS_ANDROID)
25 MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabled();
26 #endif
27
23 } // namespace media 28 } // namespace media
24 29
25 #endif // MEDIA_BASE_MEDIA_H_ 30 #endif // MEDIA_BASE_MEDIA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698