diff options
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/video_decoder_config.cc | 2 | ||||
| -rw-r--r-- | media/base/video_frame.cc | 10 | ||||
| -rw-r--r-- | media/base/video_frame.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc index da914f2..015ae09 100644 --- a/media/base/video_decoder_config.cc +++ b/media/base/video_decoder_config.cc @@ -12,7 +12,7 @@ namespace media { VideoDecoderConfig::VideoDecoderConfig() : codec_(kUnknownVideoCodec), profile_(VIDEO_CODEC_PROFILE_UNKNOWN), - format_(VideoFrame::INVALID), + format_(VideoFrame::UNKNOWN), is_encrypted_(false) { } diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index a372889..9c07251 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -46,8 +46,8 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrame( // static std::string VideoFrame::FormatToString(VideoFrame::Format format) { switch (format) { - case VideoFrame::INVALID: - return "INVALID"; + case VideoFrame::UNKNOWN: + return "UNKNOWN"; case VideoFrame::RGB32: return "RGB32"; case VideoFrame::YV12: @@ -76,7 +76,7 @@ bool VideoFrame::IsValidConfig(VideoFrame::Format format, const gfx::Size& coded_size, const gfx::Rect& visible_rect, const gfx::Size& natural_size) { - return (format != VideoFrame::INVALID && + return (format != VideoFrame::UNKNOWN && !coded_size.IsEmpty() && coded_size.GetArea() <= limits::kMaxCanvas && coded_size.width() <= limits::kMaxDimension && @@ -240,7 +240,7 @@ size_t VideoFrame::NumPlanes(Format format) { case VideoFrame::YV12A: return 4; case VideoFrame::EMPTY: - case VideoFrame::INVALID: + case VideoFrame::UNKNOWN: break; } NOTREACHED() << "Unsupported video frame format: " << format; @@ -274,7 +274,7 @@ size_t VideoFrame::AllocationSize(Format format, const gfx::Size& coded_size) { RoundUp(coded_size.width(), 2) * RoundUp(coded_size.height(), 2); return rounded_size * 2; } - case VideoFrame::INVALID: + case VideoFrame::UNKNOWN: case VideoFrame::EMPTY: case VideoFrame::NATIVE_TEXTURE: #if defined(GOOGLE_TV) diff --git a/media/base/video_frame.h b/media/base/video_frame.h index df383d0..fa8aa96 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -40,7 +40,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> { // http://www.fourcc.org/rgb.php // http://www.fourcc.org/yuv.php enum Format { - INVALID = 0, // Invalid format value. Used for error reporting. + UNKNOWN = 0, // Unknown format value. RGB32 = 4, // 32bpp RGB packed with extra byte 8:8:8 YV12 = 6, // 12bpp YVU planar 1x1 Y, 2x2 VU samples YV16 = 7, // 16bpp YVU planar 1x1 Y, 2x1 VU samples |