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

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

Issue 18052007: Use a direct include of time headers in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « media/base/video_renderer.h ('k') | media/filters/audio_file_reader.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 // Used for FFmpeg error codes. 8 // Used for FFmpeg error codes.
9 #include <cerrno> 9 #include <cerrno>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/time.h" 12 #include "base/time/time.h"
13 #include "media/base/audio_decoder_config.h" 13 #include "media/base/audio_decoder_config.h"
14 #include "media/base/channel_layout.h" 14 #include "media/base/channel_layout.h"
15 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
16 #include "media/base/video_decoder_config.h"
16 #include "media/base/video_frame.h" 17 #include "media/base/video_frame.h"
17 #include "media/base/video_decoder_config.h"
18 18
19 // Include FFmpeg header files. 19 // Include FFmpeg header files.
20 extern "C" { 20 extern "C" {
21 // Temporarily disable possible loss of data warning. 21 // Temporarily disable possible loss of data warning.
22 // TODO(scherkus): fix and upstream the compiler warnings. 22 // TODO(scherkus): fix and upstream the compiler warnings.
23 MSVC_PUSH_DISABLE_WARNING(4244); 23 MSVC_PUSH_DISABLE_WARNING(4244);
24 #include <libavcodec/avcodec.h> 24 #include <libavcodec/avcodec.h>
25 #include <libavformat/avformat.h> 25 #include <libavformat/avformat.h>
26 #include <libavformat/avio.h> 26 #include <libavformat/avio.h>
27 #include <libavutil/audioconvert.h> 27 #include <libavutil/audioconvert.h>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 // Converts FFmpeg's pixel formats to its corresponding supported video format. 97 // Converts FFmpeg's pixel formats to its corresponding supported video format.
98 VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format); 98 VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format);
99 99
100 // Converts video formats to its corresponding FFmpeg's pixel formats. 100 // Converts video formats to its corresponding FFmpeg's pixel formats.
101 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format); 101 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format);
102 102
103 } // namespace media 103 } // namespace media
104 104
105 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 105 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW
« no previous file with comments | « media/base/video_renderer.h ('k') | media/filters/audio_file_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698