summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/resources/video_resource_updater.cc4
-rw-r--r--content/common/gpu/media/gpu_video_encode_accelerator.cc2
-rw-r--r--media/base/video_decoder_config.cc2
-rw-r--r--media/base/video_frame.cc10
-rw-r--r--media/base/video_frame.h2
-rw-r--r--media/ffmpeg/ffmpeg_common.cc2
-rw-r--r--media/filters/ffmpeg_video_decoder.cc2
-rw-r--r--media/filters/ffmpeg_video_decoder_unittest.cc2
-rw-r--r--media/filters/pipeline_integration_test_base.cc2
9 files changed, 14 insertions, 14 deletions
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index b819b38..ebd23b1 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -76,7 +76,7 @@ bool VideoResourceUpdater::VerifyFrame(
return true;
// Unacceptable inputs. ¯\(°_o)/¯
- case media::VideoFrame::INVALID:
+ case media::VideoFrame::UNKNOWN:
case media::VideoFrame::RGB32:
case media::VideoFrame::EMPTY:
case media::VideoFrame::I420:
@@ -104,7 +104,7 @@ static gfx::Size SoftwarePlaneDimension(
case media::VideoFrame::YV16:
return gfx::ToFlooredSize(gfx::ScaleSize(coded_size, 0.5f, 1.f));
- case media::VideoFrame::INVALID:
+ case media::VideoFrame::UNKNOWN:
case media::VideoFrame::RGB32:
case media::VideoFrame::EMPTY:
case media::VideoFrame::I420:
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc
index 4beacb0..1739beb 100644
--- a/content/common/gpu/media/gpu_video_encode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc
@@ -26,7 +26,7 @@ GpuVideoEncodeAccelerator::GpuVideoEncodeAccelerator(GpuChannel* gpu_channel,
: weak_this_factory_(this),
channel_(gpu_channel),
route_id_(route_id),
- input_format_(media::VideoFrame::INVALID),
+ input_format_(media::VideoFrame::UNKNOWN),
output_buffer_size_(0) {}
GpuVideoEncodeAccelerator::~GpuVideoEncodeAccelerator() {
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
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 72b3125..d1f0950 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -500,7 +500,7 @@ VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format) {
default:
DVLOG(1) << "Unsupported PixelFormat: " << pixel_format;
}
- return VideoFrame::INVALID;
+ return VideoFrame::UNKNOWN;
}
PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) {
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 5dfb344..78b9b28 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -69,7 +69,7 @@ int FFmpegVideoDecoder::GetVideoBuffer(AVCodecContext* codec_context,
// updated width/height/pix_fmt, which can change for adaptive
// content.
VideoFrame::Format format = PixelFormatToVideoFormat(codec_context->pix_fmt);
- if (format == VideoFrame::INVALID)
+ if (format == VideoFrame::UNKNOWN)
return AVERROR(EINVAL);
DCHECK(format == VideoFrame::YV12 || format == VideoFrame::YV16);
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 23ee196..13bec96 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -253,7 +253,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedDecoder) {
TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedPixelFormat) {
// Ensure decoder handles unsupported pixel formats without crashing.
VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
- VideoFrame::INVALID,
+ VideoFrame::UNKNOWN,
kCodedSize, kVisibleRect, kNaturalSize,
NULL, 0, false);
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 3591849..6e03647 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -31,7 +31,7 @@ PipelineIntegrationTestBase::PipelineIntegrationTestBase()
new MediaLog())),
ended_(false),
pipeline_status_(PIPELINE_OK),
- last_video_frame_format_(VideoFrame::INVALID) {
+ last_video_frame_format_(VideoFrame::UNKNOWN) {
base::MD5Init(&md5_context_);
EXPECT_CALL(*this, OnSetOpaque(true)).Times(AnyNumber());
}
generated by cgit v1.1 at 2025-10-13 13:05:53 +0000