| 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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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 <libavformat/url.h> | 27 #include <libavformat/url.h> |
| 28 #include <libavutil/avutil.h> | 28 #include <libavutil/avutil.h> |
| 29 #include <libavutil/mathematics.h> | 29 #include <libavutil/mathematics.h> |
| 30 #include <libavutil/log.h> | 30 #include <libavutil/log.h> |
| 31 #include <libavutil/imgutils.h> |
| 31 MSVC_POP_WARNING(); | 32 MSVC_POP_WARNING(); |
| 32 } // extern "C" | 33 } // extern "C" |
| 33 | 34 |
| 34 namespace media { | 35 namespace media { |
| 35 | 36 |
| 36 class AudioDecoderConfig; | 37 class AudioDecoderConfig; |
| 37 class VideoDecoderConfig; | 38 class VideoDecoderConfig; |
| 38 | 39 |
| 39 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument | 40 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument |
| 40 // to scoped_ptr_malloc. | 41 // to scoped_ptr_malloc. |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 // |config|. | 108 // |config|. |
| 108 base::TimeDelta GetFrameDuration(const VideoDecoderConfig& config); | 109 base::TimeDelta GetFrameDuration(const VideoDecoderConfig& config); |
| 109 | 110 |
| 110 // Closes & destroys all AVStreams in the context and then closes & | 111 // Closes & destroys all AVStreams in the context and then closes & |
| 111 // destroys the AVFormatContext. | 112 // destroys the AVFormatContext. |
| 112 void DestroyAVFormatContext(AVFormatContext* format_context); | 113 void DestroyAVFormatContext(AVFormatContext* format_context); |
| 113 | 114 |
| 114 } // namespace media | 115 } // namespace media |
| 115 | 116 |
| 116 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ | 117 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ |
| OLD | NEW |