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/ffmpeg/ffmpeg_common.h

Issue 2768713002: Pass a |media_log| to FFmpegVideoDecoder and roll ffmpeg (Closed)
Patch Set: Rebase DEPS. Created 3 years, 9 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
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> 8 #include <stdint.h>
9 #include <string>
9 10
10 // Used for FFmpeg error codes. 11 // Used for FFmpeg error codes.
11 #include <cerrno> 12 #include <cerrno>
12 13
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/time/time.h" 15 #include "base/time/time.h"
15 #include "media/base/audio_codecs.h" 16 #include "media/base/audio_codecs.h"
16 #include "media/base/channel_layout.h" 17 #include "media/base/channel_layout.h"
17 #include "media/base/media_export.h" 18 #include "media/base/media_export.h"
18 #include "media/base/sample_format.h" 19 #include "media/base/sample_format.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // Converts FFmpeg's pixel formats to its corresponding supported video format. 144 // Converts FFmpeg's pixel formats to its corresponding supported video format.
144 MEDIA_EXPORT VideoPixelFormat 145 MEDIA_EXPORT VideoPixelFormat
145 AVPixelFormatToVideoPixelFormat(AVPixelFormat pixel_format); 146 AVPixelFormatToVideoPixelFormat(AVPixelFormat pixel_format);
146 147
147 // Converts video formats to its corresponding FFmpeg's pixel formats. 148 // Converts video formats to its corresponding FFmpeg's pixel formats.
148 AVPixelFormat VideoPixelFormatToAVPixelFormat(VideoPixelFormat video_format); 149 AVPixelFormat VideoPixelFormatToAVPixelFormat(VideoPixelFormat video_format);
149 150
150 ColorSpace AVColorSpaceToColorSpace(AVColorSpace color_space, 151 ColorSpace AVColorSpaceToColorSpace(AVColorSpace color_space,
151 AVColorRange color_range); 152 AVColorRange color_range);
152 153
154 // Converts an AVERROR error number to a description.
155 std::string AVErrorToString(int errnum);
156
153 // Returns a 32-bit hash for the given codec name. See the VerifyUmaCodecHashes 157 // Returns a 32-bit hash for the given codec name. See the VerifyUmaCodecHashes
154 // unit test for more information and code for generating the histogram XML. 158 // unit test for more information and code for generating the histogram XML.
155 MEDIA_EXPORT int32_t HashCodecName(const char* codec_name); 159 MEDIA_EXPORT int32_t HashCodecName(const char* codec_name);
156 160
157 } // namespace media 161 } // namespace media
158 162
159 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 163 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698