| OLD | NEW |
| 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.h" |
| 13 #include "media/base/channel_layout.h" | 13 #include "media/base/channel_layout.h" |
| 14 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 15 #include "media/base/video_frame.h" | 15 #include "media/base/video_frame.h" |
| 16 | 16 |
| 17 // Include FFmpeg header files. | 17 // Include FFmpeg header files. |
| 18 extern "C" { | 18 extern "C" { |
| 19 // Temporarily disable possible loss of data warning. | 19 // Temporarily disable possible loss of data warning. |
| 20 // TODO(scherkus): fix and upstream the compiler warnings. | 20 // TODO(scherkus): fix and upstream the compiler warnings. |
| 21 MSVC_PUSH_DISABLE_WARNING(4244); | 21 MSVC_PUSH_DISABLE_WARNING(4244); |
| 22 #include <libavcodec/avcodec.h> | 22 #include <libavcodec/avcodec.h> |
| 23 #include <libavformat/avformat.h> | 23 #include <libavformat/avformat.h> |
| 24 #include <libavformat/avio.h> | 24 #include <libavformat/avio.h> |
| 25 #include <libavformat/url.h> |
| 25 #include <libavutil/avutil.h> | 26 #include <libavutil/avutil.h> |
| 26 #include <libavutil/mathematics.h> | 27 #include <libavutil/mathematics.h> |
| 27 #include <libavutil/log.h> | 28 #include <libavutil/log.h> |
| 28 MSVC_POP_WARNING(); | 29 MSVC_POP_WARNING(); |
| 29 } // extern "C" | 30 } // extern "C" |
| 30 | 31 |
| 31 namespace media { | 32 namespace media { |
| 32 | 33 |
| 33 class AudioDecoderConfig; | 34 class AudioDecoderConfig; |
| 34 class VideoDecoderConfig; | 35 class VideoDecoderConfig; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // |config|. | 99 // |config|. |
| 99 base::TimeDelta GetFrameDuration(const VideoDecoderConfig& config); | 100 base::TimeDelta GetFrameDuration(const VideoDecoderConfig& config); |
| 100 | 101 |
| 101 // Closes & destroys all AVStreams in the context and then closes & | 102 // Closes & destroys all AVStreams in the context and then closes & |
| 102 // destroys the AVFormatContext. | 103 // destroys the AVFormatContext. |
| 103 void DestroyAVFormatContext(AVFormatContext* format_context); | 104 void DestroyAVFormatContext(AVFormatContext* format_context); |
| 104 | 105 |
| 105 } // namespace media | 106 } // namespace media |
| 106 | 107 |
| 107 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ | 108 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ |
| OLD | NEW |