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

Side by Side Diff: media/ffmpeg/ffmpeg_common.h

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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
« no previous file with comments | « media/cdm/stub/stub_cdm.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_ 5 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
6 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_ 6 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
7 7
8 #include <stdint.h>
9
8 // Used for FFmpeg error codes. 10 // Used for FFmpeg error codes.
9 #include <cerrno> 11 #include <cerrno>
10 12
11 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
12 #include "base/time/time.h" 14 #include "base/time/time.h"
13 #include "media/base/audio_decoder_config.h" 15 #include "media/base/audio_decoder_config.h"
14 #include "media/base/channel_layout.h" 16 #include "media/base/channel_layout.h"
15 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
16 #include "media/base/video_codecs.h" 18 #include "media/base/video_codecs.h"
17 #include "media/base/video_frame.h" 19 #include "media/base/video_frame.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // date string. Otherwise returns fals and timeline_offset is unmodified. 142 // date string. Otherwise returns fals and timeline_offset is unmodified.
141 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out); 143 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out);
142 144
143 // Returns a 32-bit hash for the given codec name. See the VerifyUmaCodecHashes 145 // Returns a 32-bit hash for the given codec name. See the VerifyUmaCodecHashes
144 // unit test for more information and code for generating the histogram XML. 146 // unit test for more information and code for generating the histogram XML.
145 MEDIA_EXPORT int32_t HashCodecName(const char* codec_name); 147 MEDIA_EXPORT int32_t HashCodecName(const char* codec_name);
146 148
147 } // namespace media 149 } // namespace media
148 150
149 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 151 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW
« no previous file with comments | « media/cdm/stub/stub_cdm.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698