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

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

Issue 1228843003: Revert of Change the video color space default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « media/base/video_frame.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 // Used for FFmpeg error codes. 8 // Used for FFmpeg error codes.
9 #include <cerrno> 9 #include <cerrno>
10 10
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // Converts FFmpeg's channel layout to chrome's ChannelLayout. |channels| can 110 // Converts FFmpeg's channel layout to chrome's ChannelLayout. |channels| can
111 // be used when FFmpeg's channel layout is not informative in order to make a 111 // be used when FFmpeg's channel layout is not informative in order to make a
112 // good guess about the plausible channel layout based on number of channels. 112 // good guess about the plausible channel layout based on number of channels.
113 MEDIA_EXPORT ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout, 113 MEDIA_EXPORT ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout,
114 int channels); 114 int channels);
115 115
116 // Converts FFmpeg's audio sample format to Chrome's SampleFormat. 116 // Converts FFmpeg's audio sample format to Chrome's SampleFormat.
117 MEDIA_EXPORT SampleFormat 117 MEDIA_EXPORT SampleFormat
118 AVSampleFormatToSampleFormat(AVSampleFormat sample_format); 118 AVSampleFormatToSampleFormat(AVSampleFormat sample_format);
119 119
120 // Converts FFmpeg's pixel format to its corresponding supported video format. 120 // Converts FFmpeg's pixel formats to its corresponding supported video format.
121 MEDIA_EXPORT VideoFrame::Format PixelFormatToVideoFormat( 121 MEDIA_EXPORT VideoFrame::Format PixelFormatToVideoFormat(
122 PixelFormat pixel_format); 122 PixelFormat pixel_format);
123 123
124 // Converts video formats to its corresponding FFmpeg pixel formats. 124 // Converts video formats to its corresponding FFmpeg's pixel formats.
125 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format); 125 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format);
126 126
127 VideoFrame::ColorSpace AVColorSpaceToVideoFrameColorSpace(
128 AVColorSpace color_space);
129
130 // Convert FFmpeg UTC representation (YYYY-MM-DD HH:MM:SS) to base::Time. 127 // Convert FFmpeg UTC representation (YYYY-MM-DD HH:MM:SS) to base::Time.
131 // Returns true and sets |*out| if |date_utc| contains a valid 128 // Returns true and sets |*out| if |date_utc| contains a valid
132 // date string. Otherwise returns fals and timeline_offset is unmodified. 129 // date string. Otherwise returns fals and timeline_offset is unmodified.
133 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out); 130 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out);
134 131
135 } // namespace media 132 } // namespace media
136 133
137 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 134 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW
« no previous file with comments | « media/base/video_frame.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698