Chromium Code Reviews| Index: media/ffmpeg/ffmpeg_common.cc |
| diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc |
| index 72323c7e3e68dface57fae46de5806dae3974eb5..1a7da3eac4fdf4b4238b1c0681522e305b4b0ef8 100644 |
| --- a/media/ffmpeg/ffmpeg_common.cc |
| +++ b/media/ffmpeg/ffmpeg_common.cc |
| @@ -215,6 +215,19 @@ ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout, |
| } |
| } |
| +VideoFrame::Format PixFmtToVideoFormat(PixelFormat pix_fmt) { |
| + switch (pix_fmt) { |
| + case PIX_FMT_YUV422P: |
| + return VideoFrame::YV16; |
| + case PIX_FMT_YUV420P: |
| + return VideoFrame::YV12; |
| + default: |
| + // TODO(shadi): Should YV12 be the default? |
|
scherkus (not reviewing)
2011/09/28 17:32:17
nope I'd rather return INVALID
shadi1
2011/09/29 18:31:03
Done.
|
| + NOTREACHED(); |
|
scherkus (not reviewing)
2011/09/28 17:32:17
could you add an error message to this:
NOTREACHE
shadi1
2011/09/29 18:31:03
Done.
|
| + } |
| + return VideoFrame::INVALID; |
| +} |
| + |
| base::TimeDelta GetFrameDuration(AVStream* stream) { |
| AVRational time_base = { stream->r_frame_rate.den, stream->r_frame_rate.num }; |
| return ConvertFromTimeBase(time_base, 1); |