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

Side by Side Diff: media/base/container_names.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef MEDIA_BASE_CONTAINER_NAMES_H_ 5 #ifndef MEDIA_BASE_CONTAINER_NAMES_H_
6 #define MEDIA_BASE_CONTAINER_NAMES_H_ 6 #define MEDIA_BASE_CONTAINER_NAMES_H_
7 7
8 #include "base/basictypes.h" 8 #include <stdint.h>
9
9 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
10 11
11 namespace media { 12 namespace media {
12 13
13 namespace container_names { 14 namespace container_names {
14 15
15 // This is the set of input container formats detected for logging purposes. Not 16 // This is the set of input container formats detected for logging purposes. Not
16 // all of these are enabled (and it varies by product). Any additions need to be 17 // all of these are enabled (and it varies by product). Any additions need to be
17 // done at the end of the list (before CONTAINER_MAX). This list must be kept in 18 // done at the end of the list (before CONTAINER_MAX). This list must be kept in
18 // sync with the enum definition "MediaContainers" in 19 // sync with the enum definition "MediaContainers" in
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 CONTAINER_VC1, // VC-1 56 CONTAINER_VC1, // VC-1
56 CONTAINER_WAV, // WAV / WAVE (Waveform Audio) 57 CONTAINER_WAV, // WAV / WAVE (Waveform Audio)
57 CONTAINER_WEBM, // Matroska / WebM 58 CONTAINER_WEBM, // Matroska / WebM
58 CONTAINER_WTV, // WTV (Windows Television) 59 CONTAINER_WTV, // WTV (Windows Television)
59 CONTAINER_DASH, // DASH (MPEG-DASH) 60 CONTAINER_DASH, // DASH (MPEG-DASH)
60 CONTAINER_SMOOTHSTREAM, // SmoothStreaming 61 CONTAINER_SMOOTHSTREAM, // SmoothStreaming
61 CONTAINER_MAX // Must be last 62 CONTAINER_MAX // Must be last
62 }; 63 };
63 64
64 // Determine the container type. 65 // Determine the container type.
65 MEDIA_EXPORT MediaContainerName DetermineContainer(const uint8* buffer, 66 MEDIA_EXPORT MediaContainerName DetermineContainer(const uint8_t* buffer,
66 int buffer_size); 67 int buffer_size);
67 68
68 } // namespace container_names 69 } // namespace container_names
69 70
70 } // namespace media 71 } // namespace media
71 72
72 #endif // MEDIA_BASE_CONTAINER_NAMES_H_ 73 #endif // MEDIA_BASE_CONTAINER_NAMES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698