Chrome Archives

Date	Commit	Notes	Patch	linux arm64
2026-05-01-23-08-27	`a7952cfa`	vaapi improvements	long patch can't be rendered! sorry!	Download
2026-04-30-22-47-41	`a7952cfa`	More detailed logging - suss out the errors	diff --git a/media/base/media_serializers.h b/media/base/media_serializers.h index edfd803a4f759..82466b68e4f28 100644 --- a/media/base/media_serializers.h +++ b/media/base/media_serializers.h @@ -445,8 +445,11 @@ struct MediaSerializerDebug> { static base::Value Serialize(const TypedStatus& status) { // TODO: replace this with some kind of static "description" // of the default type, instead of "Ok". - if (status.is_ok()) - return base::Value("Ok"); + if constexpr (requires(TypedStatus& t) { t.is_ok(); }) { + if (status.is_ok()) { + return base::Value("Ok"); + } + } return MediaSerialize(status.data_); } }; diff --git a/media/base/status.h b/media/base/status.h index 7a31c8d3eb3a0..9a2dbb727da94 100644 --- a/media/base/status.h +++ b/media/base/status.h @@ -119,6 +119,16 @@ struct StatusTraitsHelper { } } + static constexpr bool HasOkEnumValue() { + if constexpr (requires { &T::OkEnumValue; }) { + return true; + } else if constexpr (requires { T::Codes::kOk; }) { + return true; + } else { + return false; + } + } + static std::string RenderGroupAndCode(T::Codes code) { if constexpr (requires { &T::ReadableCodeName; }) { return base::StrCat({T::Group(), "::", T::ReadableCodeName(code)}); @@ -229,6 +239,16 @@ class MEDIA_EXPORT TypedStatus { AddCause(std::move(cause)); } + template + TypedStatus(Codes code, + std::string message, + std::string data_name, + const D& data, + const base::Location& location = FROM_HERE) + : TypedStatus(code, std::move(message), location) { + data_->data.GetDict().Set(std::move(data_name), MediaSerialize(data)); + } + // Constructor to create a new TypedStatus from a numeric code & message. // These are immutable; if you'd like to change them, then you likely should // create a new TypedStatus. @@ -260,7 +280,11 @@ class MEDIA_EXPORT TypedStatus { return this; } - bool is_ok() const { return !data_; } + bool is_ok() const + requires(internal::StatusTraitsHelper::HasOkEnumValue()) + { + return !data_; + } Codes code() const { if (!data_) @@ -359,11 +383,17 @@ class MEDIA_EXPORT TypedStatus { // Create an Or type implicitly from a TypedStatus Or(TypedStatus&& error) : error_(std::move(error)) { // `error_` must not be ok. - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } } Or(const TypedStatus& error) : error_(error) { - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } } // Create an Or type implicitly from the alternate O. @@ -373,7 +403,22 @@ class MEDIA_EXPORT TypedStatus { // Create an Or type explicitly from a code Or(typename T::Codes code, const base::Location& location = FROM_HERE) : error_(TypedStatus(code, "", location)) { - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } + } + + // Create an Or type explicitly from a code and a cause + template + Or(typename T::Codes code, + TypedStatus&& cause, + const ::base::Location& location = FROM_HERE) + : error_(TypedStatus(code, std::move(cause), location)) { + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + CHECK(!error_->is_ok()); + } } // Create an Or type implicitly from any brace-initializer list that could @@ -384,7 +429,10 @@ class MEDIA_EXPORT TypedStatus { const Rest&... rest, const base::Location& location = FROM_HERE) : error_(TypedStatus(code, first, rest..., location)) { - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } } // Move- and copy- construction and assignment are okay. diff --git a/media/base/status_unittest.cc b/media/base/status_unittest.cc index e582031c8f4d3..5579f028a72b7 100644 --- a/media/base/status_unittest.cc +++ b/media/base/status_unittest.cc @@ -458,11 +458,9 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultAndNoOk) { NDStatus foo = NDStatus::Codes::kFoo; EXPECT_EQ(foo.code(), NDStatus::Codes::kFoo); - EXPECT_FALSE(foo.is_ok()); NDStatus bar = NDStatus::Codes::kBar; EXPECT_EQ(bar.code(), NDStatus::Codes::kBar); - EXPECT_FALSE(bar.is_ok()); NDStatus::Or err = NDStatus::Codes::kBaz; NDStatus::Or ok = std::string("kBaz"); @@ -507,10 +505,6 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultHasOk) { } TEST_F(StatusTest, Okayness) { - EXPECT_FALSE( - TypedStatus(NoOkStatusTypeTraits::Codes::kFoo) - .is_ok()); - EXPECT_FALSE( TypedStatus(ZeroValueOkTypeTraits::Codes::kFoo) .is_ok()); diff --git a/media/gpu/vaapi/vaapi_image_decoder.cc b/media/gpu/vaapi/vaapi_image_decoder.cc index c87c4798f5e61..baa762db363ae 100644 --- a/media/gpu/vaapi/vaapi_image_decoder.cc +++ b/media/gpu/vaapi/vaapi_image_decoder.cc @@ -92,14 +92,16 @@ VaapiImageDecoder::ExportAsNativePixmapDmaBuf(VaapiImageDecodeStatus status) { } DCHECK(temp_scoped_va_surface->IsValid()); - std::unique_ptr exported_pixmap = + auto maybe_exported_pixmap = vaapi_wrapper_->ExportVASurfaceAsNativePixmapDmaBuf( temp_scoped_va_surface); - if (!exported_pixmap) { + + if (!maybe_exported_pixmap.has_value()) { status = VaapiImageDecodeStatus::kCannotExportSurface; return nullptr; } + auto exported_pixmap = std::move(maybe_exported_pixmap).value(); DCHECK_EQ(temp_scoped_va_surface->size(), exported_pixmap->pixmap->GetBufferSize()); status = VaapiImageDecodeStatus::kSuccess; diff --git a/media/gpu/vaapi/vaapi_status.h b/media/gpu/vaapi/vaapi_status.h index a2ab19517b23b..3b5ee3d5b72b8 100644 --- a/media/gpu/vaapi/vaapi_status.h +++ b/media/gpu/vaapi/vaapi_status.h @@ -10,7 +10,6 @@ namespace media { enum class VaapiStatusCode : StatusCodeType { - kOk = 0, kBadContext = 1, kNoBuffer = 2, kNoBufferHandle = 3, @@ -25,6 +24,7 @@ enum class VaapiStatusCode : StatusCodeType { kBadImageSize = 12, kNoTexture = 13, kUnsupportedProfile = 14, + kFailedToExportSurface = 15, }; struct VaapiStatusTraits { diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc index c39949f9c9448..88bdcd405089d 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.cc +++ b/media/gpu/vaapi/vaapi_video_decoder.cc @@ -147,6 +147,10 @@ VaapiVideoDecoder::~VaapiVideoDecoder() { // Abort all currently scheduled decode tasks. ClearDecodeTaskQueue(DecoderStatus::Codes::kAborted); + if (pending_init_cb_) { + std::move(pending_init_cb_).Run(DecoderStatus::Codes::kAborted); + } + weak_this_factory_.InvalidateWeakPtrs(); // Notify \|decoder_delegate_\| of an imminent VAContextID destruction, so it @@ -178,12 +182,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(config.IsValidConfig()); + pending_init_cb_ = std::move(init_cb); + // Reinitializing the decoder is allowed if there are no pending decodes. if (current_decode_task_ \|\| !decode_task_queue_.empty() \|\| state_ == State::kExpectingReset) { - LOG(ERROR) - << "Don't call Initialize() while there are pending decode tasks"; - std::move(init_cb).Run(DecoderStatus::Codes::kFailed); + SetState({DecoderStatus::Codes::kFailed, + "Failed to initialize with pending decode tasks in flight."}); return; } @@ -229,13 +234,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, if (config.is_encrypted()) { #if !BUILDFLAG(IS_CHROMEOS) - SetErrorState("encrypted content is not supported"); - std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode); + SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode, + "encrypted content is not supported"}); return; #else if (!cdm_context \|\| !cdm_context->GetChromeOsCdmContext()) { - SetErrorState("cannot support encrypted stream w/out ChromeOsCdmContext"); - std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode); + SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode, + "ChromeOsCdmContext required for encrypted streams"}); return; } bool encrypted_av1_support = false; @@ -246,10 +251,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, config.codec() != VideoCodec::kVP9 && (config.codec() != VideoCodec::kAV1 \|\| !encrypted_av1_support) && config.codec() != VideoCodec::kHEVC) { - SetErrorState( - base::StringPrintf("%s is not supported for encrypted content", - GetCodecName(config.codec()).c_str())); - std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode); + DecoderStatus error = {DecoderStatus::Codes::kUnsupportedEncryptionMode, + "Codec not supported for encrypted content"}; + SetState(std::move(error).WithData("codec", config.codec())); return; } cdm_event_cb_registration_ = cdm_context->RegisterEventCB( @@ -279,10 +283,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.VaapiWrapperCreationSuccess", vaapi_wrapper_or_error.has_value()); if (!vaapi_wrapper_or_error.has_value()) { - SetErrorState(base::StringPrintf( - "failed initializing VaapiWrapper for profile %s, ", - GetProfileName(profile).c_str())); - std::move(init_cb).Run(vaapi_wrapper_or_error.error()); + SetState(std::move(vaapi_wrapper_or_error) + .error() + .WithData("profile", profile)); return; } vaapi_wrapper_ = std::move(vaapi_wrapper_or_error.value()); @@ -296,10 +299,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, if (!IsConfiguredForTesting()) { auto accel_status = CreateAcceleratedVideoDecoder(); - if (!accel_status.is_ok()) { - SetErrorState("failed to create decoder delegate"); - std::move(init_cb).Run(DecoderStatus(DecoderStatus::Codes::kFailed) - .AddCause(std::move(accel_status))); + if (!accel_status.has_value()) { + SetState( + {DecoderStatus::Codes::kFailed, std::move(accel_status).error()}); return; } } @@ -311,7 +313,7 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, SetState(State::kWaitingForInput); // Notify client initialization was successful. - std::move(init_cb).Run(DecoderStatus::Codes::kOk); + std::move(pending_init_cb_).Run(DecoderStatus::Codes::kOk); } void VaapiVideoDecoder::OnCdmContextEvent(CdmContext::Event event) { @@ -428,7 +430,7 @@ void VaapiVideoDecoder::HandleDecodeTask() { break; case AcceleratedVideoDecoder::kDecodeError: UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.DecodeError", true); - SetErrorState("error decoding stream"); + SetState({DecoderStatus::Codes::kFailed, "error decoding stream"}); break; case AcceleratedVideoDecoder::kTryAgain: DVLOG(1) << "Decoder going into the waiting for protected state"; @@ -453,11 +455,13 @@ void VaapiVideoDecoder::HandleDecodeTask() { allocated_va_surfaces_.clear(); const gfx::Size decoder_pic_size = decoder_->GetPicSize(); if (decoder_pic_size.IsEmpty()) { - SetErrorState("\|decoder_\| returned an empty picture size"); + SetState({DecoderStatus::Codes::kFailed, + "decode() produced an empty picture size."}); return; } if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) { - SetErrorState("failed creating VAContext"); + SetState( + {DecoderStatus::Codes::kFailed, "Failed to create VAContext"}); return; } } @@ -510,7 +514,8 @@ std::unique_ptr VaapiVideoDecoder::CreateSurface() { vaapi_wrapper_->CreateVASurfaceForFrameResource( frame, cdm_context_ref_ \|\| transcryption_); if (!va_surface \|\| va_surface->id() == VA_INVALID_ID) { - SetErrorState("failed to create VASurface from FrameResource"); + SetState({DecoderStatus::Codes::kFailed, + "Failed to create VASurface from FrameResource"}); return nullptr; } const auto result = allocated_va_surfaces_.insert_or_assign( @@ -670,7 +675,9 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( const std::optional format = GetPixelFormatForBitDepth(bit_depth); if (!format) { - SetErrorState(base::StringPrintf("unsupported bit depth: %d", bit_depth)); + DecoderStatus status = {DecoderStatus::Codes::kFailed, + "Unsupported attribute", "bit_depth", bit_depth}; + SetState(std::move(status)); return; } @@ -687,7 +694,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( const gfx::Rect decoder_visible_rect = decoder_->GetVisibleRect(); const gfx::Size decoder_pic_size = decoder_->GetPicSize(); if (decoder_pic_size.IsEmpty()) { - SetErrorState("\|decoder_\| returned an empty picture size"); + SetState({DecoderStatus::Codes::kFailed, + "decode() returned an empty picture size"}); return; } gfx::Rect output_visible_rect = decoder_visible_rect; @@ -775,7 +783,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( "Media.VaapiVideoDecoder.VAAPIError")) .value_or(nullptr); if (!new_vaapi_wrapper.get()) { - SetErrorState("failed (re)creating VaapiWrapper"); + SetState({DecoderStatus::Codes::kFailed, + "Failed to create or set up the vaapi wrapper"}); return; } decoder_delegate_->set_vaapi_wrapper(new_vaapi_wrapper.get()); @@ -783,7 +792,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( } if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) { - SetErrorState("failed creating VAContext"); + SetState({DecoderStatus::Codes::kFailed, "Failed to create the VAContext"}); return; } @@ -811,7 +820,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( cdm_context_ref_ ? gfx::BufferUsage::PROTECTED_SCANOUT_VDA_WRITE : gfx::BufferUsage::SCANOUT_VDA_WRITE); if (!dummy_frame) { - SetErrorState("failed to allocate a dummy buffer"); + SetState( + {DecoderStatus::Codes::kFailed, "failed to allocate a dummy buffer"}); return; } @@ -838,8 +848,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( DVLOGF(2) << "The frame pool initialization is aborted"; SetState(State::kExpectingReset); } else { - // TODO(crbug.com/40139291): don't drop the error on the floor here. - SetErrorState("failed Initialize()ing the frame pool"); + SetState( + {DecoderStatus::Codes::kFailed, std::move(status_or_layout).error()}); } return; } @@ -913,16 +923,20 @@ VaapiVideoDecoder::AllocateCustomFrame(VideoPixelFormat format, if (!surface) return CroStatus::Codes::kFailedToCreateVideoFrame; - auto pixmap_and_info = + auto maybe_pixmap_and_info = vaapi_wrapper_->ExportVASurfaceAsNativePixmapDmaBuf(*surface.get()); - if (!pixmap_and_info) - return CroStatus::Codes::kFailedToCreateVideoFrame; + if (!maybe_pixmap_and_info.has_value()) { + return {CroStatus::Codes::kFailedToCreateVideoFrame, + std::move(maybe_pixmap_and_info).error()}; + } + auto pixmap_and_info = std::move(maybe_pixmap_and_info).value(); scoped_refptr frame = NativePixmapFrameResource::Create( visible_rect, natural_size, timestamp, gfx::BufferUsage::SCANOUT_VDA_WRITE, std::move(pixmap_and_info->pixmap)); - if (!frame) + if (!frame) { return CroStatus::Codes::kFailedToCreateVideoFrame; + } allocated_va_surfaces_.insert_or_assign(frame->tracking_token(), std::move(surface)); @@ -1002,13 +1016,14 @@ void VaapiVideoDecoder::ProtectedSessionUpdate(bool success) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!success) { - SetErrorState("terminating decoding after failed protected update"); + SetState({DecoderStatus::Codes::kFailed, "Protected update failed"}); return; } // If we were waiting for a protected update, retry the current decode task. - if (state_ != State::kWaitingForProtected) + if (state_ != State::kWaitingForProtected) { return; + } DCHECK(current_decode_task_); SetState(State::kDecoding); @@ -1028,7 +1043,7 @@ void VaapiVideoDecoder::Flush() { // Flush will block until SurfaceReady() has been called for every frame // currently decoding. if (!decoder_->Flush()) { - SetErrorState("failed to flush the decoder delegate"); + SetState({DecoderStatus::Codes::kFailed, "Failed to flush the decoder"}); return; } @@ -1067,8 +1082,9 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) { // Also give a chance to \|decoder_delegate_\| to release its internal data // structures. decoder_delegate_->OnVAContextDestructionSoon(); - if (!CreateAcceleratedVideoDecoder().is_ok()) { - SetErrorState("failed to (re)create decoder/delegate"); + auto status = CreateAcceleratedVideoDecoder(); + if (!status.has_value()) { + SetState({DecoderStatus::Codes::kFailed, std::move(status).error()}); std::move(reset_cb).Run(); return; } @@ -1088,7 +1104,8 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) { std::move(reset_cb))); } -VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() { +VaapiStatus::Or +VaapiVideoDecoder::CreateAcceleratedVideoDecoder() { DVLOGF(2); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(state_ == State::kUninitialized \|\| @@ -1152,10 +1169,13 @@ VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() { decoder_ = std::make_unique(std::move(accelerator), profile_, color_space_); } else { - return VaapiStatus(VaapiStatus::Codes::kUnsupportedProfile) - .WithData("profile", profile_); + VaapiStatus status = {VaapiStatus::Codes::kUnsupportedProfile, + "unsupported configuration", "profile", profile_}; + return status; } - return VaapiStatus::Codes::kOk; + + std::monostate nothing; + return nothing; } void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) { @@ -1169,10 +1189,22 @@ void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) { SetState(State::kWaitingForInput); } -void VaapiVideoDecoder::SetState(State state) { +void VaapiVideoDecoder::SetState(DecoderStatus::Or state_or_error) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - DVLOGF(3) << static_cast(state) - << ", current state: " << static_cast(state_); + if (!state_or_error.has_value()) { + state_ = State::kError; + if (pending_init_cb_) { + CHECK(!current_decode_task_ && decode_task_queue_.empty()); + std::move(pending_init_cb_).Run(std::move(state_or_error).error()); + } else { + ClearDecodeTaskQueue(std::move(state_or_error).error()); + } + return; + } + + State state = std::move(state_or_error).value(); + DVLOGF(3) << "Vaapi State change {" << static_cast(state_) << "} => {" + << static_cast(state) << "}"; // Check whether the state change is valid. switch (state) { @@ -1213,18 +1245,11 @@ void VaapiVideoDecoder::SetState(State state) { DCHECK_EQ(state_, State::kChangingResolution); break; case State::kError: - ClearDecodeTaskQueue(DecoderStatus::Codes::kFailed); - break; + // Error should be handled by passing in a DecoderStatus. + NOTREACHED(); } state_ = state; } -void VaapiVideoDecoder::SetErrorState(std::string message) { - LOG(ERROR) << message; - if (media_log_) - MEDIA_LOG(ERROR, media_log_) << "VaapiVideoDecoder: " << message; - SetState(State::kError); -} - } // namespace media diff --git a/media/gpu/vaapi/vaapi_video_decoder.h b/media/gpu/vaapi/vaapi_video_decoder.h index 381f0f8b3c269..af24707ede5dd 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.h +++ b/media/gpu/vaapi/vaapi_video_decoder.h @@ -159,14 +159,11 @@ class VaapiVideoDecoder : public VideoDecoderMixin, void ResetDone(base::OnceClosure reset_cb); // Create codec-specific AcceleratedVideoDecoder and reset related variables. - VaapiStatus CreateAcceleratedVideoDecoder(); + VaapiStatus::Or CreateAcceleratedVideoDecoder(); - // Change the current \|state_\| to the specified \|state\|. - void SetState(State state); - - // Tell SetState() to change the \|state_\| to kError and send \|message\| to - // MediaLog and to LOG(ERROR). - void SetErrorState(std::string message); + // Change the current `state_` to the specified `state`. Iff the new state is + // an error, report the error to all pending decode and init tasks. + void SetState(DecoderStatus::Or state); // Callback for the CDM to notify \|this\|. void OnCdmContextEvent(CdmContext::Event event); @@ -208,6 +205,9 @@ class VaapiVideoDecoder : public VideoDecoderMixin, return !!vaapi_wrapper_ && !!decoder_; } + // We can cancel the pending init during error handling if need be. + InitCB pending_init_cb_ GUARDED_BY_CONTEXT(sequence_checker_); + // The video decoder's state. State state_ GUARDED_BY_CONTEXT(sequence_checker_) = State::kUninitialized; diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc index 1608e44bc4ec6..a77f0d1299198 100644 --- a/media/gpu/vaapi/vaapi_wrapper.cc +++ b/media/gpu/vaapi/vaapi_wrapper.cc @@ -2597,7 +2597,7 @@ std::unique_ptr VaapiWrapper::CreateVASurfaceWithUsageHints( va_rt_format); } -std::unique_ptr +VaapiStatus::Or> VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped( VASurfaceID va_surface_id, const gfx::Size& va_surface_size) { @@ -2608,13 +2608,14 @@ VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped( { base::AutoLockMaybe auto_lock(va_lock_.get()); VAStatus va_res = vaSyncSurface(va_display_, va_surface_id); - VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVASyncSurface, nullptr); + VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVASyncSurface, + VaapiStatus::Codes::kNoSurface); va_res = vaExportSurfaceHandle( va_display_, va_surface_id, VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, VA_EXPORT_SURFACE_READ_ONLY \| VA_EXPORT_SURFACE_SEPARATE_LAYERS, &descriptor); VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVAExportSurfaceHandle, - nullptr); + VaapiStatus::Codes::kFailedToExportSurface); } // Translate the pixel format to a viz::SharedImageFormat. @@ -2639,9 +2640,9 @@ VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped( si_format = viz::SinglePlaneFormat::kBGRA_8888; break; default: - LOG(ERROR) << "Cannot export a surface with FOURCC " - << FourccToString(descriptor.fourcc); - return nullptr; + return VaapiStatus{VaapiStatus::Codes::kFailedToExportSurface, + "Cannot export surface with unknown FOURCC", "fourcc", + FourccToString(descriptor.fourcc)}; } gfx::NativePixmapHandle handle; @@ -2704,24 +2705,24 @@ VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped( base::strict_cast(descriptor.objects[0].size); if (!gfx::Rect(exported_pixmap->va_surface_resolution) .Contains(gfx::Rect(va_surface_size))) { - LOG(ERROR) << "A " << va_surface_size.ToString() - << " surface cannot be contained by a " - << exported_pixmap->va_surface_resolution.ToString() - << " buffer"; - return nullptr; + VaapiStatus error = {VaapiStatus::Codes::kFailedToExportSurface, + "Surface is too large for buffer"}; + return std::move(error) + .WithData("surface_size", va_surface_size.ToString()) + .WithData("buffer_size", + exported_pixmap->va_surface_resolution.ToString()); } exported_pixmap->pixmap = base::MakeRefCounted( va_surface_size, si_format, std::move(handle)); return exported_pixmap; } -std::unique_ptr +VaapiStatus::Or> VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBuf( const ScopedVASurface& scoped_va_surface) { VAAPI_CHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!scoped_va_surface.IsValid()) { - LOG(ERROR) << "Cannot export an invalid surface"; - return nullptr; + return VaapiStatus::Codes::kFailedToExportSurface; } return ExportVASurfaceAsNativePixmapDmaBufUnwrapped(scoped_va_surface.id(), scoped_va_surface.size()); diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h index cd1be5d824baa..484fd0d79ef8f 100644 --- a/media/gpu/vaapi/vaapi_wrapper.h +++ b/media/gpu/vaapi/vaapi_wrapper.h @@ -33,6 +33,7 @@ #include "build/build_config.h" #include "media/gpu/chromeos/fourcc.h" #include "media/gpu/media_gpu_export.h" +#include "media/gpu/vaapi/vaapi_status.h" #include "media/gpu/vaapi/vaapi_utils.h" #include "media/video/video_decode_accelerator.h" #include "media/video/video_encode_accelerator.h" @@ -459,8 +460,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper // Implementations of the pixmap exporter for both types of VASurface. // See ExportVASurfaceAsNativePixmapDmaBufUnwrapped() for further // documentation. - std::unique_ptr ExportVASurfaceAsNativePixmapDmaBuf( - const ScopedVASurface& scoped_va_surface); + VaapiStatus::Or> + ExportVASurfaceAsNativePixmapDmaBuf(const ScopedVASurface& scoped_va_surface); // Synchronize the VASurface explicitly. This is useful when sharing a surface // between contexts. @@ -657,7 +658,7 @@ class MEDIA_GPU_EXPORT VaapiWrapper // // Returns nullptr on failure, or if the exported surface can't contain // \|va_surface_size\|. - std::unique_ptr + VaapiStatus::Or> ExportVASurfaceAsNativePixmapDmaBufUnwrapped( VASurfaceID va_surface_id, const gfx::Size& va_surface_size);	Download
2026-04-30-22-20-30	`a7952cfa`	Built With New VAAPI errors	diff --git a/media/base/media_serializers.h b/media/base/media_serializers.h index edfd803a4f759..82466b68e4f28 100644 --- a/media/base/media_serializers.h +++ b/media/base/media_serializers.h @@ -445,8 +445,11 @@ struct MediaSerializerDebug> { static base::Value Serialize(const TypedStatus& status) { // TODO: replace this with some kind of static "description" // of the default type, instead of "Ok". - if (status.is_ok()) - return base::Value("Ok"); + if constexpr (requires(TypedStatus& t) { t.is_ok(); }) { + if (status.is_ok()) { + return base::Value("Ok"); + } + } return MediaSerialize(status.data_); } }; diff --git a/media/base/status.h b/media/base/status.h index 7a31c8d3eb3a0..9a2dbb727da94 100644 --- a/media/base/status.h +++ b/media/base/status.h @@ -119,6 +119,16 @@ struct StatusTraitsHelper { } } + static constexpr bool HasOkEnumValue() { + if constexpr (requires { &T::OkEnumValue; }) { + return true; + } else if constexpr (requires { T::Codes::kOk; }) { + return true; + } else { + return false; + } + } + static std::string RenderGroupAndCode(T::Codes code) { if constexpr (requires { &T::ReadableCodeName; }) { return base::StrCat({T::Group(), "::", T::ReadableCodeName(code)}); @@ -229,6 +239,16 @@ class MEDIA_EXPORT TypedStatus { AddCause(std::move(cause)); } + template + TypedStatus(Codes code, + std::string message, + std::string data_name, + const D& data, + const base::Location& location = FROM_HERE) + : TypedStatus(code, std::move(message), location) { + data_->data.GetDict().Set(std::move(data_name), MediaSerialize(data)); + } + // Constructor to create a new TypedStatus from a numeric code & message. // These are immutable; if you'd like to change them, then you likely should // create a new TypedStatus. @@ -260,7 +280,11 @@ class MEDIA_EXPORT TypedStatus { return this; } - bool is_ok() const { return !data_; } + bool is_ok() const + requires(internal::StatusTraitsHelper::HasOkEnumValue()) + { + return !data_; + } Codes code() const { if (!data_) @@ -359,11 +383,17 @@ class MEDIA_EXPORT TypedStatus { // Create an Or type implicitly from a TypedStatus Or(TypedStatus&& error) : error_(std::move(error)) { // `error_` must not be ok. - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } } Or(const TypedStatus& error) : error_(error) { - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } } // Create an Or type implicitly from the alternate O. @@ -373,7 +403,22 @@ class MEDIA_EXPORT TypedStatus { // Create an Or type explicitly from a code Or(typename T::Codes code, const base::Location& location = FROM_HERE) : error_(TypedStatus(code, "", location)) { - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } + } + + // Create an Or type explicitly from a code and a cause + template + Or(typename T::Codes code, + TypedStatus&& cause, + const ::base::Location& location = FROM_HERE) + : error_(TypedStatus(code, std::move(cause), location)) { + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + CHECK(!error_->is_ok()); + } } // Create an Or type implicitly from any brace-initializer list that could @@ -384,7 +429,10 @@ class MEDIA_EXPORT TypedStatus { const Rest&... rest, const base::Location& location = FROM_HERE) : error_(TypedStatus(code, first, rest..., location)) { - DCHECK(!error_->is_ok()); + if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) { + // `error_` must not be ok. + DCHECK(!error_->is_ok()); + } } // Move- and copy- construction and assignment are okay. diff --git a/media/base/status_unittest.cc b/media/base/status_unittest.cc index e582031c8f4d3..5579f028a72b7 100644 --- a/media/base/status_unittest.cc +++ b/media/base/status_unittest.cc @@ -458,11 +458,9 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultAndNoOk) { NDStatus foo = NDStatus::Codes::kFoo; EXPECT_EQ(foo.code(), NDStatus::Codes::kFoo); - EXPECT_FALSE(foo.is_ok()); NDStatus bar = NDStatus::Codes::kBar; EXPECT_EQ(bar.code(), NDStatus::Codes::kBar); - EXPECT_FALSE(bar.is_ok()); NDStatus::Or err = NDStatus::Codes::kBaz; NDStatus::Or ok = std::string("kBaz"); @@ -507,10 +505,6 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultHasOk) { } TEST_F(StatusTest, Okayness) { - EXPECT_FALSE( - TypedStatus(NoOkStatusTypeTraits::Codes::kFoo) - .is_ok()); - EXPECT_FALSE( TypedStatus(ZeroValueOkTypeTraits::Codes::kFoo) .is_ok()); diff --git a/media/gpu/vaapi/vaapi_status.h b/media/gpu/vaapi/vaapi_status.h index a2ab19517b23b..460370aea8be2 100644 --- a/media/gpu/vaapi/vaapi_status.h +++ b/media/gpu/vaapi/vaapi_status.h @@ -10,7 +10,6 @@ namespace media { enum class VaapiStatusCode : StatusCodeType { - kOk = 0, kBadContext = 1, kNoBuffer = 2, kNoBufferHandle = 3, diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc index c39949f9c9448..54838e260eadd 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.cc +++ b/media/gpu/vaapi/vaapi_video_decoder.cc @@ -147,6 +147,10 @@ VaapiVideoDecoder::~VaapiVideoDecoder() { // Abort all currently scheduled decode tasks. ClearDecodeTaskQueue(DecoderStatus::Codes::kAborted); + if (pending_init_cb_) { + std::move(pending_init_cb_).Run(DecoderStatus::Codes::kAborted); + } + weak_this_factory_.InvalidateWeakPtrs(); // Notify \|decoder_delegate_\| of an imminent VAContextID destruction, so it @@ -178,12 +182,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(config.IsValidConfig()); + pending_init_cb_ = std::move(init_cb); + // Reinitializing the decoder is allowed if there are no pending decodes. if (current_decode_task_ \|\| !decode_task_queue_.empty() \|\| state_ == State::kExpectingReset) { - LOG(ERROR) - << "Don't call Initialize() while there are pending decode tasks"; - std::move(init_cb).Run(DecoderStatus::Codes::kFailed); + SetState({DecoderStatus::Codes::kFailed, + "Failed to initialize with pending decode tasks in flight."}); return; } @@ -229,13 +234,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, if (config.is_encrypted()) { #if !BUILDFLAG(IS_CHROMEOS) - SetErrorState("encrypted content is not supported"); - std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode); + SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode, + "encrypted content is not supported"}); return; #else if (!cdm_context \|\| !cdm_context->GetChromeOsCdmContext()) { - SetErrorState("cannot support encrypted stream w/out ChromeOsCdmContext"); - std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode); + SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode, + "ChromeOsCdmContext required for encrypted streams"}); return; } bool encrypted_av1_support = false; @@ -246,10 +251,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, config.codec() != VideoCodec::kVP9 && (config.codec() != VideoCodec::kAV1 \|\| !encrypted_av1_support) && config.codec() != VideoCodec::kHEVC) { - SetErrorState( - base::StringPrintf("%s is not supported for encrypted content", - GetCodecName(config.codec()).c_str())); - std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode); + DecoderStatus error = {DecoderStatus::Codes::kUnsupportedEncryptionMode, + "Codec not supported for encrypted content"}; + SetState(std::move(error).WithData("codec", config.codec())); return; } cdm_event_cb_registration_ = cdm_context->RegisterEventCB( @@ -279,10 +283,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.VaapiWrapperCreationSuccess", vaapi_wrapper_or_error.has_value()); if (!vaapi_wrapper_or_error.has_value()) { - SetErrorState(base::StringPrintf( - "failed initializing VaapiWrapper for profile %s, ", - GetProfileName(profile).c_str())); - std::move(init_cb).Run(vaapi_wrapper_or_error.error()); + SetState(std::move(vaapi_wrapper_or_error) + .error() + .WithData("profile", profile)); return; } vaapi_wrapper_ = std::move(vaapi_wrapper_or_error.value()); @@ -296,10 +299,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, if (!IsConfiguredForTesting()) { auto accel_status = CreateAcceleratedVideoDecoder(); - if (!accel_status.is_ok()) { - SetErrorState("failed to create decoder delegate"); - std::move(init_cb).Run(DecoderStatus(DecoderStatus::Codes::kFailed) - .AddCause(std::move(accel_status))); + if (!accel_status.has_value()) { + SetState( + {DecoderStatus::Codes::kFailed, std::move(accel_status).error()}); return; } } @@ -311,7 +313,7 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config, SetState(State::kWaitingForInput); // Notify client initialization was successful. - std::move(init_cb).Run(DecoderStatus::Codes::kOk); + std::move(pending_init_cb_).Run(DecoderStatus::Codes::kOk); } void VaapiVideoDecoder::OnCdmContextEvent(CdmContext::Event event) { @@ -428,7 +430,7 @@ void VaapiVideoDecoder::HandleDecodeTask() { break; case AcceleratedVideoDecoder::kDecodeError: UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.DecodeError", true); - SetErrorState("error decoding stream"); + SetState({DecoderStatus::Codes::kFailed, "error decoding stream"}); break; case AcceleratedVideoDecoder::kTryAgain: DVLOG(1) << "Decoder going into the waiting for protected state"; @@ -453,11 +455,13 @@ void VaapiVideoDecoder::HandleDecodeTask() { allocated_va_surfaces_.clear(); const gfx::Size decoder_pic_size = decoder_->GetPicSize(); if (decoder_pic_size.IsEmpty()) { - SetErrorState("\|decoder_\| returned an empty picture size"); + SetState({DecoderStatus::Codes::kFailed, + "decode() produced an empty picture size."}); return; } if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) { - SetErrorState("failed creating VAContext"); + SetState( + {DecoderStatus::Codes::kFailed, "Failed to create VAContext"}); return; } } @@ -510,7 +514,8 @@ std::unique_ptr VaapiVideoDecoder::CreateSurface() { vaapi_wrapper_->CreateVASurfaceForFrameResource( frame, cdm_context_ref_ \|\| transcryption_); if (!va_surface \|\| va_surface->id() == VA_INVALID_ID) { - SetErrorState("failed to create VASurface from FrameResource"); + SetState({DecoderStatus::Codes::kFailed, + "Failed to create VASurface from FrameResource"}); return nullptr; } const auto result = allocated_va_surfaces_.insert_or_assign( @@ -670,7 +675,9 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( const std::optional format = GetPixelFormatForBitDepth(bit_depth); if (!format) { - SetErrorState(base::StringPrintf("unsupported bit depth: %d", bit_depth)); + DecoderStatus status = {DecoderStatus::Codes::kFailed, + "Unsupported attribute", "bit_depth", bit_depth}; + SetState(std::move(status)); return; } @@ -687,7 +694,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( const gfx::Rect decoder_visible_rect = decoder_->GetVisibleRect(); const gfx::Size decoder_pic_size = decoder_->GetPicSize(); if (decoder_pic_size.IsEmpty()) { - SetErrorState("\|decoder_\| returned an empty picture size"); + SetState({DecoderStatus::Codes::kFailed, + "decode() returned an empty picture size"}); return; } gfx::Rect output_visible_rect = decoder_visible_rect; @@ -775,7 +783,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( "Media.VaapiVideoDecoder.VAAPIError")) .value_or(nullptr); if (!new_vaapi_wrapper.get()) { - SetErrorState("failed (re)creating VaapiWrapper"); + SetState({DecoderStatus::Codes::kFailed, + "Failed to create or set up the vaapi wrapper"}); return; } decoder_delegate_->set_vaapi_wrapper(new_vaapi_wrapper.get()); @@ -783,7 +792,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( } if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) { - SetErrorState("failed creating VAContext"); + SetState({DecoderStatus::Codes::kFailed, "Failed to create the VAContext"}); return; } @@ -811,7 +820,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( cdm_context_ref_ ? gfx::BufferUsage::PROTECTED_SCANOUT_VDA_WRITE : gfx::BufferUsage::SCANOUT_VDA_WRITE); if (!dummy_frame) { - SetErrorState("failed to allocate a dummy buffer"); + SetState( + {DecoderStatus::Codes::kFailed, "failed to allocate a dummy buffer"}); return; } @@ -838,8 +848,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( DVLOGF(2) << "The frame pool initialization is aborted"; SetState(State::kExpectingReset); } else { - // TODO(crbug.com/40139291): don't drop the error on the floor here. - SetErrorState("failed Initialize()ing the frame pool"); + SetState( + {DecoderStatus::Codes::kFailed, std::move(status_or_layout).error()}); } return; } @@ -1002,13 +1012,14 @@ void VaapiVideoDecoder::ProtectedSessionUpdate(bool success) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!success) { - SetErrorState("terminating decoding after failed protected update"); + SetState({DecoderStatus::Codes::kFailed, "Protected update failed"}); return; } // If we were waiting for a protected update, retry the current decode task. - if (state_ != State::kWaitingForProtected) + if (state_ != State::kWaitingForProtected) { return; + } DCHECK(current_decode_task_); SetState(State::kDecoding); @@ -1028,7 +1039,7 @@ void VaapiVideoDecoder::Flush() { // Flush will block until SurfaceReady() has been called for every frame // currently decoding. if (!decoder_->Flush()) { - SetErrorState("failed to flush the decoder delegate"); + SetState({DecoderStatus::Codes::kFailed, "Failed to flush the decoder"}); return; } @@ -1067,8 +1078,9 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) { // Also give a chance to \|decoder_delegate_\| to release its internal data // structures. decoder_delegate_->OnVAContextDestructionSoon(); - if (!CreateAcceleratedVideoDecoder().is_ok()) { - SetErrorState("failed to (re)create decoder/delegate"); + auto status = CreateAcceleratedVideoDecoder(); + if (!status.has_value()) { + SetState({DecoderStatus::Codes::kFailed, std::move(status).error()}); std::move(reset_cb).Run(); return; } @@ -1088,7 +1100,8 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) { std::move(reset_cb))); } -VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() { +VaapiStatus::Or +VaapiVideoDecoder::CreateAcceleratedVideoDecoder() { DVLOGF(2); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(state_ == State::kUninitialized \|\| @@ -1152,10 +1165,13 @@ VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() { decoder_ = std::make_unique(std::move(accelerator), profile_, color_space_); } else { - return VaapiStatus(VaapiStatus::Codes::kUnsupportedProfile) - .WithData("profile", profile_); + VaapiStatus status = {VaapiStatus::Codes::kUnsupportedProfile, + "unsupported configuration", "profile", profile_}; + return status; } - return VaapiStatus::Codes::kOk; + + std::monostate nothing; + return nothing; } void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) { @@ -1169,10 +1185,22 @@ void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) { SetState(State::kWaitingForInput); } -void VaapiVideoDecoder::SetState(State state) { +void VaapiVideoDecoder::SetState(DecoderStatus::Or state_or_error) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - DVLOGF(3) << static_cast(state) - << ", current state: " << static_cast(state_); + if (!state_or_error.has_value()) { + state_ = State::kError; + if (pending_init_cb_) { + CHECK(!current_decode_task_ && decode_task_queue_.empty()); + std::move(pending_init_cb_).Run(std::move(state_or_error).error()); + } else { + ClearDecodeTaskQueue(std::move(state_or_error).error()); + } + return; + } + + State state = std::move(state_or_error).value(); + DVLOGF(3) << "Vaapi State change {" << static_cast(state_) << "} => {" + << static_cast(state) << "}"; // Check whether the state change is valid. switch (state) { @@ -1213,18 +1241,11 @@ void VaapiVideoDecoder::SetState(State state) { DCHECK_EQ(state_, State::kChangingResolution); break; case State::kError: - ClearDecodeTaskQueue(DecoderStatus::Codes::kFailed); - break; + // Error should be handled by passing in a DecoderStatus. + NOTREACHED(); } state_ = state; } -void VaapiVideoDecoder::SetErrorState(std::string message) { - LOG(ERROR) << message; - if (media_log_) - MEDIA_LOG(ERROR, media_log_) << "VaapiVideoDecoder: " << message; - SetState(State::kError); -} - } // namespace media diff --git a/media/gpu/vaapi/vaapi_video_decoder.h b/media/gpu/vaapi/vaapi_video_decoder.h index 381f0f8b3c269..af24707ede5dd 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.h +++ b/media/gpu/vaapi/vaapi_video_decoder.h @@ -159,14 +159,11 @@ class VaapiVideoDecoder : public VideoDecoderMixin, void ResetDone(base::OnceClosure reset_cb); // Create codec-specific AcceleratedVideoDecoder and reset related variables. - VaapiStatus CreateAcceleratedVideoDecoder(); + VaapiStatus::Or CreateAcceleratedVideoDecoder(); - // Change the current \|state_\| to the specified \|state\|. - void SetState(State state); - - // Tell SetState() to change the \|state_\| to kError and send \|message\| to - // MediaLog and to LOG(ERROR). - void SetErrorState(std::string message); + // Change the current `state_` to the specified `state`. Iff the new state is + // an error, report the error to all pending decode and init tasks. + void SetState(DecoderStatus::Or state); // Callback for the CDM to notify \|this\|. void OnCdmContextEvent(CdmContext::Event event); @@ -208,6 +205,9 @@ class VaapiVideoDecoder : public VideoDecoderMixin, return !!vaapi_wrapper_ && !!decoder_; } + // We can cancel the pending init during error handling if need be. + InitCB pending_init_cb_ GUARDED_BY_CONTEXT(sequence_checker_); + // The video decoder's state. State state_ GUARDED_BY_CONTEXT(sequence_checker_) = State::kUninitialized;	Download
2026-04-16-20-58-32	`7db299df`	with better vaapi debug info	diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc index 56dd2326fa44d..df2569b71c3c6 100644 --- a/components/viz/service/gl/gpu_service_impl.cc +++ b/components/viz/service/gl/gpu_service_impl.cc @@ -125,6 +125,10 @@ #include "ui/ozone/public/surface_factory_ozone.h" #endif // BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) +#include "media/gpu/vaapi/vaapi_wrapper.h" // nogncheck +#endif + namespace viz { namespace { @@ -456,6 +460,26 @@ void GpuServiceImpl::InitializeWithHostInternal( #if BUILDFLAG(IS_LINUX) gpu_extra_info_.is_gmb_nv12_supported = IsGMBNV12Supported(); +#if BUILDFLAG(USE_VAAPI) + auto vaapi_info = media::VaapiWrapper::GetSupportInformation(); + auto convert_profile = + [](const media::VaapiWrapper::SupportedVAAPIProfile& in) { + gfx::VaapiVideoAcceleratorSupportedProfile out; + out.profile_name = in.profile_name; + out.resolution_range = in.resolution_range; + out.formats = in.formats; + return out; + }; + for (const auto& p : vaapi_info.decode_supported_profiles) { + gpu_extra_info_.decode_vaapi_info.push_back(convert_profile(p)); + } + for (const auto& p : vaapi_info.encode_supported_profiles) { + gpu_extra_info_.encode_vaapi_info.push_back(convert_profile(p)); + } + for (const auto& p : vaapi_info.vpp_supported_profiles) { + gpu_extra_info_.vpp_vaapi_info.push_back(convert_profile(p)); + } +#endif #endif gpu_host->DidInitialize(gpu_info_, gpu_feature_info_, diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index 6f43ee799d28d..617d3a51e5108 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -451,6 +451,7 @@ base::ListValue GetDevicePerfInfo() { return list; } +#if !BUILDFLAG(IS_LINUX) const char* GetProfileName(gpu::VideoCodecProfile profile) { switch (profile) { case gpu::VIDEO_CODEC_PROFILE_UNKNOWN: @@ -534,25 +535,19 @@ const char* GetProfileName(gpu::VideoCodecProfile profile) { } NOTREACHED(); } +#endif base::ListValue GetVideoAcceleratorsInfo() { gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); base::ListValue info; - struct { - const raw_ref - capabilities; - std::string name; - } kVideoDecoderImplementations[] = { - {raw_ref(gpu_info.video_decode_accelerator_supported_profiles), - "Decoding"}, - }; - info.Append(display::BuildGpuInfoEntry("Decoding", "")); for (const auto& profile : gpu_info.video_decode_accelerator_supported_profiles) { - std::string codec_string = - base::StringPrintf("Decode %s", GetProfileName(profile.profile)); + std::string codec_string = base::StringPrintf( + "Decode %s", media::GetProfileName( + static_cast(profile.profile)) + .c_str()); std::string resolution_string = base::StringPrintf( "%s to %s pixels%s", profile.min_resolution.ToString(), profile.max_resolution.ToString(), @@ -563,8 +558,10 @@ base::ListValue GetVideoAcceleratorsInfo() { info.Append(display::BuildGpuInfoEntry("Encoding", "")); for (const auto& profile : gpu_info.video_encode_accelerator_supported_profiles) { - std::string codec_string = - base::StringPrintf("Encode %s", GetProfileName(profile.profile)); + std::string codec_string = base::StringPrintf( + "Encode %s", media::GetProfileName( + static_cast(profile.profile)) + .c_str()); std::string resolution_string = base::StringPrintf( "%s to %s pixels, and/or %.3f fps%s.", profile.min_resolution.ToString(), profile.max_resolution.ToString(), @@ -573,34 +570,51 @@ base::ListValue GetVideoAcceleratorsInfo() { profile.is_software_codec ? " (software codec)" : ""); info.Append(display::BuildGpuInfoEntry(codec_string, resolution_string)); } + return info; } -base::Value GetANGLEFeatures() { - gfx::GpuExtraInfo gpu_extra_info = +base::Value GetVaapiInfo() { + base::DictValue vaapi_info; +#if BUILDFLAG(IS_LINUX) + const gfx::GpuExtraInfo gpu_extra_info = GpuDataManagerImpl::GetInstance()->GetGpuExtraInfo(); - base::ListValue angle_features_list; - for (const auto& feature : gpu_extra_info.angle_features) { - base::DictValue angle_feature; - angle_feature.Set("name", feature.name); - angle_feature.Set("category", feature.category); - angle_feature.Set("status", feature.status); - angle_features_list.Append(std::move(angle_feature)); - } - return base::Value(std::move(angle_features_list)); -} - -base::Value GetDawnInfo() { - const std::vector info_list_collected = - GpuDataManagerImpl::GetInstance()->GetDawnInfoList(); - base::ListValue dawn_info_list; - - for (const auto& info : info_list_collected) { - dawn_info_list.Append(info); - } - - return base::Value(std::move(dawn_info_list)); + base::ListValue profile_info_list; + auto add_vaapi_entries = + [&profile_info_list]( + const std::string& header, + const gfx::VaapiVideoAcceleratorSupportedProfiles& profiles) { + if (profiles.empty()) { + return; + } + base::DictValue entry; + entry.Set("description", header); + entry.Set("value", ""); + entry.Set("formats", ""); + profile_info_list.Append(std::move(entry)); + + for (const auto& profile : profiles) { + base::DictValue row; + row.Set("description", profile.profile_name); + row.Set("value", profile.resolution_range); + row.Set("formats", profile.formats); + profile_info_list.Append(std::move(row)); + } + }; + + add_vaapi_entries("Decoding", gpu_extra_info.decode_vaapi_info); + add_vaapi_entries("Encoding", gpu_extra_info.encode_vaapi_info); + add_vaapi_entries("Video Processing", gpu_extra_info.vpp_vaapi_info); + + vaapi_info.Set("profiles", std::move(profile_info_list)); + vaapi_info.Set( + "blurb", + base::Value("VA-API hardware video decoding requires either NV12 " + "single-plane support, or NV12 R8+GR88 multi-plane support " + "along with VPP (Video Processing) support.")); +#endif + return base::Value(std::move(vaapi_info)); } // This class receives javascript messages from the renderer. @@ -753,6 +767,33 @@ base::ListValue GpuMessageHandler::GetLogMessages() { return GpuDataManagerImpl::GetInstance()->GetLogMessages(); } +base::Value GetANGLEFeatures() { + gfx::GpuExtraInfo gpu_extra_info = + GpuDataManagerImpl::GetInstance()->GetGpuExtraInfo(); + base::ListValue angle_features_list; + for (const auto& feature : gpu_extra_info.angle_features) { + base::DictValue angle_feature; + angle_feature.Set("name", feature.name); + angle_feature.Set("category", feature.category); + angle_feature.Set("status", feature.status); + angle_features_list.Append(std::move(angle_feature)); + } + + return base::Value(std::move(angle_features_list)); +} + +base::Value GetDawnInfo() { + const std::vector info_list_collected = + GpuDataManagerImpl::GetInstance()->GetDawnInfoList(); + base::ListValue dawn_info_list; + + for (const auto& info : info_list_collected) { + dawn_info_list.Append(info); + } + + return base::Value(std::move(dawn_info_list)); +} + base::DictValue GpuMessageHandler::GetGpuInfoDict() { // Get GPU Info. const gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); @@ -800,6 +841,7 @@ base::DictValue GpuMessageHandler::GetGpuInfoDict() { gpu_info_val.Set("ANGLEFeatures", GetANGLEFeatures()); gpu_info_val.Set("devicePerfInfo", GetDevicePerfInfo()); gpu_info_val.Set("dawnInfo", GetDawnInfo()); + gpu_info_val.Set("vaapiInfo", GetVaapiInfo()); return gpu_info_val; } diff --git a/content/browser/resources/gpu/browser_bridge.ts b/content/browser/resources/gpu/browser_bridge.ts index a7208a35fdec3..53e27e341b1aa 100644 --- a/content/browser/resources/gpu/browser_bridge.ts +++ b/content/browser/resources/gpu/browser_bridge.ts @@ -49,6 +49,10 @@ interface GpuInfo { featureStatusForHardwareGpu: FeatureStatus; videoAcceleratorsInfo: any[]; vulkanInfo: string; + vaapiInfo?: { + blurb?: string, + profiles: any[], + }; } interface LogMessasge { diff --git a/content/browser/resources/gpu/info_view.html b/content/browser/resources/gpu/info_view.html index a6d86891ed9b1..107fb43543f4c 100644 --- a/content/browser/resources/gpu/info_view.html +++ b/content/browser/resources/gpu/info_view.html @@ -99,6 +99,14 @@ found in the LICENSE file. } .info-table td:nth-child(2) { font-weight: bold; + width: 40%; + } + .info-table td:nth-child(3) { + font-weight: bold; + width: 35%; + } + /* If there are only 2 columns, the 2nd one should take the rest of the space / + .info-table tr td:nth-child(2):last-child { width: 75%; } diff --git a/content/browser/resources/gpu/info_view.ts b/content/browser/resources/gpu/info_view.ts index f0b1969fce598..31fccf5a372d4 100644 --- a/content/browser/resources/gpu/info_view.ts +++ b/content/browser/resources/gpu/info_view.ts @@ -151,6 +151,7 @@ export interface Data { description: string; id?: string; value: string\|boolean\|number; + formats?: string; } export interface ArrayData { @@ -160,7 +161,7 @@ export interface ArrayData { /* Creates the td elements for a table row / function createInfoElements( - data: Data\|ArrayData, padSize: number): HTMLElement[] { + data: Data\|ArrayData, padSize: number, hasFormats: boolean): HTMLElement[] { const desc = createElem('td', {}, [ createElem('span', data.description.padEnd(padSize)), createHidden(':'), @@ -169,16 +170,27 @@ function createInfoElements( if (Array.isArray(data.value)) { return [ desc, - createElem('td', {}, [createInfoTable((data as ArrayData).value)]), + createElem('td', {colSpan: (hasFormats ? 2 : 1).toString()}, + [createInfoTable((data as ArrayData).value)]), ]; } else { - return [ + const tdProps: Attributes = { + textContent: data.value.toString().trim(), + }; + if ((data as Data).id) { + tdProps['id'] = (data as Data).id!; + } + + const elements = [ desc, - createElem('td', { - textContent: data.value.toString().trim(), - id: (data as Data).id!, - }), + createElem('td', tdProps), ]; + if (hasFormats) { + elements.push(createElem('td', { + textContent: (data as Data).formats \|\| '', + })); + } + return elements; } } @@ -190,11 +202,15 @@ function createInfoTable(data: Data[]\|ArrayData[]) { .reduce( (longest, {description}) => Math.max(longest, description.length), 0)); + + const hasFormats = data.some(d => (d as Data).formats !== undefined); + return createElem('table', {className: 'info-table'}, [ createElem( 'tbody', {}, data.map( - data => createElem('tr', {}, createInfoElements(data, longestDesc)), + data => + createElem('tr', {}, createInfoElements(data, longestDesc, hasFormats)), )), ]); } @@ -311,6 +327,7 @@ const kSections = { compositorInfo: ['Compositor Information', 'div'], displayInfo: ['Display(s) Information', 'div'], videoAccelerationInfo: ['Video Acceleration Information', 'div'], + vaapiInfo: ['VA-API Information', 'div'], vulkanInfo: ['Vulkan Information', 'div'], devicePerfInfo: ['Device Performance Information', 'div'], diagnostics: ['Diagnostics', 'div'], @@ -569,6 +586,19 @@ export class InfoViewElement extends CustomElement { this.setTable_( sections.videoAccelerationInfo, gpuInfo.videoAcceleratorsInfo); + this.updateSection_(sections.vaapiInfo, () => { + const show = !!gpuInfo.vaapiInfo && gpuInfo.vaapiInfo.profiles.length > 0; + if (show) { + if (gpuInfo.vaapiInfo!.blurb) { + sections.vaapiInfo.list.appendChild( + createElem('p', gpuInfo.vaapiInfo!.blurb)); + } + sections.vaapiInfo.list.appendChild( + createInfoTable(gpuInfo.vaapiInfo!.profiles)); + } + return show; + }); + this.updateSectionList_( sections.angleFeatures, gpuInfo.ANGLEFeatures, angleFeature => this.createAngleFeatureEl_(angleFeature)); diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc index c39949f9c9448..b7a5fa9758e6a 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.cc +++ b/media/gpu/vaapi/vaapi_video_decoder.cc @@ -21,6 +21,7 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/not_fatal_until.h" +#include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" @@ -838,8 +839,10 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes( DVLOGF(2) << "The frame pool initialization is aborted"; SetState(State::kExpectingReset); } else { - // TODO(crbug.com/40139291): don't drop the error on the floor here. - SetErrorState("failed Initialize()ing the frame pool"); + SetErrorState(base::StrCat( + {"failed to Initialize() the frame pool, which is used to ", + "provide output VideoFrames for the decoder: ", + std::move(status_or_layout).error().message()})); } return; } diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc index 1608e44bc4ec6..1d74b13d36e2a 100644 --- a/media/gpu/vaapi/vaapi_wrapper.cc +++ b/media/gpu/vaapi/vaapi_wrapper.cc @@ -93,7 +93,18 @@ using media_gpu_vaapi::StubPathMap; namespace media { +VaapiWrapper::SupportedVAAPIProfile::SupportedVAAPIProfile() = default; +VaapiWrapper::SupportedVAAPIProfile::SupportedVAAPIProfile( + const SupportedVAAPIProfile&) = default; +VaapiWrapper::SupportedVAAPIProfile::~SupportedVAAPIProfile() = default; + +VaapiWrapper::SupportedVAAPIInfo::SupportedVAAPIInfo() = default; +VaapiWrapper::SupportedVAAPIInfo::SupportedVAAPIInfo( + const SupportedVAAPIInfo&) = default; +VaapiWrapper::SupportedVAAPIInfo::~SupportedVAAPIInfo() = default; + namespace { + // Returns a DRM FD and whether this FD should be skipped. std::pair LoadDrmFD(const base::FilePath& dev_path) { base::File drm_file = @@ -127,6 +138,81 @@ std::pair LoadDrmFD(const base::FilePath& dev_path) { return std::make_pair(base::ScopedFD(drm_file.TakePlatformFile()), /should_skip=/false); } + +std::string DrmFormatToString(uint32_t drm_format) { + switch (drm_format) { + case DRM_FORMAT_R8: + return "R8"; + case DRM_FORMAT_GR88: + return "GR88"; + case DRM_FORMAT_NV12: + return "NV12"; + case DRM_FORMAT_YUV420: + return "YUV420"; + case DRM_FORMAT_YVU420: + return "YVU420"; + case DRM_FORMAT_P010: + return "P010"; + case DRM_FORMAT_ARGB8888: + return "ARGB8888"; + case DRM_FORMAT_ABGR8888: + return "ABGR8888"; + case DRM_FORMAT_XRGB8888: + return "XRGB8888"; + case DRM_FORMAT_XBGR8888: + return "XBGR8888"; + default: + return base::StringPrintf("0x%08x", drm_format); + } +} + +std::string GetSurfacePlaneInfo(const base::Lock va_lock, + VADisplay va_display, + uint32_t va_fourcc, + const gfx::Size& size) { + MAYBE_ASSERT_ACQUIRED(va_lock); + unsigned int va_rt_format = VA_RT_FORMAT_YUV420; + if (va_fourcc == VA_FOURCC_P010) { + va_rt_format = VA_RT_FORMAT_YUV420_10BPP; + } + + VASurfaceAttrib attribs[1]; + attribs[0].type = VASurfaceAttribPixelFormat; + attribs[0].flags = VA_SURFACE_ATTRIB_SETTABLE; + attribs[0].value.type = VAGenericValueTypeInteger; + attribs[0].value.value.i = va_fourcc; + + VASurfaceID va_surface_id = VA_INVALID_ID; + VAStatus va_res = vaCreateSurfaces( + va_display, va_rt_format, base::checked_cast(size.width()), + base::checked_cast(size.height()), &va_surface_id, 1, + attribs, 1); + if (va_res != VA_STATUS_SUCCESS) { + return ""; + } + + VADRMPRIMESurfaceDescriptor descriptor; + va_res = vaExportSurfaceHandle( + va_display, va_surface_id, VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, + VA_EXPORT_SURFACE_READ_ONLY \| VA_EXPORT_SURFACE_SEPARATE_LAYERS, + &descriptor); + + std::string info; + if (va_res == VA_STATUS_SUCCESS) { + for (uint32_t i = 0; i < descriptor.num_layers; ++i) { + if (i > 0) { + info += "+"; + } + info += DrmFormatToString(UNSAFE_TODO(descriptor.layers[i].drm_format)); + } + for (uint32_t i = 0; i < descriptor.num_objects; ++i) { + close(UNSAFE_TODO(descriptor.objects[i].fd)); + } + } + + vaDestroySurfaces(va_display, &va_surface_id, 1); + return info; +} } // namespace // These values are logged to UMA. Entries should not be renumbered and numeric @@ -697,8 +783,7 @@ bool IsModeDecoding(VaapiWrapper::CodecMode mode) { bool IsModeEncoding(VaapiWrapper::CodecMode mode) { return mode == VaapiWrapper::CodecMode::kEncodeConstantBitrate \|\| - mode == - VaapiWrapper::CodecMode::kEncodeConstantQuantizationParameter \|\| + mode == VaapiWrapper::kEncodeConstantQuantizationParameter \|\| mode == VaapiWrapper::CodecMode::kEncodeVariableBitrate; } @@ -1062,6 +1147,10 @@ class VASupportedProfiles { VAProfile va_profile, VAEntrypoint va_entrypoint = kVAEntrypointInvalid) const; + const VaapiWrapper::SupportedVAAPIInfo& GetVaapiInfo() const { + return vaapi_info_structured_; + } + private: friend class base::NoDestructor; @@ -1093,12 +1182,15 @@ class VASupportedProfiles { VaapiWrapper::kCodecModeMax, "\|supported_profiles_\| size is incorrect."); + VaapiWrapper::SupportedVAAPIInfo vaapi_info_structured_; + const ReportErrorToUMACB report_error_to_uma_cb_; }; // static const VASupportedProfiles& VASupportedProfiles::Get() { static const base::NoDestructor profile_infos; + LOG(ERROR) << "Getting profile info"; return profile_infos; } @@ -1123,6 +1215,7 @@ VASupportedProfiles::VASupportedProfiles() : report_error_to_uma_cb_(base::DoNothing()) { VADisplayStateHandle display_state = VADisplayStateSingleton::GetHandle(); if (!display_state) { + LOG(ERROR) << "Could not get VADisplayState Handle"; return; } @@ -1199,6 +1292,94 @@ void VASupportedProfiles::FillSupportedProfileInfos( UNSAFE_TODO(supported_profiles_[static_cast(mode)]) = supported_profile_infos; } + + for (const auto& info : + UNSAFE_TODO(supported_profiles_[VaapiWrapper::kVideoProcess])) { + std::string formats_str; + for (const auto& format : info.pixel_formats) { + if (!formats_str.empty()) { + formats_str += ", "; + } + auto fourcc = Fourcc::FromVAFourCC(format); + if (fourcc) { + std::string plane_info = GetSurfacePlaneInfo( + va_lock, va_display, format, gfx::Size(128, 128)); + if (plane_info.empty()) { + formats_str += fourcc->ToString(); + } else { + formats_str += base::StringPrintf( + "%s (%s)", fourcc->ToString().c_str(), plane_info.c_str()); + } + } + } + VaapiWrapper::SupportedVAAPIProfile profile; + profile.profile_name = vaProfileStr(info.va_profile); + profile.resolution_range = + base::StringPrintf("[%s - %s]", info.min_resolution.ToString().c_str(), + info.max_resolution.ToString().c_str()); + profile.formats = formats_str; + vaapi_info_structured_.vpp_supported_profiles.push_back(profile); + } + + for (VaapiWrapper::CodecMode mode : kWrapperModes) { + if (UNSAFE_TODO(supported_profiles_[static_cast(mode)]).empty()) { + continue; + } + std::vector profile_list = nullptr; + if (mode == VaapiWrapper::kDecode) { + profile_list = &vaapi_info_structured_.decode_supported_profiles; + } else if (mode == VaapiWrapper::kEncodeConstantBitrate \|\| + mode == VaapiWrapper::kEncodeConstantQuantizationParameter \|\| + mode == VaapiWrapper::kEncodeVariableBitrate) { + profile_list = &vaapi_info_structured_.encode_supported_profiles; + } else { + continue; + } + + for (const auto& info : + UNSAFE_TODO(supported_profiles_[static_cast(mode)])) { + std::string formats_str; + bool supports_nv12_or_p010 = false; + for (const auto& format : info.pixel_formats) { + if (!formats_str.empty()) { + formats_str += ", "; + } + auto fourcc = Fourcc::FromVAFourCC(format); + if (fourcc) { + std::string plane_info = GetSurfacePlaneInfo( + va_lock, va_display, format, gfx::Size(128, 128)); + if (plane_info.empty()) { + formats_str += fourcc->ToString(); + } else { + formats_str += base::StringPrintf( + "%s (%s)", fourcc->ToString().c_str(), plane_info.c_str()); + } + if (fourcc == Fourcc(Fourcc::NV12) \|\| + fourcc == Fourcc(Fourcc::P010)) { + supports_nv12_or_p010 = true; + } + } else { + formats_str += base::StringPrintf("0x%08x", format); + } + } + + std::string profile_str = info.va_profile == VAProfileNone + ? "None" + : vaProfileStr(info.va_profile); + std::string resolution_range = base::StringPrintf( + "[%s - %s]", info.min_resolution.ToString().c_str(), + info.max_resolution.ToString().c_str()); + std::string ExtraInfo = + (mode != VaapiWrapper::kVideoProcess && !supports_nv12_or_p010) + ? " [picture processing needed]" + : ""; + VaapiWrapper::SupportedVAAPIProfile supported_profile; + supported_profile.profile_name = profile_str; + supported_profile.resolution_range = resolution_range; + supported_profile.formats = formats_str + ExtraInfo; + profile_list->push_back(supported_profile); + } + } } bool VASupportedProfiles::FillProfileInfo_Locked( @@ -1907,8 +2088,9 @@ VaapiWrapper::GetSupportedDecodeProfiles() { const VASupportedProfiles::ProfileInfo* profile_info = VASupportedProfiles::Get().IsProfileSupported(kDecode, va_profile); - if (!profile_info) + if (!profile_info) { continue; + } VideoDecodeAccelerator::SupportedProfile profile; profile.profile = media_profile; @@ -1919,6 +2101,11 @@ VaapiWrapper::GetSupportedDecodeProfiles() { return profiles; } +// static +VaapiWrapper::SupportedVAAPIInfo VaapiWrapper::GetSupportInformation() { + return VASupportedProfiles::Get().GetVaapiInfo(); +} + // static bool VaapiWrapper::IsDecodeSupported(VAProfile va_profile) { return VASupportedProfiles::Get().IsProfileSupported(kDecode, va_profile); diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h index cd1be5d824baa..e67ce01f4dfd5 100644 --- a/media/gpu/vaapi/vaapi_wrapper.h +++ b/media/gpu/vaapi/vaapi_wrapper.h @@ -252,6 +252,29 @@ class MEDIA_GPU_EXPORT VaapiWrapper // Return the supported video decode profiles. static VideoDecodeAccelerator::SupportedProfiles GetSupportedDecodeProfiles(); + struct SupportedVAAPIProfile { + SupportedVAAPIProfile(); + SupportedVAAPIProfile(const SupportedVAAPIProfile&); + ~SupportedVAAPIProfile(); + + std::string profile_name; + std::string resolution_range; + std::string formats; + }; + + struct SupportedVAAPIInfo { + SupportedVAAPIInfo(); + SupportedVAAPIInfo(const SupportedVAAPIInfo&); + ~SupportedVAAPIInfo(); + + std::vector decode_supported_profiles; + std::vector encode_supported_profiles; + std::vector vpp_supported_profiles; + }; + + // Returns all VA-API support information in a structured format. + static SupportedVAAPIInfo GetSupportInformation(); + // Return true when decoding using \|va_profile\| is supported. static bool IsDecodeSupported(VAProfile va_profile); diff --git a/ui/gfx/gpu_extra_info.cc b/ui/gfx/gpu_extra_info.cc index 0b6c77b28e742..d84601cbcc054 100644 --- a/ui/gfx/gpu_extra_info.cc +++ b/ui/gfx/gpu_extra_info.cc @@ -13,6 +13,15 @@ ANGLEFeature::~ANGLEFeature() = default; ANGLEFeature& ANGLEFeature::operator=(const ANGLEFeature& other) = default; ANGLEFeature& ANGLEFeature::operator=(ANGLEFeature&& other) = default; +#if BUILDFLAG(IS_LINUX) +VaapiVideoAcceleratorSupportedProfile::VaapiVideoAcceleratorSupportedProfile() = + default; +VaapiVideoAcceleratorSupportedProfile::VaapiVideoAcceleratorSupportedProfile( + const VaapiVideoAcceleratorSupportedProfile& other) = default; +VaapiVideoAcceleratorSupportedProfile:: + ~VaapiVideoAcceleratorSupportedProfile() = default; +#endif + GpuExtraInfo::GpuExtraInfo() = default; GpuExtraInfo::GpuExtraInfo(const GpuExtraInfo&) = default; GpuExtraInfo::GpuExtraInfo(GpuExtraInfo&&) = default; diff --git a/ui/gfx/gpu_extra_info.h b/ui/gfx/gpu_extra_info.h index 709e7db420849..bb67984d7156c 100644 --- a/ui/gfx/gpu_extra_info.h +++ b/ui/gfx/gpu_extra_info.h @@ -35,6 +35,22 @@ struct COMPONENT_EXPORT(GFX) ANGLEFeature { }; using ANGLEFeatures = std::vector; +#if BUILDFLAG(IS_LINUX) +struct COMPONENT_EXPORT(GFX) VaapiVideoAcceleratorSupportedProfile { + VaapiVideoAcceleratorSupportedProfile(); + VaapiVideoAcceleratorSupportedProfile( + const VaapiVideoAcceleratorSupportedProfile& other); + ~VaapiVideoAcceleratorSupportedProfile(); + + std::string profile_name; + std::string resolution_range; + std::string formats; +}; + +using VaapiVideoAcceleratorSupportedProfiles = + std::vector; +#endif + struct COMPONENT_EXPORT(GFX) GpuExtraInfo { GpuExtraInfo(); GpuExtraInfo(const GpuExtraInfo&); @@ -49,6 +65,9 @@ struct COMPONENT_EXPORT(GFX) GpuExtraInfo { #if BUILDFLAG(IS_LINUX) bool is_gmb_nv12_supported = false; + VaapiVideoAcceleratorSupportedProfiles decode_vaapi_info; + VaapiVideoAcceleratorSupportedProfiles encode_vaapi_info; + VaapiVideoAcceleratorSupportedProfiles vpp_vaapi_info; #endif }; diff --git a/ui/gfx/mojom/gpu_extra_info.mojom b/ui/gfx/mojom/gpu_extra_info.mojom index 6f14de2c34a91..8ddfb9548f25e 100644 --- a/ui/gfx/mojom/gpu_extra_info.mojom +++ b/ui/gfx/mojom/gpu_extra_info.mojom @@ -12,8 +12,24 @@ struct ANGLEFeature { string status; }; +// ui/gfx/gpu_extra_info.h +[EnableIf=is_linux] +struct VaapiVideoAcceleratorSupportedProfile { + string profile_name; + string resolution_range; + string formats; +}; + // gfx:GpuExtraInfo struct GpuExtraInfo { // List of features queried from ANGLE array angle_features; + + // List of VA-API support information + [EnableIf=is_linux] + array decode_vaapi_info; + [EnableIf=is_linux] + array encode_vaapi_info; + [EnableIf=is_linux] + array vpp_vaapi_info; }; diff --git a/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc b/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc index 4407206c90c7c..6ea6b363e8267 100644 --- a/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc +++ b/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc @@ -6,6 +6,16 @@ namespace mojo { +// static +bool StructTraits:: + Read(gfx::mojom::VaapiVideoAcceleratorSupportedProfileDataView data, + gfx::VaapiVideoAcceleratorSupportedProfile* out) { + return data.ReadProfileName(&out->profile_name) && + data.ReadResolutionRange(&out->resolution_range) && + data.ReadFormats(&out->formats); +} + // static bool StructTraits::Read( gfx::mojom::ANGLEFeatureDataView data, @@ -18,8 +28,16 @@ bool StructTraits::Read( bool StructTraits::Read( gfx::mojom::GpuExtraInfoDataView data, gfx::GpuExtraInfo* out) { - if (!data.ReadAngleFeatures(&out->angle_features)) + if (!data.ReadAngleFeatures(&out->angle_features)) { + return false; + } +#if BUILDFLAG(IS_LINUX) + if (!data.ReadDecodeVaapiInfo(&out->decode_vaapi_info) \|\| + !data.ReadEncodeVaapiInfo(&out->encode_vaapi_info) \|\| + !data.ReadVppVaapiInfo(&out->vpp_vaapi_info)) { return false; + } +#endif return true; } diff --git a/ui/gfx/mojom/gpu_extra_info_mojom_traits.h b/ui/gfx/mojom/gpu_extra_info_mojom_traits.h index f5973ddbedb79..7ee120e222126 100644 --- a/ui/gfx/mojom/gpu_extra_info_mojom_traits.h +++ b/ui/gfx/mojom/gpu_extra_info_mojom_traits.h @@ -11,6 +11,30 @@ namespace mojo { +template <> +struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS) + StructTraits { + static bool Read( + gfx::mojom::VaapiVideoAcceleratorSupportedProfileDataView data, + gfx::VaapiVideoAcceleratorSupportedProfile* out); + + static const std::string& profile_name( + const gfx::VaapiVideoAcceleratorSupportedProfile& input) { + return input.profile_name; + } + + static const std::string& resolution_range( + const gfx::VaapiVideoAcceleratorSupportedProfile& input) { + return input.resolution_range; + } + + static const std::string& formats( + const gfx::VaapiVideoAcceleratorSupportedProfile& input) { + return input.formats; + } +}; + template <> struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS) StructTraits { @@ -40,6 +64,21 @@ struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS) const gfx::GpuExtraInfo& input) { return input.angle_features; } + +#if BUILDFLAG(IS_LINUX) + static const gfx::VaapiVideoAcceleratorSupportedProfiles& decode_vaapi_info( + const gfx::GpuExtraInfo& input) { + return input.decode_vaapi_info; + } + static const gfx::VaapiVideoAcceleratorSupportedProfiles& encode_vaapi_info( + const gfx::GpuExtraInfo& input) { + return input.encode_vaapi_info; + } + static const gfx::VaapiVideoAcceleratorSupportedProfiles& vpp_vaapi_info( + const gfx::GpuExtraInfo& input) { + return input.vpp_vaapi_info; + } +#endif }; } // namespace mojo	Download
2026-04-16-01-25-13	`7db299df`	better debug information for vaapi	diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc index 1608e44bc4ec6..f239587bdf975 100644 --- a/media/gpu/vaapi/vaapi_wrapper.cc +++ b/media/gpu/vaapi/vaapi_wrapper.cc @@ -697,11 +697,31 @@ bool IsModeDecoding(VaapiWrapper::CodecMode mode) { bool IsModeEncoding(VaapiWrapper::CodecMode mode) { return mode == VaapiWrapper::CodecMode::kEncodeConstantBitrate \|\| - mode == - VaapiWrapper::CodecMode::kEncodeConstantQuantizationParameter \|\| + mode == VaapiWrapper::kEncodeConstantQuantizationParameter \|\| mode == VaapiWrapper::CodecMode::kEncodeVariableBitrate; } +std::string CodecModeToString(VaapiWrapper::CodecMode mode) { + switch (mode) { + case VaapiWrapper::CodecMode::kDecode: + return "Decode"; +#if BUILDFLAG(IS_CHROMEOS) + case VaapiWrapper::CodecMode::kDecodeProtected: + return "DecodeProtected"; +#endif + case VaapiWrapper::CodecMode::kEncodeConstantBitrate: + return "EncodeConstantBitrate"; + case VaapiWrapper::CodecMode::kEncodeConstantQuantizationParameter: + return "EncodeConstantQuantizationParameter"; + case VaapiWrapper::CodecMode::kEncodeVariableBitrate: + return "EncodeVariableBitrate"; + case VaapiWrapper::CodecMode::kVideoProcess: + return "VideoProcess"; + case VaapiWrapper::CodecMode::kCodecModeMax: + NOTREACHED(); + } +} + // Fill VAImage's non-visible area with 0s. void FillNV12Padding(const VAImage& image, const gfx::Size& visible_size, @@ -1099,6 +1119,7 @@ class VASupportedProfiles { // static const VASupportedProfiles& VASupportedProfiles::Get() { static const base::NoDestructor profile_infos; + LOG(ERROR) << "Getting profile info"; return profile_infos; } @@ -1123,6 +1144,7 @@ VASupportedProfiles::VASupportedProfiles() : report_error_to_uma_cb_(base::DoNothing()) { VADisplayStateHandle display_state = VADisplayStateSingleton::GetHandle(); if (!display_state) { + LOG(ERROR) << "Could not get VADisplayState Handle"; return; } @@ -1199,6 +1221,53 @@ void VASupportedProfiles::FillSupportedProfileInfos( UNSAFE_TODO(supported_profiles_[static_cast(mode)]) = supported_profile_infos; } + + LOG(ERROR) + << "VA-API Video Acceleration Picture Process (VPP) supported: " + << (UNSAFE_TODO(supported_profiles_[VaapiWrapper::kVideoProcess]).empty() + ? "false" + : "true"); + + for (VaapiWrapper::CodecMode mode : kWrapperModes) { + if (UNSAFE_TODO(supported_profiles_[static_cast(mode)]).empty()) { + continue; + } + LOG(ERROR) << "VA-API " << CodecModeToString(mode) + << " supported profiles:"; + for (const auto& info : + UNSAFE_TODO(supported_profiles_[static_cast(mode)])) { + std::string formats_str; + bool supports_nv12_or_p010 = false; + for (const auto& format : info.pixel_formats) { + if (!formats_str.empty()) { + formats_str += ", "; + } + auto fourcc = Fourcc::FromVAFourCC(format); + if (fourcc) { + formats_str += fourcc->ToString(); + if (fourcc == Fourcc(Fourcc::NV12) \|\| + *fourcc == Fourcc(Fourcc::P010)) { + supports_nv12_or_p010 = true; + } + } else { + formats_str += base::StringPrintf("0x%08x", format); + } + } + + std::string profile_str = info.va_profile == VAProfileNone + ? "None" + : vaProfileStr(info.va_profile); + LOG(ERROR) << " " << profile_str + << " (entrypoint: " << vaEntrypointStr(info.va_entrypoint) + << "): resolutions: [" << info.min_resolution.ToString() + << " - " << info.max_resolution.ToString() << "], formats: [" + << formats_str << "]" + << ((mode != VaapiWrapper::kVideoProcess && + !supports_nv12_or_p010) + ? " [picture processing needed]" + : ""); + } + } } bool VASupportedProfiles::FillProfileInfo_Locked(	Download

Date

Commit

Notes

Patch

linux
arm64

2026-05-01-23-08-27

a7952cfa

vaapi improvements

long patch can't be rendered! sorry!

Download

2026-04-30-22-47-41

a7952cfa

More detailed logging - suss out the errors

diff --git a/media/base/media_serializers.h b/media/base/media_serializers.h
index edfd803a4f759..82466b68e4f28 100644
--- a/media/base/media_serializers.h
+++ b/media/base/media_serializers.h
@@ -445,8 +445,11 @@ struct MediaSerializerDebug> {
   static base::Value Serialize(const TypedStatus& status) {
     // TODO: replace this with some kind of static "description"
     // of the default type, instead of "Ok".
-    if (status.is_ok())
-      return base::Value("Ok");
+    if constexpr (requires(TypedStatus& t) { t.is_ok(); }) {
+      if (status.is_ok()) {
+        return base::Value("Ok");
+      }
+    }
     return MediaSerialize(status.data_);
   }
 };
diff --git a/media/base/status.h b/media/base/status.h
index 7a31c8d3eb3a0..9a2dbb727da94 100644
--- a/media/base/status.h
+++ b/media/base/status.h
@@ -119,6 +119,16 @@ struct StatusTraitsHelper {
     }
   }
 
+  static constexpr bool HasOkEnumValue() {
+    if constexpr (requires { &T::OkEnumValue; }) {
+      return true;
+    } else if constexpr (requires { T::Codes::kOk; }) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   static std::string RenderGroupAndCode(T::Codes code) {
     if constexpr (requires { &T::ReadableCodeName; }) {
       return base::StrCat({T::Group(), "::", T::ReadableCodeName(code)});
@@ -229,6 +239,16 @@ class MEDIA_EXPORT TypedStatus {
     AddCause(std::move(cause));
   }
 
+  template 
+  TypedStatus(Codes code,
+              std::string message,
+              std::string data_name,
+              const D& data,
+              const base::Location& location = FROM_HERE)
+      : TypedStatus(code, std::move(message), location) {
+    data_->data.GetDict().Set(std::move(data_name), MediaSerialize(data));
+  }
+
   // Constructor to create a new TypedStatus from a numeric code & message.
   // These are immutable; if you'd like to change them, then you likely should
   // create a new TypedStatus.
@@ -260,7 +280,11 @@ class MEDIA_EXPORT TypedStatus {
     return *this;
   }
 
-  bool is_ok() const { return !data_; }
+  bool is_ok() const
+    requires(internal::StatusTraitsHelper::HasOkEnumValue())
+  {
+    return !data_;
+  }
 
   Codes code() const {
     if (!data_)
@@ -359,11 +383,17 @@ class MEDIA_EXPORT TypedStatus {
     // Create an Or type implicitly from a TypedStatus
     Or(TypedStatus&& error) : error_(std::move(error)) {
       // `error_` must not be ok.
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
     }
 
     Or(const TypedStatus& error) : error_(error) {
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
     }
 
     // Create an Or type implicitly from the alternate O.
@@ -373,7 +403,22 @@ class MEDIA_EXPORT TypedStatus {
     // Create an Or type explicitly from a code
     Or(typename T::Codes code, const base::Location& location = FROM_HERE)
         : error_(TypedStatus(code, "", location)) {
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
+    }
+
+    // Create an Or type explicitly from a code and a cause
+    template 
+    Or(typename T::Codes code,
+       TypedStatus&& cause,
+       const ::base::Location& location = FROM_HERE)
+        : error_(TypedStatus(code, std::move(cause), location)) {
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        CHECK(!error_->is_ok());
+      }
     }
 
     // Create an Or type implicitly from any brace-initializer list that could
@@ -384,7 +429,10 @@ class MEDIA_EXPORT TypedStatus {
        const Rest&... rest,
        const base::Location& location = FROM_HERE)
         : error_(TypedStatus(code, first, rest..., location)) {
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
     }
 
     // Move- and copy- construction and assignment are okay.
diff --git a/media/base/status_unittest.cc b/media/base/status_unittest.cc
index e582031c8f4d3..5579f028a72b7 100644
--- a/media/base/status_unittest.cc
+++ b/media/base/status_unittest.cc
@@ -458,11 +458,9 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultAndNoOk) {
 
   NDStatus foo = NDStatus::Codes::kFoo;
   EXPECT_EQ(foo.code(), NDStatus::Codes::kFoo);
-  EXPECT_FALSE(foo.is_ok());
 
   NDStatus bar = NDStatus::Codes::kBar;
   EXPECT_EQ(bar.code(), NDStatus::Codes::kBar);
-  EXPECT_FALSE(bar.is_ok());
 
   NDStatus::Or err = NDStatus::Codes::kBaz;
   NDStatus::Or ok = std::string("kBaz");
@@ -507,10 +505,6 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultHasOk) {
 }
 
 TEST_F(StatusTest, Okayness) {
-  EXPECT_FALSE(
-      TypedStatus(NoOkStatusTypeTraits::Codes::kFoo)
-          .is_ok());
-
   EXPECT_FALSE(
       TypedStatus(ZeroValueOkTypeTraits::Codes::kFoo)
           .is_ok());
diff --git a/media/gpu/vaapi/vaapi_image_decoder.cc b/media/gpu/vaapi/vaapi_image_decoder.cc
index c87c4798f5e61..baa762db363ae 100644
--- a/media/gpu/vaapi/vaapi_image_decoder.cc
+++ b/media/gpu/vaapi/vaapi_image_decoder.cc
@@ -92,14 +92,16 @@ VaapiImageDecoder::ExportAsNativePixmapDmaBuf(VaapiImageDecodeStatus* status) {
   }
   DCHECK(temp_scoped_va_surface->IsValid());
 
-  std::unique_ptr exported_pixmap =
+  auto maybe_exported_pixmap =
       vaapi_wrapper_->ExportVASurfaceAsNativePixmapDmaBuf(
           *temp_scoped_va_surface);
-  if (!exported_pixmap) {
+
+  if (!maybe_exported_pixmap.has_value()) {
     *status = VaapiImageDecodeStatus::kCannotExportSurface;
     return nullptr;
   }
 
+  auto exported_pixmap = std::move(maybe_exported_pixmap).value();
   DCHECK_EQ(temp_scoped_va_surface->size(),
             exported_pixmap->pixmap->GetBufferSize());
   *status = VaapiImageDecodeStatus::kSuccess;
diff --git a/media/gpu/vaapi/vaapi_status.h b/media/gpu/vaapi/vaapi_status.h
index a2ab19517b23b..3b5ee3d5b72b8 100644
--- a/media/gpu/vaapi/vaapi_status.h
+++ b/media/gpu/vaapi/vaapi_status.h
@@ -10,7 +10,6 @@
 namespace media {
 
 enum class VaapiStatusCode : StatusCodeType {
-  kOk = 0,
   kBadContext = 1,
   kNoBuffer = 2,
   kNoBufferHandle = 3,
@@ -25,6 +24,7 @@ enum class VaapiStatusCode : StatusCodeType {
   kBadImageSize = 12,
   kNoTexture = 13,
   kUnsupportedProfile = 14,
+  kFailedToExportSurface = 15,
 };
 
 struct VaapiStatusTraits {
diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc
index c39949f9c9448..88bdcd405089d 100644
--- a/media/gpu/vaapi/vaapi_video_decoder.cc
+++ b/media/gpu/vaapi/vaapi_video_decoder.cc
@@ -147,6 +147,10 @@ VaapiVideoDecoder::~VaapiVideoDecoder() {
   // Abort all currently scheduled decode tasks.
   ClearDecodeTaskQueue(DecoderStatus::Codes::kAborted);
 
+  if (pending_init_cb_) {
+    std::move(pending_init_cb_).Run(DecoderStatus::Codes::kAborted);
+  }
+
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Notify |decoder_delegate_| of an imminent VAContextID destruction, so it
@@ -178,12 +182,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(config.IsValidConfig());
 
+  pending_init_cb_ = std::move(init_cb);
+
   // Reinitializing the decoder is allowed if there are no pending decodes.
   if (current_decode_task_ || !decode_task_queue_.empty() ||
       state_ == State::kExpectingReset) {
-    LOG(ERROR)
-        << "Don't call Initialize() while there are pending decode tasks";
-    std::move(init_cb).Run(DecoderStatus::Codes::kFailed);
+    SetState({DecoderStatus::Codes::kFailed,
+              "Failed to initialize with pending decode tasks in flight."});
     return;
   }
 
@@ -229,13 +234,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
 
   if (config.is_encrypted()) {
 #if !BUILDFLAG(IS_CHROMEOS)
-    SetErrorState("encrypted content is not supported");
-    std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode);
+    SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode,
+              "encrypted content is not supported"});
     return;
 #else
     if (!cdm_context || !cdm_context->GetChromeOsCdmContext()) {
-      SetErrorState("cannot support encrypted stream w/out ChromeOsCdmContext");
-      std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode);
+      SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode,
+                "ChromeOsCdmContext required for encrypted streams"});
       return;
     }
     bool encrypted_av1_support = false;
@@ -246,10 +251,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
         config.codec() != VideoCodec::kVP9 &&
         (config.codec() != VideoCodec::kAV1 || !encrypted_av1_support) &&
         config.codec() != VideoCodec::kHEVC) {
-      SetErrorState(
-          base::StringPrintf("%s is not supported for encrypted content",
-                             GetCodecName(config.codec()).c_str()));
-      std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode);
+      DecoderStatus error = {DecoderStatus::Codes::kUnsupportedEncryptionMode,
+                             "Codec not supported for encrypted content"};
+      SetState(std::move(error).WithData("codec", config.codec()));
       return;
     }
     cdm_event_cb_registration_ = cdm_context->RegisterEventCB(
@@ -279,10 +283,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
     UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.VaapiWrapperCreationSuccess",
                           vaapi_wrapper_or_error.has_value());
     if (!vaapi_wrapper_or_error.has_value()) {
-      SetErrorState(base::StringPrintf(
-          "failed initializing VaapiWrapper for profile %s, ",
-          GetProfileName(profile).c_str()));
-      std::move(init_cb).Run(vaapi_wrapper_or_error.error());
+      SetState(std::move(vaapi_wrapper_or_error)
+                   .error()
+                   .WithData("profile", profile));
       return;
     }
     vaapi_wrapper_ = std::move(vaapi_wrapper_or_error.value());
@@ -296,10 +299,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
 
   if (!IsConfiguredForTesting()) {
     auto accel_status = CreateAcceleratedVideoDecoder();
-    if (!accel_status.is_ok()) {
-      SetErrorState("failed to create decoder delegate");
-      std::move(init_cb).Run(DecoderStatus(DecoderStatus::Codes::kFailed)
-                                 .AddCause(std::move(accel_status)));
+    if (!accel_status.has_value()) {
+      SetState(
+          {DecoderStatus::Codes::kFailed, std::move(accel_status).error()});
       return;
     }
   }
@@ -311,7 +313,7 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
   SetState(State::kWaitingForInput);
 
   // Notify client initialization was successful.
-  std::move(init_cb).Run(DecoderStatus::Codes::kOk);
+  std::move(pending_init_cb_).Run(DecoderStatus::Codes::kOk);
 }
 
 void VaapiVideoDecoder::OnCdmContextEvent(CdmContext::Event event) {
@@ -428,7 +430,7 @@ void VaapiVideoDecoder::HandleDecodeTask() {
       break;
     case AcceleratedVideoDecoder::kDecodeError:
       UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.DecodeError", true);
-      SetErrorState("error decoding stream");
+      SetState({DecoderStatus::Codes::kFailed, "error decoding stream"});
       break;
     case AcceleratedVideoDecoder::kTryAgain:
       DVLOG(1) << "Decoder going into the waiting for protected state";
@@ -453,11 +455,13 @@ void VaapiVideoDecoder::HandleDecodeTask() {
           allocated_va_surfaces_.clear();
           const gfx::Size decoder_pic_size = decoder_->GetPicSize();
           if (decoder_pic_size.IsEmpty()) {
-            SetErrorState("|decoder_| returned an empty picture size");
+            SetState({DecoderStatus::Codes::kFailed,
+                      "decode() produced an empty picture size."});
             return;
           }
           if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) {
-            SetErrorState("failed creating VAContext");
+            SetState(
+                {DecoderStatus::Codes::kFailed, "Failed to create VAContext"});
             return;
           }
         }
@@ -510,7 +514,8 @@ std::unique_ptr VaapiVideoDecoder::CreateSurface() {
         vaapi_wrapper_->CreateVASurfaceForFrameResource(
             *frame, cdm_context_ref_ || transcryption_);
     if (!va_surface || va_surface->id() == VA_INVALID_ID) {
-      SetErrorState("failed to create VASurface from FrameResource");
+      SetState({DecoderStatus::Codes::kFailed,
+                "Failed to create VASurface from FrameResource"});
       return nullptr;
     }
     const auto result = allocated_va_surfaces_.insert_or_assign(
@@ -670,7 +675,9 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
   const std::optional format =
       GetPixelFormatForBitDepth(bit_depth);
   if (!format) {
-    SetErrorState(base::StringPrintf("unsupported bit depth: %d", bit_depth));
+    DecoderStatus status = {DecoderStatus::Codes::kFailed,
+                            "Unsupported attribute", "bit_depth", bit_depth};
+    SetState(std::move(status));
     return;
   }
 
@@ -687,7 +694,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
   const gfx::Rect decoder_visible_rect = decoder_->GetVisibleRect();
   const gfx::Size decoder_pic_size = decoder_->GetPicSize();
   if (decoder_pic_size.IsEmpty()) {
-    SetErrorState("|decoder_| returned an empty picture size");
+    SetState({DecoderStatus::Codes::kFailed,
+              "decode() returned an empty picture size"});
     return;
   }
   gfx::Rect output_visible_rect = decoder_visible_rect;
@@ -775,7 +783,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
                                 "Media.VaapiVideoDecoder.VAAPIError"))
             .value_or(nullptr);
     if (!new_vaapi_wrapper.get()) {
-      SetErrorState("failed (re)creating VaapiWrapper");
+      SetState({DecoderStatus::Codes::kFailed,
+                "Failed to create or set up the vaapi wrapper"});
       return;
     }
     decoder_delegate_->set_vaapi_wrapper(new_vaapi_wrapper.get());
@@ -783,7 +792,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
   }
 
   if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) {
-    SetErrorState("failed creating VAContext");
+    SetState({DecoderStatus::Codes::kFailed, "Failed to create the VAContext"});
     return;
   }
 
@@ -811,7 +820,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
       cdm_context_ref_ ? gfx::BufferUsage::PROTECTED_SCANOUT_VDA_WRITE
                        : gfx::BufferUsage::SCANOUT_VDA_WRITE);
   if (!dummy_frame) {
-    SetErrorState("failed to allocate a dummy buffer");
+    SetState(
+        {DecoderStatus::Codes::kFailed, "failed to allocate a dummy buffer"});
     return;
   }
 
@@ -838,8 +848,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
       DVLOGF(2) << "The frame pool initialization is aborted";
       SetState(State::kExpectingReset);
     } else {
-      // TODO(crbug.com/40139291): don't drop the error on the floor here.
-      SetErrorState("failed Initialize()ing the frame pool");
+      SetState(
+          {DecoderStatus::Codes::kFailed, std::move(status_or_layout).error()});
     }
     return;
   }
@@ -913,16 +923,20 @@ VaapiVideoDecoder::AllocateCustomFrame(VideoPixelFormat format,
 
   if (!surface)
     return CroStatus::Codes::kFailedToCreateVideoFrame;
-  auto pixmap_and_info =
+  auto maybe_pixmap_and_info =
       vaapi_wrapper_->ExportVASurfaceAsNativePixmapDmaBuf(*surface.get());
-  if (!pixmap_and_info)
-    return CroStatus::Codes::kFailedToCreateVideoFrame;
+  if (!maybe_pixmap_and_info.has_value()) {
+    return {CroStatus::Codes::kFailedToCreateVideoFrame,
+            std::move(maybe_pixmap_and_info).error()};
+  }
 
+  auto pixmap_and_info = std::move(maybe_pixmap_and_info).value();
   scoped_refptr frame = NativePixmapFrameResource::Create(
       visible_rect, natural_size, timestamp,
       gfx::BufferUsage::SCANOUT_VDA_WRITE, std::move(pixmap_and_info->pixmap));
-  if (!frame)
+  if (!frame) {
     return CroStatus::Codes::kFailedToCreateVideoFrame;
+  }
 
   allocated_va_surfaces_.insert_or_assign(frame->tracking_token(),
                                           std::move(surface));
@@ -1002,13 +1016,14 @@ void VaapiVideoDecoder::ProtectedSessionUpdate(bool success) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (!success) {
-    SetErrorState("terminating decoding after failed protected update");
+    SetState({DecoderStatus::Codes::kFailed, "Protected update failed"});
     return;
   }
 
   // If we were waiting for a protected update, retry the current decode task.
-  if (state_ != State::kWaitingForProtected)
+  if (state_ != State::kWaitingForProtected) {
     return;
+  }
 
   DCHECK(current_decode_task_);
   SetState(State::kDecoding);
@@ -1028,7 +1043,7 @@ void VaapiVideoDecoder::Flush() {
   // Flush will block until SurfaceReady() has been called for every frame
   // currently decoding.
   if (!decoder_->Flush()) {
-    SetErrorState("failed to flush the decoder delegate");
+    SetState({DecoderStatus::Codes::kFailed, "Failed to flush the decoder"});
     return;
   }
 
@@ -1067,8 +1082,9 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) {
     // Also give a chance to |decoder_delegate_| to release its internal data
     // structures.
     decoder_delegate_->OnVAContextDestructionSoon();
-    if (!CreateAcceleratedVideoDecoder().is_ok()) {
-      SetErrorState("failed to (re)create decoder/delegate");
+    auto status = CreateAcceleratedVideoDecoder();
+    if (!status.has_value()) {
+      SetState({DecoderStatus::Codes::kFailed, std::move(status).error()});
       std::move(reset_cb).Run();
       return;
     }
@@ -1088,7 +1104,8 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) {
                                 std::move(reset_cb)));
 }
 
-VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() {
+VaapiStatus::Or
+VaapiVideoDecoder::CreateAcceleratedVideoDecoder() {
   DVLOGF(2);
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(state_ == State::kUninitialized ||
@@ -1152,10 +1169,13 @@ VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() {
     decoder_ = std::make_unique(std::move(accelerator), profile_,
                                             color_space_);
   } else {
-    return VaapiStatus(VaapiStatus::Codes::kUnsupportedProfile)
-        .WithData("profile", profile_);
+    VaapiStatus status = {VaapiStatus::Codes::kUnsupportedProfile,
+                          "unsupported configuration", "profile", profile_};
+    return status;
   }
-  return VaapiStatus::Codes::kOk;
+
+  std::monostate nothing;
+  return nothing;
 }
 
 void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) {
@@ -1169,10 +1189,22 @@ void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) {
   SetState(State::kWaitingForInput);
 }
 
-void VaapiVideoDecoder::SetState(State state) {
+void VaapiVideoDecoder::SetState(DecoderStatus::Or state_or_error) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DVLOGF(3) << static_cast(state)
-            << ", current state: " << static_cast(state_);
+  if (!state_or_error.has_value()) {
+    state_ = State::kError;
+    if (pending_init_cb_) {
+      CHECK(!current_decode_task_ && decode_task_queue_.empty());
+      std::move(pending_init_cb_).Run(std::move(state_or_error).error());
+    } else {
+      ClearDecodeTaskQueue(std::move(state_or_error).error());
+    }
+    return;
+  }
+
+  State state = std::move(state_or_error).value();
+  DVLOGF(3) << "Vaapi State change {" << static_cast(state_) << "} => {"
+            << static_cast(state) << "}";
 
   // Check whether the state change is valid.
   switch (state) {
@@ -1213,18 +1245,11 @@ void VaapiVideoDecoder::SetState(State state) {
       DCHECK_EQ(state_, State::kChangingResolution);
       break;
     case State::kError:
-      ClearDecodeTaskQueue(DecoderStatus::Codes::kFailed);
-      break;
+      // Error should be handled by passing in a DecoderStatus.
+      NOTREACHED();
   }
 
   state_ = state;
 }
 
-void VaapiVideoDecoder::SetErrorState(std::string message) {
-  LOG(ERROR) << message;
-  if (media_log_)
-    MEDIA_LOG(ERROR, media_log_) << "VaapiVideoDecoder: " << message;
-  SetState(State::kError);
-}
-
 }  // namespace media
diff --git a/media/gpu/vaapi/vaapi_video_decoder.h b/media/gpu/vaapi/vaapi_video_decoder.h
index 381f0f8b3c269..af24707ede5dd 100644
--- a/media/gpu/vaapi/vaapi_video_decoder.h
+++ b/media/gpu/vaapi/vaapi_video_decoder.h
@@ -159,14 +159,11 @@ class VaapiVideoDecoder : public VideoDecoderMixin,
   void ResetDone(base::OnceClosure reset_cb);
 
   // Create codec-specific AcceleratedVideoDecoder and reset related variables.
-  VaapiStatus CreateAcceleratedVideoDecoder();
+  VaapiStatus::Or CreateAcceleratedVideoDecoder();
 
-  // Change the current |state_| to the specified |state|.
-  void SetState(State state);
-
-  // Tell SetState() to change the |state_| to kError and send |message| to
-  // MediaLog and to LOG(ERROR).
-  void SetErrorState(std::string message);
+  // Change the current `state_` to the specified `state`. Iff the new state is
+  // an error, report the error to all pending decode and init tasks.
+  void SetState(DecoderStatus::Or state);
 
   // Callback for the CDM to notify |this|.
   void OnCdmContextEvent(CdmContext::Event event);
@@ -208,6 +205,9 @@ class VaapiVideoDecoder : public VideoDecoderMixin,
     return !!vaapi_wrapper_ && !!decoder_;
   }
 
+  // We can cancel the pending init during error handling if need be.
+  InitCB pending_init_cb_ GUARDED_BY_CONTEXT(sequence_checker_);
+
   // The video decoder's state.
   State state_ GUARDED_BY_CONTEXT(sequence_checker_) = State::kUninitialized;
 
diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
index 1608e44bc4ec6..a77f0d1299198 100644
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -2597,7 +2597,7 @@ std::unique_ptr VaapiWrapper::CreateVASurfaceWithUsageHints(
                                            va_rt_format);
 }
 
-std::unique_ptr
+VaapiStatus::Or>
 VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped(
     VASurfaceID va_surface_id,
     const gfx::Size& va_surface_size) {
@@ -2608,13 +2608,14 @@ VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped(
   {
     base::AutoLockMaybe auto_lock(va_lock_.get());
     VAStatus va_res = vaSyncSurface(va_display_, va_surface_id);
-    VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVASyncSurface, nullptr);
+    VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVASyncSurface,
+                         VaapiStatus::Codes::kNoSurface);
     va_res = vaExportSurfaceHandle(
         va_display_, va_surface_id, VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
         VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
         &descriptor);
     VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVAExportSurfaceHandle,
-                         nullptr);
+                         VaapiStatus::Codes::kFailedToExportSurface);
   }
 
   // Translate the pixel format to a viz::SharedImageFormat.
@@ -2639,9 +2640,9 @@ VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped(
       si_format = viz::SinglePlaneFormat::kBGRA_8888;
       break;
     default:
-      LOG(ERROR) << "Cannot export a surface with FOURCC "
-                 << FourccToString(descriptor.fourcc);
-      return nullptr;
+      return VaapiStatus{VaapiStatus::Codes::kFailedToExportSurface,
+                         "Cannot export surface with unknown FOURCC", "fourcc",
+                         FourccToString(descriptor.fourcc)};
   }
 
   gfx::NativePixmapHandle handle;
@@ -2704,24 +2705,24 @@ VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBufUnwrapped(
       base::strict_cast(descriptor.objects[0].size);
   if (!gfx::Rect(exported_pixmap->va_surface_resolution)
            .Contains(gfx::Rect(va_surface_size))) {
-    LOG(ERROR) << "A " << va_surface_size.ToString()
-               << " surface cannot be contained by a "
-               << exported_pixmap->va_surface_resolution.ToString()
-               << " buffer";
-    return nullptr;
+    VaapiStatus error = {VaapiStatus::Codes::kFailedToExportSurface,
+                         "Surface is too large for buffer"};
+    return std::move(error)
+        .WithData("surface_size", va_surface_size.ToString())
+        .WithData("buffer_size",
+                  exported_pixmap->va_surface_resolution.ToString());
   }
   exported_pixmap->pixmap = base::MakeRefCounted(
       va_surface_size, si_format, std::move(handle));
   return exported_pixmap;
 }
 
-std::unique_ptr
+VaapiStatus::Or>
 VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBuf(
     const ScopedVASurface& scoped_va_surface) {
   VAAPI_CHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!scoped_va_surface.IsValid()) {
-    LOG(ERROR) << "Cannot export an invalid surface";
-    return nullptr;
+    return VaapiStatus::Codes::kFailedToExportSurface;
   }
   return ExportVASurfaceAsNativePixmapDmaBufUnwrapped(scoped_va_surface.id(),
                                                       scoped_va_surface.size());
diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
index cd1be5d824baa..484fd0d79ef8f 100644
--- a/media/gpu/vaapi/vaapi_wrapper.h
+++ b/media/gpu/vaapi/vaapi_wrapper.h
@@ -33,6 +33,7 @@
 #include "build/build_config.h"
 #include "media/gpu/chromeos/fourcc.h"
 #include "media/gpu/media_gpu_export.h"
+#include "media/gpu/vaapi/vaapi_status.h"
 #include "media/gpu/vaapi/vaapi_utils.h"
 #include "media/video/video_decode_accelerator.h"
 #include "media/video/video_encode_accelerator.h"
@@ -459,8 +460,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper
   // Implementations of the pixmap exporter for both types of VASurface.
   // See ExportVASurfaceAsNativePixmapDmaBufUnwrapped() for further
   // documentation.
-  std::unique_ptr ExportVASurfaceAsNativePixmapDmaBuf(
-      const ScopedVASurface& scoped_va_surface);
+  VaapiStatus::Or>
+  ExportVASurfaceAsNativePixmapDmaBuf(const ScopedVASurface& scoped_va_surface);
 
   // Synchronize the VASurface explicitly. This is useful when sharing a surface
   // between contexts.
@@ -657,7 +658,7 @@ class MEDIA_GPU_EXPORT VaapiWrapper
   //
   // Returns nullptr on failure, or if the exported surface can't contain
   // |va_surface_size|.
-  std::unique_ptr
+  VaapiStatus::Or>
   ExportVASurfaceAsNativePixmapDmaBufUnwrapped(
       VASurfaceID va_surface_id,
       const gfx::Size& va_surface_size);

Download

2026-04-30-22-20-30

a7952cfa

Built With New VAAPI errors

diff --git a/media/base/media_serializers.h b/media/base/media_serializers.h
index edfd803a4f759..82466b68e4f28 100644
--- a/media/base/media_serializers.h
+++ b/media/base/media_serializers.h
@@ -445,8 +445,11 @@ struct MediaSerializerDebug> {
   static base::Value Serialize(const TypedStatus& status) {
     // TODO: replace this with some kind of static "description"
     // of the default type, instead of "Ok".
-    if (status.is_ok())
-      return base::Value("Ok");
+    if constexpr (requires(TypedStatus& t) { t.is_ok(); }) {
+      if (status.is_ok()) {
+        return base::Value("Ok");
+      }
+    }
     return MediaSerialize(status.data_);
   }
 };
diff --git a/media/base/status.h b/media/base/status.h
index 7a31c8d3eb3a0..9a2dbb727da94 100644
--- a/media/base/status.h
+++ b/media/base/status.h
@@ -119,6 +119,16 @@ struct StatusTraitsHelper {
     }
   }
 
+  static constexpr bool HasOkEnumValue() {
+    if constexpr (requires { &T::OkEnumValue; }) {
+      return true;
+    } else if constexpr (requires { T::Codes::kOk; }) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   static std::string RenderGroupAndCode(T::Codes code) {
     if constexpr (requires { &T::ReadableCodeName; }) {
       return base::StrCat({T::Group(), "::", T::ReadableCodeName(code)});
@@ -229,6 +239,16 @@ class MEDIA_EXPORT TypedStatus {
     AddCause(std::move(cause));
   }
 
+  template 
+  TypedStatus(Codes code,
+              std::string message,
+              std::string data_name,
+              const D& data,
+              const base::Location& location = FROM_HERE)
+      : TypedStatus(code, std::move(message), location) {
+    data_->data.GetDict().Set(std::move(data_name), MediaSerialize(data));
+  }
+
   // Constructor to create a new TypedStatus from a numeric code & message.
   // These are immutable; if you'd like to change them, then you likely should
   // create a new TypedStatus.
@@ -260,7 +280,11 @@ class MEDIA_EXPORT TypedStatus {
     return *this;
   }
 
-  bool is_ok() const { return !data_; }
+  bool is_ok() const
+    requires(internal::StatusTraitsHelper::HasOkEnumValue())
+  {
+    return !data_;
+  }
 
   Codes code() const {
     if (!data_)
@@ -359,11 +383,17 @@ class MEDIA_EXPORT TypedStatus {
     // Create an Or type implicitly from a TypedStatus
     Or(TypedStatus&& error) : error_(std::move(error)) {
       // `error_` must not be ok.
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
     }
 
     Or(const TypedStatus& error) : error_(error) {
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
     }
 
     // Create an Or type implicitly from the alternate O.
@@ -373,7 +403,22 @@ class MEDIA_EXPORT TypedStatus {
     // Create an Or type explicitly from a code
     Or(typename T::Codes code, const base::Location& location = FROM_HERE)
         : error_(TypedStatus(code, "", location)) {
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
+    }
+
+    // Create an Or type explicitly from a code and a cause
+    template 
+    Or(typename T::Codes code,
+       TypedStatus&& cause,
+       const ::base::Location& location = FROM_HERE)
+        : error_(TypedStatus(code, std::move(cause), location)) {
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        CHECK(!error_->is_ok());
+      }
     }
 
     // Create an Or type implicitly from any brace-initializer list that could
@@ -384,7 +429,10 @@ class MEDIA_EXPORT TypedStatus {
        const Rest&... rest,
        const base::Location& location = FROM_HERE)
         : error_(TypedStatus(code, first, rest..., location)) {
-      DCHECK(!error_->is_ok());
+      if constexpr (internal::StatusTraitsHelper::HasOkEnumValue()) {
+        // `error_` must not be ok.
+        DCHECK(!error_->is_ok());
+      }
     }
 
     // Move- and copy- construction and assignment are okay.
diff --git a/media/base/status_unittest.cc b/media/base/status_unittest.cc
index e582031c8f4d3..5579f028a72b7 100644
--- a/media/base/status_unittest.cc
+++ b/media/base/status_unittest.cc
@@ -458,11 +458,9 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultAndNoOk) {
 
   NDStatus foo = NDStatus::Codes::kFoo;
   EXPECT_EQ(foo.code(), NDStatus::Codes::kFoo);
-  EXPECT_FALSE(foo.is_ok());
 
   NDStatus bar = NDStatus::Codes::kBar;
   EXPECT_EQ(bar.code(), NDStatus::Codes::kBar);
-  EXPECT_FALSE(bar.is_ok());
 
   NDStatus::Or err = NDStatus::Codes::kBaz;
   NDStatus::Or ok = std::string("kBaz");
@@ -507,10 +505,6 @@ TEST_F(StatusTest, TypedStatusWithNoDefaultHasOk) {
 }
 
 TEST_F(StatusTest, Okayness) {
-  EXPECT_FALSE(
-      TypedStatus(NoOkStatusTypeTraits::Codes::kFoo)
-          .is_ok());
-
   EXPECT_FALSE(
       TypedStatus(ZeroValueOkTypeTraits::Codes::kFoo)
           .is_ok());
diff --git a/media/gpu/vaapi/vaapi_status.h b/media/gpu/vaapi/vaapi_status.h
index a2ab19517b23b..460370aea8be2 100644
--- a/media/gpu/vaapi/vaapi_status.h
+++ b/media/gpu/vaapi/vaapi_status.h
@@ -10,7 +10,6 @@
 namespace media {
 
 enum class VaapiStatusCode : StatusCodeType {
-  kOk = 0,
   kBadContext = 1,
   kNoBuffer = 2,
   kNoBufferHandle = 3,
diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc
index c39949f9c9448..54838e260eadd 100644
--- a/media/gpu/vaapi/vaapi_video_decoder.cc
+++ b/media/gpu/vaapi/vaapi_video_decoder.cc
@@ -147,6 +147,10 @@ VaapiVideoDecoder::~VaapiVideoDecoder() {
   // Abort all currently scheduled decode tasks.
   ClearDecodeTaskQueue(DecoderStatus::Codes::kAborted);
 
+  if (pending_init_cb_) {
+    std::move(pending_init_cb_).Run(DecoderStatus::Codes::kAborted);
+  }
+
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Notify |decoder_delegate_| of an imminent VAContextID destruction, so it
@@ -178,12 +182,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(config.IsValidConfig());
 
+  pending_init_cb_ = std::move(init_cb);
+
   // Reinitializing the decoder is allowed if there are no pending decodes.
   if (current_decode_task_ || !decode_task_queue_.empty() ||
       state_ == State::kExpectingReset) {
-    LOG(ERROR)
-        << "Don't call Initialize() while there are pending decode tasks";
-    std::move(init_cb).Run(DecoderStatus::Codes::kFailed);
+    SetState({DecoderStatus::Codes::kFailed,
+              "Failed to initialize with pending decode tasks in flight."});
     return;
   }
 
@@ -229,13 +234,13 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
 
   if (config.is_encrypted()) {
 #if !BUILDFLAG(IS_CHROMEOS)
-    SetErrorState("encrypted content is not supported");
-    std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode);
+    SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode,
+              "encrypted content is not supported"});
     return;
 #else
     if (!cdm_context || !cdm_context->GetChromeOsCdmContext()) {
-      SetErrorState("cannot support encrypted stream w/out ChromeOsCdmContext");
-      std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode);
+      SetState({DecoderStatus::Codes::kUnsupportedEncryptionMode,
+                "ChromeOsCdmContext required for encrypted streams"});
       return;
     }
     bool encrypted_av1_support = false;
@@ -246,10 +251,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
         config.codec() != VideoCodec::kVP9 &&
         (config.codec() != VideoCodec::kAV1 || !encrypted_av1_support) &&
         config.codec() != VideoCodec::kHEVC) {
-      SetErrorState(
-          base::StringPrintf("%s is not supported for encrypted content",
-                             GetCodecName(config.codec()).c_str()));
-      std::move(init_cb).Run(DecoderStatus::Codes::kUnsupportedEncryptionMode);
+      DecoderStatus error = {DecoderStatus::Codes::kUnsupportedEncryptionMode,
+                             "Codec not supported for encrypted content"};
+      SetState(std::move(error).WithData("codec", config.codec()));
       return;
     }
     cdm_event_cb_registration_ = cdm_context->RegisterEventCB(
@@ -279,10 +283,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
     UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.VaapiWrapperCreationSuccess",
                           vaapi_wrapper_or_error.has_value());
     if (!vaapi_wrapper_or_error.has_value()) {
-      SetErrorState(base::StringPrintf(
-          "failed initializing VaapiWrapper for profile %s, ",
-          GetProfileName(profile).c_str()));
-      std::move(init_cb).Run(vaapi_wrapper_or_error.error());
+      SetState(std::move(vaapi_wrapper_or_error)
+                   .error()
+                   .WithData("profile", profile));
       return;
     }
     vaapi_wrapper_ = std::move(vaapi_wrapper_or_error.value());
@@ -296,10 +299,9 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
 
   if (!IsConfiguredForTesting()) {
     auto accel_status = CreateAcceleratedVideoDecoder();
-    if (!accel_status.is_ok()) {
-      SetErrorState("failed to create decoder delegate");
-      std::move(init_cb).Run(DecoderStatus(DecoderStatus::Codes::kFailed)
-                                 .AddCause(std::move(accel_status)));
+    if (!accel_status.has_value()) {
+      SetState(
+          {DecoderStatus::Codes::kFailed, std::move(accel_status).error()});
       return;
     }
   }
@@ -311,7 +313,7 @@ void VaapiVideoDecoder::Initialize(const VideoDecoderConfig& config,
   SetState(State::kWaitingForInput);
 
   // Notify client initialization was successful.
-  std::move(init_cb).Run(DecoderStatus::Codes::kOk);
+  std::move(pending_init_cb_).Run(DecoderStatus::Codes::kOk);
 }
 
 void VaapiVideoDecoder::OnCdmContextEvent(CdmContext::Event event) {
@@ -428,7 +430,7 @@ void VaapiVideoDecoder::HandleDecodeTask() {
       break;
     case AcceleratedVideoDecoder::kDecodeError:
       UMA_HISTOGRAM_BOOLEAN("Media.VaapiVideoDecoder.DecodeError", true);
-      SetErrorState("error decoding stream");
+      SetState({DecoderStatus::Codes::kFailed, "error decoding stream"});
       break;
     case AcceleratedVideoDecoder::kTryAgain:
       DVLOG(1) << "Decoder going into the waiting for protected state";
@@ -453,11 +455,13 @@ void VaapiVideoDecoder::HandleDecodeTask() {
           allocated_va_surfaces_.clear();
           const gfx::Size decoder_pic_size = decoder_->GetPicSize();
           if (decoder_pic_size.IsEmpty()) {
-            SetErrorState("|decoder_| returned an empty picture size");
+            SetState({DecoderStatus::Codes::kFailed,
+                      "decode() produced an empty picture size."});
             return;
           }
           if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) {
-            SetErrorState("failed creating VAContext");
+            SetState(
+                {DecoderStatus::Codes::kFailed, "Failed to create VAContext"});
             return;
           }
         }
@@ -510,7 +514,8 @@ std::unique_ptr VaapiVideoDecoder::CreateSurface() {
         vaapi_wrapper_->CreateVASurfaceForFrameResource(
             *frame, cdm_context_ref_ || transcryption_);
     if (!va_surface || va_surface->id() == VA_INVALID_ID) {
-      SetErrorState("failed to create VASurface from FrameResource");
+      SetState({DecoderStatus::Codes::kFailed,
+                "Failed to create VASurface from FrameResource"});
       return nullptr;
     }
     const auto result = allocated_va_surfaces_.insert_or_assign(
@@ -670,7 +675,9 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
   const std::optional format =
       GetPixelFormatForBitDepth(bit_depth);
   if (!format) {
-    SetErrorState(base::StringPrintf("unsupported bit depth: %d", bit_depth));
+    DecoderStatus status = {DecoderStatus::Codes::kFailed,
+                            "Unsupported attribute", "bit_depth", bit_depth};
+    SetState(std::move(status));
     return;
   }
 
@@ -687,7 +694,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
   const gfx::Rect decoder_visible_rect = decoder_->GetVisibleRect();
   const gfx::Size decoder_pic_size = decoder_->GetPicSize();
   if (decoder_pic_size.IsEmpty()) {
-    SetErrorState("|decoder_| returned an empty picture size");
+    SetState({DecoderStatus::Codes::kFailed,
+              "decode() returned an empty picture size"});
     return;
   }
   gfx::Rect output_visible_rect = decoder_visible_rect;
@@ -775,7 +783,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
                                 "Media.VaapiVideoDecoder.VAAPIError"))
             .value_or(nullptr);
     if (!new_vaapi_wrapper.get()) {
-      SetErrorState("failed (re)creating VaapiWrapper");
+      SetState({DecoderStatus::Codes::kFailed,
+                "Failed to create or set up the vaapi wrapper"});
       return;
     }
     decoder_delegate_->set_vaapi_wrapper(new_vaapi_wrapper.get());
@@ -783,7 +792,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
   }
 
   if (!vaapi_wrapper_->CreateContext(decoder_pic_size)) {
-    SetErrorState("failed creating VAContext");
+    SetState({DecoderStatus::Codes::kFailed, "Failed to create the VAContext"});
     return;
   }
 
@@ -811,7 +820,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
       cdm_context_ref_ ? gfx::BufferUsage::PROTECTED_SCANOUT_VDA_WRITE
                        : gfx::BufferUsage::SCANOUT_VDA_WRITE);
   if (!dummy_frame) {
-    SetErrorState("failed to allocate a dummy buffer");
+    SetState(
+        {DecoderStatus::Codes::kFailed, "failed to allocate a dummy buffer"});
     return;
   }
 
@@ -838,8 +848,8 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
       DVLOGF(2) << "The frame pool initialization is aborted";
       SetState(State::kExpectingReset);
     } else {
-      // TODO(crbug.com/40139291): don't drop the error on the floor here.
-      SetErrorState("failed Initialize()ing the frame pool");
+      SetState(
+          {DecoderStatus::Codes::kFailed, std::move(status_or_layout).error()});
     }
     return;
   }
@@ -1002,13 +1012,14 @@ void VaapiVideoDecoder::ProtectedSessionUpdate(bool success) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (!success) {
-    SetErrorState("terminating decoding after failed protected update");
+    SetState({DecoderStatus::Codes::kFailed, "Protected update failed"});
     return;
   }
 
   // If we were waiting for a protected update, retry the current decode task.
-  if (state_ != State::kWaitingForProtected)
+  if (state_ != State::kWaitingForProtected) {
     return;
+  }
 
   DCHECK(current_decode_task_);
   SetState(State::kDecoding);
@@ -1028,7 +1039,7 @@ void VaapiVideoDecoder::Flush() {
   // Flush will block until SurfaceReady() has been called for every frame
   // currently decoding.
   if (!decoder_->Flush()) {
-    SetErrorState("failed to flush the decoder delegate");
+    SetState({DecoderStatus::Codes::kFailed, "Failed to flush the decoder"});
     return;
   }
 
@@ -1067,8 +1078,9 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) {
     // Also give a chance to |decoder_delegate_| to release its internal data
     // structures.
     decoder_delegate_->OnVAContextDestructionSoon();
-    if (!CreateAcceleratedVideoDecoder().is_ok()) {
-      SetErrorState("failed to (re)create decoder/delegate");
+    auto status = CreateAcceleratedVideoDecoder();
+    if (!status.has_value()) {
+      SetState({DecoderStatus::Codes::kFailed, std::move(status).error()});
       std::move(reset_cb).Run();
       return;
     }
@@ -1088,7 +1100,8 @@ void VaapiVideoDecoder::Reset(base::OnceClosure reset_cb) {
                                 std::move(reset_cb)));
 }
 
-VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() {
+VaapiStatus::Or
+VaapiVideoDecoder::CreateAcceleratedVideoDecoder() {
   DVLOGF(2);
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(state_ == State::kUninitialized ||
@@ -1152,10 +1165,13 @@ VaapiStatus VaapiVideoDecoder::CreateAcceleratedVideoDecoder() {
     decoder_ = std::make_unique(std::move(accelerator), profile_,
                                             color_space_);
   } else {
-    return VaapiStatus(VaapiStatus::Codes::kUnsupportedProfile)
-        .WithData("profile", profile_);
+    VaapiStatus status = {VaapiStatus::Codes::kUnsupportedProfile,
+                          "unsupported configuration", "profile", profile_};
+    return status;
   }
-  return VaapiStatus::Codes::kOk;
+
+  std::monostate nothing;
+  return nothing;
 }
 
 void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) {
@@ -1169,10 +1185,22 @@ void VaapiVideoDecoder::ResetDone(base::OnceClosure reset_cb) {
   SetState(State::kWaitingForInput);
 }
 
-void VaapiVideoDecoder::SetState(State state) {
+void VaapiVideoDecoder::SetState(DecoderStatus::Or state_or_error) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DVLOGF(3) << static_cast(state)
-            << ", current state: " << static_cast(state_);
+  if (!state_or_error.has_value()) {
+    state_ = State::kError;
+    if (pending_init_cb_) {
+      CHECK(!current_decode_task_ && decode_task_queue_.empty());
+      std::move(pending_init_cb_).Run(std::move(state_or_error).error());
+    } else {
+      ClearDecodeTaskQueue(std::move(state_or_error).error());
+    }
+    return;
+  }
+
+  State state = std::move(state_or_error).value();
+  DVLOGF(3) << "Vaapi State change {" << static_cast(state_) << "} => {"
+            << static_cast(state) << "}";
 
   // Check whether the state change is valid.
   switch (state) {
@@ -1213,18 +1241,11 @@ void VaapiVideoDecoder::SetState(State state) {
       DCHECK_EQ(state_, State::kChangingResolution);
       break;
     case State::kError:
-      ClearDecodeTaskQueue(DecoderStatus::Codes::kFailed);
-      break;
+      // Error should be handled by passing in a DecoderStatus.
+      NOTREACHED();
   }
 
   state_ = state;
 }
 
-void VaapiVideoDecoder::SetErrorState(std::string message) {
-  LOG(ERROR) << message;
-  if (media_log_)
-    MEDIA_LOG(ERROR, media_log_) << "VaapiVideoDecoder: " << message;
-  SetState(State::kError);
-}
-
 }  // namespace media
diff --git a/media/gpu/vaapi/vaapi_video_decoder.h b/media/gpu/vaapi/vaapi_video_decoder.h
index 381f0f8b3c269..af24707ede5dd 100644
--- a/media/gpu/vaapi/vaapi_video_decoder.h
+++ b/media/gpu/vaapi/vaapi_video_decoder.h
@@ -159,14 +159,11 @@ class VaapiVideoDecoder : public VideoDecoderMixin,
   void ResetDone(base::OnceClosure reset_cb);
 
   // Create codec-specific AcceleratedVideoDecoder and reset related variables.
-  VaapiStatus CreateAcceleratedVideoDecoder();
+  VaapiStatus::Or CreateAcceleratedVideoDecoder();
 
-  // Change the current |state_| to the specified |state|.
-  void SetState(State state);
-
-  // Tell SetState() to change the |state_| to kError and send |message| to
-  // MediaLog and to LOG(ERROR).
-  void SetErrorState(std::string message);
+  // Change the current `state_` to the specified `state`. Iff the new state is
+  // an error, report the error to all pending decode and init tasks.
+  void SetState(DecoderStatus::Or state);
 
   // Callback for the CDM to notify |this|.
   void OnCdmContextEvent(CdmContext::Event event);
@@ -208,6 +205,9 @@ class VaapiVideoDecoder : public VideoDecoderMixin,
     return !!vaapi_wrapper_ && !!decoder_;
   }
 
+  // We can cancel the pending init during error handling if need be.
+  InitCB pending_init_cb_ GUARDED_BY_CONTEXT(sequence_checker_);
+
   // The video decoder's state.
   State state_ GUARDED_BY_CONTEXT(sequence_checker_) = State::kUninitialized;

Download

2026-04-16-20-58-32

7db299df

with better vaapi debug info

diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc
index 56dd2326fa44d..df2569b71c3c6 100644
--- a/components/viz/service/gl/gpu_service_impl.cc
+++ b/components/viz/service/gl/gpu_service_impl.cc
@@ -125,6 +125,10 @@
 #include "ui/ozone/public/surface_factory_ozone.h"
 #endif  // BUILDFLAG(IS_OZONE)
 
+#if BUILDFLAG(IS_LINUX)
+#include "media/gpu/vaapi/vaapi_wrapper.h"  // nogncheck
+#endif
+
 namespace viz {
 
 namespace {
@@ -456,6 +460,26 @@ void GpuServiceImpl::InitializeWithHostInternal(
 
 #if BUILDFLAG(IS_LINUX)
   gpu_extra_info_.is_gmb_nv12_supported = IsGMBNV12Supported();
+#if BUILDFLAG(USE_VAAPI)
+  auto vaapi_info = media::VaapiWrapper::GetSupportInformation();
+  auto convert_profile =
+      [](const media::VaapiWrapper::SupportedVAAPIProfile& in) {
+        gfx::VaapiVideoAcceleratorSupportedProfile out;
+        out.profile_name = in.profile_name;
+        out.resolution_range = in.resolution_range;
+        out.formats = in.formats;
+        return out;
+      };
+  for (const auto& p : vaapi_info.decode_supported_profiles) {
+    gpu_extra_info_.decode_vaapi_info.push_back(convert_profile(p));
+  }
+  for (const auto& p : vaapi_info.encode_supported_profiles) {
+    gpu_extra_info_.encode_vaapi_info.push_back(convert_profile(p));
+  }
+  for (const auto& p : vaapi_info.vpp_supported_profiles) {
+    gpu_extra_info_.vpp_vaapi_info.push_back(convert_profile(p));
+  }
+#endif
 #endif
 
   gpu_host->DidInitialize(gpu_info_, gpu_feature_info_,
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index 6f43ee799d28d..617d3a51e5108 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -451,6 +451,7 @@ base::ListValue GetDevicePerfInfo() {
   return list;
 }
 
+#if !BUILDFLAG(IS_LINUX)
 const char* GetProfileName(gpu::VideoCodecProfile profile) {
   switch (profile) {
     case gpu::VIDEO_CODEC_PROFILE_UNKNOWN:
@@ -534,25 +535,19 @@ const char* GetProfileName(gpu::VideoCodecProfile profile) {
   }
   NOTREACHED();
 }
+#endif
 
 base::ListValue GetVideoAcceleratorsInfo() {
   gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo();
   base::ListValue info;
 
-  struct {
-    const raw_ref
-        capabilities;
-    std::string name;
-  } kVideoDecoderImplementations[] = {
-      {raw_ref(gpu_info.video_decode_accelerator_supported_profiles),
-       "Decoding"},
-  };
-
   info.Append(display::BuildGpuInfoEntry("Decoding", ""));
   for (const auto& profile :
        gpu_info.video_decode_accelerator_supported_profiles) {
-    std::string codec_string =
-        base::StringPrintf("Decode %s", GetProfileName(profile.profile));
+    std::string codec_string = base::StringPrintf(
+        "Decode %s", media::GetProfileName(
+                         static_cast(profile.profile))
+                         .c_str());
     std::string resolution_string = base::StringPrintf(
         "%s to %s pixels%s", profile.min_resolution.ToString(),
         profile.max_resolution.ToString(),
@@ -563,8 +558,10 @@ base::ListValue GetVideoAcceleratorsInfo() {
   info.Append(display::BuildGpuInfoEntry("Encoding", ""));
   for (const auto& profile :
        gpu_info.video_encode_accelerator_supported_profiles) {
-    std::string codec_string =
-        base::StringPrintf("Encode %s", GetProfileName(profile.profile));
+    std::string codec_string = base::StringPrintf(
+        "Encode %s", media::GetProfileName(
+                         static_cast(profile.profile))
+                         .c_str());
     std::string resolution_string = base::StringPrintf(
         "%s to %s pixels, and/or %.3f fps%s.",
         profile.min_resolution.ToString(), profile.max_resolution.ToString(),
@@ -573,34 +570,51 @@ base::ListValue GetVideoAcceleratorsInfo() {
         profile.is_software_codec ? " (software codec)" : "");
     info.Append(display::BuildGpuInfoEntry(codec_string, resolution_string));
   }
+
   return info;
 }
 
-base::Value GetANGLEFeatures() {
-  gfx::GpuExtraInfo gpu_extra_info =
+base::Value GetVaapiInfo() {
+  base::DictValue vaapi_info;
+#if BUILDFLAG(IS_LINUX)
+  const gfx::GpuExtraInfo gpu_extra_info =
       GpuDataManagerImpl::GetInstance()->GetGpuExtraInfo();
-  base::ListValue angle_features_list;
-  for (const auto& feature : gpu_extra_info.angle_features) {
-    base::DictValue angle_feature;
-    angle_feature.Set("name", feature.name);
-    angle_feature.Set("category", feature.category);
-    angle_feature.Set("status", feature.status);
-    angle_features_list.Append(std::move(angle_feature));
-  }
 
-  return base::Value(std::move(angle_features_list));
-}
-
-base::Value GetDawnInfo() {
-  const std::vector info_list_collected =
-      GpuDataManagerImpl::GetInstance()->GetDawnInfoList();
-  base::ListValue dawn_info_list;
-
-  for (const auto& info : info_list_collected) {
-    dawn_info_list.Append(info);
-  }
-
-  return base::Value(std::move(dawn_info_list));
+  base::ListValue profile_info_list;
+  auto add_vaapi_entries =
+      [&profile_info_list](
+          const std::string& header,
+          const gfx::VaapiVideoAcceleratorSupportedProfiles& profiles) {
+        if (profiles.empty()) {
+          return;
+        }
+        base::DictValue entry;
+        entry.Set("description", header);
+        entry.Set("value", "");
+        entry.Set("formats", "");
+        profile_info_list.Append(std::move(entry));
+
+        for (const auto& profile : profiles) {
+          base::DictValue row;
+          row.Set("description", profile.profile_name);
+          row.Set("value", profile.resolution_range);
+          row.Set("formats", profile.formats);
+          profile_info_list.Append(std::move(row));
+        }
+      };
+
+  add_vaapi_entries("Decoding", gpu_extra_info.decode_vaapi_info);
+  add_vaapi_entries("Encoding", gpu_extra_info.encode_vaapi_info);
+  add_vaapi_entries("Video Processing", gpu_extra_info.vpp_vaapi_info);
+
+  vaapi_info.Set("profiles", std::move(profile_info_list));
+  vaapi_info.Set(
+      "blurb",
+      base::Value("VA-API hardware video decoding requires either NV12 "
+                  "single-plane support, or NV12 R8+GR88 multi-plane support "
+                  "along with VPP (Video Processing) support."));
+#endif
+  return base::Value(std::move(vaapi_info));
 }
 
 // This class receives javascript messages from the renderer.
@@ -753,6 +767,33 @@ base::ListValue GpuMessageHandler::GetLogMessages() {
   return GpuDataManagerImpl::GetInstance()->GetLogMessages();
 }
 
+base::Value GetANGLEFeatures() {
+  gfx::GpuExtraInfo gpu_extra_info =
+      GpuDataManagerImpl::GetInstance()->GetGpuExtraInfo();
+  base::ListValue angle_features_list;
+  for (const auto& feature : gpu_extra_info.angle_features) {
+    base::DictValue angle_feature;
+    angle_feature.Set("name", feature.name);
+    angle_feature.Set("category", feature.category);
+    angle_feature.Set("status", feature.status);
+    angle_features_list.Append(std::move(angle_feature));
+  }
+
+  return base::Value(std::move(angle_features_list));
+}
+
+base::Value GetDawnInfo() {
+  const std::vector info_list_collected =
+      GpuDataManagerImpl::GetInstance()->GetDawnInfoList();
+  base::ListValue dawn_info_list;
+
+  for (const auto& info : info_list_collected) {
+    dawn_info_list.Append(info);
+  }
+
+  return base::Value(std::move(dawn_info_list));
+}
+
 base::DictValue GpuMessageHandler::GetGpuInfoDict() {
   // Get GPU Info.
   const gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo();
@@ -800,6 +841,7 @@ base::DictValue GpuMessageHandler::GetGpuInfoDict() {
   gpu_info_val.Set("ANGLEFeatures", GetANGLEFeatures());
   gpu_info_val.Set("devicePerfInfo", GetDevicePerfInfo());
   gpu_info_val.Set("dawnInfo", GetDawnInfo());
+  gpu_info_val.Set("vaapiInfo", GetVaapiInfo());
 
   return gpu_info_val;
 }
diff --git a/content/browser/resources/gpu/browser_bridge.ts b/content/browser/resources/gpu/browser_bridge.ts
index a7208a35fdec3..53e27e341b1aa 100644
--- a/content/browser/resources/gpu/browser_bridge.ts
+++ b/content/browser/resources/gpu/browser_bridge.ts
@@ -49,6 +49,10 @@ interface GpuInfo {
   featureStatusForHardwareGpu: FeatureStatus;
   videoAcceleratorsInfo: any[];
   vulkanInfo: string;
+  vaapiInfo?: {
+    blurb?: string,
+    profiles: any[],
+  };
 }
 
 interface LogMessasge {
diff --git a/content/browser/resources/gpu/info_view.html b/content/browser/resources/gpu/info_view.html
index a6d86891ed9b1..107fb43543f4c 100644
--- a/content/browser/resources/gpu/info_view.html
+++ b/content/browser/resources/gpu/info_view.html
@@ -99,6 +99,14 @@ found in the LICENSE file.
   }
   .info-table td:nth-child(2) {
     font-weight: bold;
+    width: 40%;
+  }
+  .info-table td:nth-child(3) {
+    font-weight: bold;
+    width: 35%;
+  }
+  /* If there are only 2 columns, the 2nd one should take the rest of the space */
+  .info-table tr td:nth-child(2):last-child {
     width: 75%;
   }
 
diff --git a/content/browser/resources/gpu/info_view.ts b/content/browser/resources/gpu/info_view.ts
index f0b1969fce598..31fccf5a372d4 100644
--- a/content/browser/resources/gpu/info_view.ts
+++ b/content/browser/resources/gpu/info_view.ts
@@ -151,6 +151,7 @@ export interface Data {
   description: string;
   id?: string;
   value: string|boolean|number;
+  formats?: string;
 }
 
 export interface ArrayData {
@@ -160,7 +161,7 @@ export interface ArrayData {
 
 /** Creates the td elements for a table row */
 function createInfoElements(
-    data: Data|ArrayData, padSize: number): HTMLElement[] {
+    data: Data|ArrayData, padSize: number, hasFormats: boolean): HTMLElement[] {
   const desc = createElem('td', {}, [
     createElem('span', data.description.padEnd(padSize)),
     createHidden(':'),
@@ -169,16 +170,27 @@ function createInfoElements(
   if (Array.isArray(data.value)) {
     return [
       desc,
-      createElem('td', {}, [createInfoTable((data as ArrayData).value)]),
+      createElem('td', {colSpan: (hasFormats ? 2 : 1).toString()},
+                 [createInfoTable((data as ArrayData).value)]),
     ];
   } else {
-    return [
+    const tdProps: Attributes = {
+      textContent: data.value.toString().trim(),
+    };
+    if ((data as Data).id) {
+      tdProps['id'] = (data as Data).id!;
+    }
+
+    const elements = [
       desc,
-      createElem('td', {
-        textContent: data.value.toString().trim(),
-        id: (data as Data).id!,
-      }),
+      createElem('td', tdProps),
     ];
+    if (hasFormats) {
+      elements.push(createElem('td', {
+        textContent: (data as Data).formats || '',
+      }));
+    }
+    return elements;
   }
 }
 
@@ -190,11 +202,15 @@ function createInfoTable(data: Data[]|ArrayData[]) {
           .reduce(
               (longest, {description}) => Math.max(longest, description.length),
               0));
+
+  const hasFormats = data.some(d => (d as Data).formats !== undefined);
+
   return createElem('table', {className: 'info-table'}, [
     createElem(
         'tbody', {},
         data.map(
-            data => createElem('tr', {}, createInfoElements(data, longestDesc)),
+            data =>
+                createElem('tr', {}, createInfoElements(data, longestDesc, hasFormats)),
             )),
   ]);
 }
@@ -311,6 +327,7 @@ const kSections = {
   compositorInfo: ['Compositor Information', 'div'],
   displayInfo: ['Display(s) Information', 'div'],
   videoAccelerationInfo: ['Video Acceleration Information', 'div'],
+  vaapiInfo: ['VA-API Information', 'div'],
   vulkanInfo: ['Vulkan Information', 'div'],
   devicePerfInfo: ['Device Performance Information', 'div'],
   diagnostics: ['Diagnostics', 'div'],
@@ -569,6 +586,19 @@ export class InfoViewElement extends CustomElement {
       this.setTable_(
           sections.videoAccelerationInfo, gpuInfo.videoAcceleratorsInfo);
 
+      this.updateSection_(sections.vaapiInfo, () => {
+        const show = !!gpuInfo.vaapiInfo && gpuInfo.vaapiInfo.profiles.length > 0;
+        if (show) {
+          if (gpuInfo.vaapiInfo!.blurb) {
+            sections.vaapiInfo.list.appendChild(
+                createElem('p', gpuInfo.vaapiInfo!.blurb));
+          }
+          sections.vaapiInfo.list.appendChild(
+              createInfoTable(gpuInfo.vaapiInfo!.profiles));
+        }
+        return show;
+      });
+
       this.updateSectionList_(
           sections.angleFeatures, gpuInfo.ANGLEFeatures,
           angleFeature => this.createAngleFeatureEl_(angleFeature));
diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc
index c39949f9c9448..b7a5fa9758e6a 100644
--- a/media/gpu/vaapi/vaapi_video_decoder.cc
+++ b/media/gpu/vaapi/vaapi_video_decoder.cc
@@ -21,6 +21,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/not_fatal_until.h"
+#include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/bind_post_task.h"
 #include "base/task/sequenced_task_runner.h"
@@ -838,8 +839,10 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScreenSizes(
       DVLOGF(2) << "The frame pool initialization is aborted";
       SetState(State::kExpectingReset);
     } else {
-      // TODO(crbug.com/40139291): don't drop the error on the floor here.
-      SetErrorState("failed Initialize()ing the frame pool");
+      SetErrorState(base::StrCat(
+          {"failed to Initialize() the frame pool, which is used to ",
+           "provide output VideoFrames for the decoder: ",
+           std::move(status_or_layout).error().message()}));
     }
     return;
   }
diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
index 1608e44bc4ec6..1d74b13d36e2a 100644
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -93,7 +93,18 @@ using media_gpu_vaapi::StubPathMap;
 
 namespace media {
 
+VaapiWrapper::SupportedVAAPIProfile::SupportedVAAPIProfile() = default;
+VaapiWrapper::SupportedVAAPIProfile::SupportedVAAPIProfile(
+    const SupportedVAAPIProfile&) = default;
+VaapiWrapper::SupportedVAAPIProfile::~SupportedVAAPIProfile() = default;
+
+VaapiWrapper::SupportedVAAPIInfo::SupportedVAAPIInfo() = default;
+VaapiWrapper::SupportedVAAPIInfo::SupportedVAAPIInfo(
+    const SupportedVAAPIInfo&) = default;
+VaapiWrapper::SupportedVAAPIInfo::~SupportedVAAPIInfo() = default;
+
 namespace {
+
 // Returns a DRM FD and whether this FD should be skipped.
 std::pair LoadDrmFD(const base::FilePath& dev_path) {
   base::File drm_file =
@@ -127,6 +138,81 @@ std::pair LoadDrmFD(const base::FilePath& dev_path) {
   return std::make_pair(base::ScopedFD(drm_file.TakePlatformFile()),
                         /*should_skip=*/false);
 }
+
+std::string DrmFormatToString(uint32_t drm_format) {
+  switch (drm_format) {
+    case DRM_FORMAT_R8:
+      return "R8";
+    case DRM_FORMAT_GR88:
+      return "GR88";
+    case DRM_FORMAT_NV12:
+      return "NV12";
+    case DRM_FORMAT_YUV420:
+      return "YUV420";
+    case DRM_FORMAT_YVU420:
+      return "YVU420";
+    case DRM_FORMAT_P010:
+      return "P010";
+    case DRM_FORMAT_ARGB8888:
+      return "ARGB8888";
+    case DRM_FORMAT_ABGR8888:
+      return "ABGR8888";
+    case DRM_FORMAT_XRGB8888:
+      return "XRGB8888";
+    case DRM_FORMAT_XBGR8888:
+      return "XBGR8888";
+    default:
+      return base::StringPrintf("0x%08x", drm_format);
+  }
+}
+
+std::string GetSurfacePlaneInfo(const base::Lock* va_lock,
+                                VADisplay va_display,
+                                uint32_t va_fourcc,
+                                const gfx::Size& size) {
+  MAYBE_ASSERT_ACQUIRED(va_lock);
+  unsigned int va_rt_format = VA_RT_FORMAT_YUV420;
+  if (va_fourcc == VA_FOURCC_P010) {
+    va_rt_format = VA_RT_FORMAT_YUV420_10BPP;
+  }
+
+  VASurfaceAttrib attribs[1];
+  attribs[0].type = VASurfaceAttribPixelFormat;
+  attribs[0].flags = VA_SURFACE_ATTRIB_SETTABLE;
+  attribs[0].value.type = VAGenericValueTypeInteger;
+  attribs[0].value.value.i = va_fourcc;
+
+  VASurfaceID va_surface_id = VA_INVALID_ID;
+  VAStatus va_res = vaCreateSurfaces(
+      va_display, va_rt_format, base::checked_cast(size.width()),
+      base::checked_cast(size.height()), &va_surface_id, 1,
+      attribs, 1);
+  if (va_res != VA_STATUS_SUCCESS) {
+    return "";
+  }
+
+  VADRMPRIMESurfaceDescriptor descriptor;
+  va_res = vaExportSurfaceHandle(
+      va_display, va_surface_id, VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
+      VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
+      &descriptor);
+
+  std::string info;
+  if (va_res == VA_STATUS_SUCCESS) {
+    for (uint32_t i = 0; i < descriptor.num_layers; ++i) {
+      if (i > 0) {
+        info += "+";
+      }
+      info += DrmFormatToString(UNSAFE_TODO(descriptor.layers[i].drm_format));
+    }
+    for (uint32_t i = 0; i < descriptor.num_objects; ++i) {
+      close(UNSAFE_TODO(descriptor.objects[i].fd));
+    }
+  }
+
+  vaDestroySurfaces(va_display, &va_surface_id, 1);
+  return info;
+}
 }  // namespace
 
 // These values are logged to UMA. Entries should not be renumbered and numeric
@@ -697,8 +783,7 @@ bool IsModeDecoding(VaapiWrapper::CodecMode mode) {
 
 bool IsModeEncoding(VaapiWrapper::CodecMode mode) {
   return mode == VaapiWrapper::CodecMode::kEncodeConstantBitrate ||
-         mode ==
-             VaapiWrapper::CodecMode::kEncodeConstantQuantizationParameter ||
+         mode == VaapiWrapper::kEncodeConstantQuantizationParameter ||
          mode == VaapiWrapper::CodecMode::kEncodeVariableBitrate;
 }
 
@@ -1062,6 +1147,10 @@ class VASupportedProfiles {
       VAProfile va_profile,
       VAEntrypoint va_entrypoint = kVAEntrypointInvalid) const;
 
+  const VaapiWrapper::SupportedVAAPIInfo& GetVaapiInfo() const {
+    return vaapi_info_structured_;
+  }
+
  private:
   friend class base::NoDestructor;
 
@@ -1093,12 +1182,15 @@ class VASupportedProfiles {
                     VaapiWrapper::kCodecModeMax,
                 "|supported_profiles_| size is incorrect.");
 
+  VaapiWrapper::SupportedVAAPIInfo vaapi_info_structured_;
+
   const ReportErrorToUMACB report_error_to_uma_cb_;
 };
 
 // static
 const VASupportedProfiles& VASupportedProfiles::Get() {
   static const base::NoDestructor profile_infos;
+  LOG(ERROR) << "Getting profile info";
   return *profile_infos;
 }
 
@@ -1123,6 +1215,7 @@ VASupportedProfiles::VASupportedProfiles()
     : report_error_to_uma_cb_(base::DoNothing()) {
   VADisplayStateHandle display_state = VADisplayStateSingleton::GetHandle();
   if (!display_state) {
+    LOG(ERROR) << "Could not get VADisplayState Handle";
     return;
   }
 
@@ -1199,6 +1292,94 @@ void VASupportedProfiles::FillSupportedProfileInfos(
     UNSAFE_TODO(supported_profiles_[static_cast(mode)]) =
         supported_profile_infos;
   }
+
+  for (const auto& info :
+       UNSAFE_TODO(supported_profiles_[VaapiWrapper::kVideoProcess])) {
+    std::string formats_str;
+    for (const auto& format : info.pixel_formats) {
+      if (!formats_str.empty()) {
+        formats_str += ", ";
+      }
+      auto fourcc = Fourcc::FromVAFourCC(format);
+      if (fourcc) {
+        std::string plane_info = GetSurfacePlaneInfo(
+            va_lock, va_display, format, gfx::Size(128, 128));
+        if (plane_info.empty()) {
+          formats_str += fourcc->ToString();
+        } else {
+          formats_str += base::StringPrintf(
+              "%s (%s)", fourcc->ToString().c_str(), plane_info.c_str());
+        }
+      }
+    }
+    VaapiWrapper::SupportedVAAPIProfile profile;
+    profile.profile_name = vaProfileStr(info.va_profile);
+    profile.resolution_range =
+        base::StringPrintf("[%s - %s]", info.min_resolution.ToString().c_str(),
+                           info.max_resolution.ToString().c_str());
+    profile.formats = formats_str;
+    vaapi_info_structured_.vpp_supported_profiles.push_back(profile);
+  }
+
+  for (VaapiWrapper::CodecMode mode : kWrapperModes) {
+    if (UNSAFE_TODO(supported_profiles_[static_cast(mode)]).empty()) {
+      continue;
+    }
+    std::vector* profile_list = nullptr;
+    if (mode == VaapiWrapper::kDecode) {
+      profile_list = &vaapi_info_structured_.decode_supported_profiles;
+    } else if (mode == VaapiWrapper::kEncodeConstantBitrate ||
+               mode == VaapiWrapper::kEncodeConstantQuantizationParameter ||
+               mode == VaapiWrapper::kEncodeVariableBitrate) {
+      profile_list = &vaapi_info_structured_.encode_supported_profiles;
+    } else {
+      continue;
+    }
+
+    for (const auto& info :
+         UNSAFE_TODO(supported_profiles_[static_cast(mode)])) {
+      std::string formats_str;
+      bool supports_nv12_or_p010 = false;
+      for (const auto& format : info.pixel_formats) {
+        if (!formats_str.empty()) {
+          formats_str += ", ";
+        }
+        auto fourcc = Fourcc::FromVAFourCC(format);
+        if (fourcc) {
+          std::string plane_info = GetSurfacePlaneInfo(
+              va_lock, va_display, format, gfx::Size(128, 128));
+          if (plane_info.empty()) {
+            formats_str += fourcc->ToString();
+          } else {
+            formats_str += base::StringPrintf(
+                "%s (%s)", fourcc->ToString().c_str(), plane_info.c_str());
+          }
+          if (*fourcc == Fourcc(Fourcc::NV12) ||
+              *fourcc == Fourcc(Fourcc::P010)) {
+            supports_nv12_or_p010 = true;
+          }
+        } else {
+          formats_str += base::StringPrintf("0x%08x", format);
+        }
+      }
+
+      std::string profile_str = info.va_profile == VAProfileNone
+                                    ? "None"
+                                    : vaProfileStr(info.va_profile);
+      std::string resolution_range = base::StringPrintf(
+          "[%s - %s]", info.min_resolution.ToString().c_str(),
+          info.max_resolution.ToString().c_str());
+      std::string ExtraInfo =
+          (mode != VaapiWrapper::kVideoProcess && !supports_nv12_or_p010)
+              ? " [picture processing needed]"
+              : "";
+      VaapiWrapper::SupportedVAAPIProfile supported_profile;
+      supported_profile.profile_name = profile_str;
+      supported_profile.resolution_range = resolution_range;
+      supported_profile.formats = formats_str + ExtraInfo;
+      profile_list->push_back(supported_profile);
+    }
+  }
 }
 
 bool VASupportedProfiles::FillProfileInfo_Locked(
@@ -1907,8 +2088,9 @@ VaapiWrapper::GetSupportedDecodeProfiles() {
 
     const VASupportedProfiles::ProfileInfo* profile_info =
         VASupportedProfiles::Get().IsProfileSupported(kDecode, va_profile);
-    if (!profile_info)
+    if (!profile_info) {
       continue;
+    }
 
     VideoDecodeAccelerator::SupportedProfile profile;
     profile.profile = media_profile;
@@ -1919,6 +2101,11 @@ VaapiWrapper::GetSupportedDecodeProfiles() {
   return profiles;
 }
 
+// static
+VaapiWrapper::SupportedVAAPIInfo VaapiWrapper::GetSupportInformation() {
+  return VASupportedProfiles::Get().GetVaapiInfo();
+}
+
 // static
 bool VaapiWrapper::IsDecodeSupported(VAProfile va_profile) {
   return VASupportedProfiles::Get().IsProfileSupported(kDecode, va_profile);
diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
index cd1be5d824baa..e67ce01f4dfd5 100644
--- a/media/gpu/vaapi/vaapi_wrapper.h
+++ b/media/gpu/vaapi/vaapi_wrapper.h
@@ -252,6 +252,29 @@ class MEDIA_GPU_EXPORT VaapiWrapper
   // Return the supported video decode profiles.
   static VideoDecodeAccelerator::SupportedProfiles GetSupportedDecodeProfiles();
 
+  struct SupportedVAAPIProfile {
+    SupportedVAAPIProfile();
+    SupportedVAAPIProfile(const SupportedVAAPIProfile&);
+    ~SupportedVAAPIProfile();
+
+    std::string profile_name;
+    std::string resolution_range;
+    std::string formats;
+  };
+
+  struct SupportedVAAPIInfo {
+    SupportedVAAPIInfo();
+    SupportedVAAPIInfo(const SupportedVAAPIInfo&);
+    ~SupportedVAAPIInfo();
+
+    std::vector decode_supported_profiles;
+    std::vector encode_supported_profiles;
+    std::vector vpp_supported_profiles;
+  };
+
+  // Returns all VA-API support information in a structured format.
+  static SupportedVAAPIInfo GetSupportInformation();
+
   // Return true when decoding using |va_profile| is supported.
   static bool IsDecodeSupported(VAProfile va_profile);
 
diff --git a/ui/gfx/gpu_extra_info.cc b/ui/gfx/gpu_extra_info.cc
index 0b6c77b28e742..d84601cbcc054 100644
--- a/ui/gfx/gpu_extra_info.cc
+++ b/ui/gfx/gpu_extra_info.cc
@@ -13,6 +13,15 @@ ANGLEFeature::~ANGLEFeature() = default;
 ANGLEFeature& ANGLEFeature::operator=(const ANGLEFeature& other) = default;
 ANGLEFeature& ANGLEFeature::operator=(ANGLEFeature&& other) = default;
 
+#if BUILDFLAG(IS_LINUX)
+VaapiVideoAcceleratorSupportedProfile::VaapiVideoAcceleratorSupportedProfile() =
+    default;
+VaapiVideoAcceleratorSupportedProfile::VaapiVideoAcceleratorSupportedProfile(
+    const VaapiVideoAcceleratorSupportedProfile& other) = default;
+VaapiVideoAcceleratorSupportedProfile::
+    ~VaapiVideoAcceleratorSupportedProfile() = default;
+#endif
+
 GpuExtraInfo::GpuExtraInfo() = default;
 GpuExtraInfo::GpuExtraInfo(const GpuExtraInfo&) = default;
 GpuExtraInfo::GpuExtraInfo(GpuExtraInfo&&) = default;
diff --git a/ui/gfx/gpu_extra_info.h b/ui/gfx/gpu_extra_info.h
index 709e7db420849..bb67984d7156c 100644
--- a/ui/gfx/gpu_extra_info.h
+++ b/ui/gfx/gpu_extra_info.h
@@ -35,6 +35,22 @@ struct COMPONENT_EXPORT(GFX) ANGLEFeature {
 };
 using ANGLEFeatures = std::vector;
 
+#if BUILDFLAG(IS_LINUX)
+struct COMPONENT_EXPORT(GFX) VaapiVideoAcceleratorSupportedProfile {
+  VaapiVideoAcceleratorSupportedProfile();
+  VaapiVideoAcceleratorSupportedProfile(
+      const VaapiVideoAcceleratorSupportedProfile& other);
+  ~VaapiVideoAcceleratorSupportedProfile();
+
+  std::string profile_name;
+  std::string resolution_range;
+  std::string formats;
+};
+
+using VaapiVideoAcceleratorSupportedProfiles =
+    std::vector;
+#endif
+
 struct COMPONENT_EXPORT(GFX) GpuExtraInfo {
   GpuExtraInfo();
   GpuExtraInfo(const GpuExtraInfo&);
@@ -49,6 +65,9 @@ struct COMPONENT_EXPORT(GFX) GpuExtraInfo {
 
 #if BUILDFLAG(IS_LINUX)
   bool is_gmb_nv12_supported = false;
+  VaapiVideoAcceleratorSupportedProfiles decode_vaapi_info;
+  VaapiVideoAcceleratorSupportedProfiles encode_vaapi_info;
+  VaapiVideoAcceleratorSupportedProfiles vpp_vaapi_info;
 #endif
 };
 
diff --git a/ui/gfx/mojom/gpu_extra_info.mojom b/ui/gfx/mojom/gpu_extra_info.mojom
index 6f14de2c34a91..8ddfb9548f25e 100644
--- a/ui/gfx/mojom/gpu_extra_info.mojom
+++ b/ui/gfx/mojom/gpu_extra_info.mojom
@@ -12,8 +12,24 @@ struct ANGLEFeature {
   string status;
 };
 
+// ui/gfx/gpu_extra_info.h
+[EnableIf=is_linux]
+struct VaapiVideoAcceleratorSupportedProfile {
+  string profile_name;
+  string resolution_range;
+  string formats;
+};
+
 // gfx:GpuExtraInfo
 struct GpuExtraInfo {
   // List of features queried from ANGLE
   array angle_features;
+
+  // List of VA-API support information
+  [EnableIf=is_linux]
+  array decode_vaapi_info;
+  [EnableIf=is_linux]
+  array encode_vaapi_info;
+  [EnableIf=is_linux]
+  array vpp_vaapi_info;
 };
diff --git a/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc b/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc
index 4407206c90c7c..6ea6b363e8267 100644
--- a/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc
+++ b/ui/gfx/mojom/gpu_extra_info_mojom_traits.cc
@@ -6,6 +6,16 @@
 
 namespace mojo {
 
+// static
+bool StructTraits::
+    Read(gfx::mojom::VaapiVideoAcceleratorSupportedProfileDataView data,
+         gfx::VaapiVideoAcceleratorSupportedProfile* out) {
+  return data.ReadProfileName(&out->profile_name) &&
+         data.ReadResolutionRange(&out->resolution_range) &&
+         data.ReadFormats(&out->formats);
+}
+
 // static
 bool StructTraits::Read(
     gfx::mojom::ANGLEFeatureDataView data,
@@ -18,8 +28,16 @@ bool StructTraits::Read(
 bool StructTraits::Read(
     gfx::mojom::GpuExtraInfoDataView data,
     gfx::GpuExtraInfo* out) {
-  if (!data.ReadAngleFeatures(&out->angle_features))
+  if (!data.ReadAngleFeatures(&out->angle_features)) {
+    return false;
+  }
+#if BUILDFLAG(IS_LINUX)
+  if (!data.ReadDecodeVaapiInfo(&out->decode_vaapi_info) ||
+      !data.ReadEncodeVaapiInfo(&out->encode_vaapi_info) ||
+      !data.ReadVppVaapiInfo(&out->vpp_vaapi_info)) {
     return false;
+  }
+#endif
   return true;
 }
 
diff --git a/ui/gfx/mojom/gpu_extra_info_mojom_traits.h b/ui/gfx/mojom/gpu_extra_info_mojom_traits.h
index f5973ddbedb79..7ee120e222126 100644
--- a/ui/gfx/mojom/gpu_extra_info_mojom_traits.h
+++ b/ui/gfx/mojom/gpu_extra_info_mojom_traits.h
@@ -11,6 +11,30 @@
 
 namespace mojo {
 
+template <>
+struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS)
+    StructTraits {
+  static bool Read(
+      gfx::mojom::VaapiVideoAcceleratorSupportedProfileDataView data,
+      gfx::VaapiVideoAcceleratorSupportedProfile* out);
+
+  static const std::string& profile_name(
+      const gfx::VaapiVideoAcceleratorSupportedProfile& input) {
+    return input.profile_name;
+  }
+
+  static const std::string& resolution_range(
+      const gfx::VaapiVideoAcceleratorSupportedProfile& input) {
+    return input.resolution_range;
+  }
+
+  static const std::string& formats(
+      const gfx::VaapiVideoAcceleratorSupportedProfile& input) {
+    return input.formats;
+  }
+};
+
 template <>
 struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS)
     StructTraits {
@@ -40,6 +64,21 @@ struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS)
       const gfx::GpuExtraInfo& input) {
     return input.angle_features;
   }
+
+#if BUILDFLAG(IS_LINUX)
+  static const gfx::VaapiVideoAcceleratorSupportedProfiles& decode_vaapi_info(
+      const gfx::GpuExtraInfo& input) {
+    return input.decode_vaapi_info;
+  }
+  static const gfx::VaapiVideoAcceleratorSupportedProfiles& encode_vaapi_info(
+      const gfx::GpuExtraInfo& input) {
+    return input.encode_vaapi_info;
+  }
+  static const gfx::VaapiVideoAcceleratorSupportedProfiles& vpp_vaapi_info(
+      const gfx::GpuExtraInfo& input) {
+    return input.vpp_vaapi_info;
+  }
+#endif
 };
 
 }  // namespace mojo

Download

2026-04-16-01-25-13

7db299df

better debug information for vaapi

diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
index 1608e44bc4ec6..f239587bdf975 100644
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -697,11 +697,31 @@ bool IsModeDecoding(VaapiWrapper::CodecMode mode) {
 
 bool IsModeEncoding(VaapiWrapper::CodecMode mode) {
   return mode == VaapiWrapper::CodecMode::kEncodeConstantBitrate ||
-         mode ==
-             VaapiWrapper::CodecMode::kEncodeConstantQuantizationParameter ||
+         mode == VaapiWrapper::kEncodeConstantQuantizationParameter ||
          mode == VaapiWrapper::CodecMode::kEncodeVariableBitrate;
 }
 
+std::string CodecModeToString(VaapiWrapper::CodecMode mode) {
+  switch (mode) {
+    case VaapiWrapper::CodecMode::kDecode:
+      return "Decode";
+#if BUILDFLAG(IS_CHROMEOS)
+    case VaapiWrapper::CodecMode::kDecodeProtected:
+      return "DecodeProtected";
+#endif
+    case VaapiWrapper::CodecMode::kEncodeConstantBitrate:
+      return "EncodeConstantBitrate";
+    case VaapiWrapper::CodecMode::kEncodeConstantQuantizationParameter:
+      return "EncodeConstantQuantizationParameter";
+    case VaapiWrapper::CodecMode::kEncodeVariableBitrate:
+      return "EncodeVariableBitrate";
+    case VaapiWrapper::CodecMode::kVideoProcess:
+      return "VideoProcess";
+    case VaapiWrapper::CodecMode::kCodecModeMax:
+      NOTREACHED();
+  }
+}
+
 // Fill VAImage's non-visible area with 0s.
 void FillNV12Padding(const VAImage& image,
                      const gfx::Size& visible_size,
@@ -1099,6 +1119,7 @@ class VASupportedProfiles {
 // static
 const VASupportedProfiles& VASupportedProfiles::Get() {
   static const base::NoDestructor profile_infos;
+  LOG(ERROR) << "Getting profile info";
   return *profile_infos;
 }
 
@@ -1123,6 +1144,7 @@ VASupportedProfiles::VASupportedProfiles()
     : report_error_to_uma_cb_(base::DoNothing()) {
   VADisplayStateHandle display_state = VADisplayStateSingleton::GetHandle();
   if (!display_state) {
+    LOG(ERROR) << "Could not get VADisplayState Handle";
     return;
   }
 
@@ -1199,6 +1221,53 @@ void VASupportedProfiles::FillSupportedProfileInfos(
     UNSAFE_TODO(supported_profiles_[static_cast(mode)]) =
         supported_profile_infos;
   }
+
+  LOG(ERROR)
+      << "VA-API Video Acceleration Picture Process (VPP) supported: "
+      << (UNSAFE_TODO(supported_profiles_[VaapiWrapper::kVideoProcess]).empty()
+              ? "false"
+              : "true");
+
+  for (VaapiWrapper::CodecMode mode : kWrapperModes) {
+    if (UNSAFE_TODO(supported_profiles_[static_cast(mode)]).empty()) {
+      continue;
+    }
+    LOG(ERROR) << "VA-API " << CodecModeToString(mode)
+               << " supported profiles:";
+    for (const auto& info :
+         UNSAFE_TODO(supported_profiles_[static_cast(mode)])) {
+      std::string formats_str;
+      bool supports_nv12_or_p010 = false;
+      for (const auto& format : info.pixel_formats) {
+        if (!formats_str.empty()) {
+          formats_str += ", ";
+        }
+        auto fourcc = Fourcc::FromVAFourCC(format);
+        if (fourcc) {
+          formats_str += fourcc->ToString();
+          if (*fourcc == Fourcc(Fourcc::NV12) ||
+              *fourcc == Fourcc(Fourcc::P010)) {
+            supports_nv12_or_p010 = true;
+          }
+        } else {
+          formats_str += base::StringPrintf("0x%08x", format);
+        }
+      }
+
+      std::string profile_str = info.va_profile == VAProfileNone
+                                    ? "None"
+                                    : vaProfileStr(info.va_profile);
+      LOG(ERROR) << "  " << profile_str
+                 << " (entrypoint: " << vaEntrypointStr(info.va_entrypoint)
+                 << "): resolutions: [" << info.min_resolution.ToString()
+                 << " - " << info.max_resolution.ToString() << "], formats: ["
+                 << formats_str << "]"
+                 << ((mode != VaapiWrapper::kVideoProcess &&
+                      !supports_nv12_or_p010)
+                         ? " [picture processing needed]"
+                         : "");
+    }
+  }
 }
 
 bool VASupportedProfiles::FillProfileInfo_Locked(

Download