Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick 99c3f3bfd507 from chromium (#34225)
* chore: cherry-pick 99c3f3bfd507 from chromium * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
- Loading branch information
1 parent
7bae935
commit bd3e9aa
Showing
2 changed files
with
65 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Eugene Zemtsov <eugene@chromium.org> | ||
Date: Fri, 8 Apr 2022 23:28:35 +0000 | ||
Subject: Only destroy successfully created compression session in VT encoder | ||
|
||
This is a defensive change, since we don't have a repro on hand. | ||
My guess is that VTCompressionSessionCreate() might fail to create a | ||
compression session, but still write a value to compressionSessionOut. | ||
It makes VTCompressionSessionInvalidate() access uninitialized memory. | ||
|
||
That's why this CL makes sure that we only destroy a compression session | ||
if VTCompressionSessionCreate() reports success. | ||
|
||
Bug: 1312563 | ||
Change-Id: I468ce0e10bad251ca0b62b568607dbc5c32ba8bc | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3575680 | ||
Reviewed-by: Dale Curtis <dalecurtis@chromium.org> | ||
Commit-Queue: Eugene Zemtsov <eugene@chromium.org> | ||
Cr-Commit-Position: refs/heads/main@{#990654} | ||
|
||
diff --git a/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/media/gpu/mac/vt_video_encode_accelerator_mac.cc | ||
index 06333aaeca6b8bfd10d6809bcace4177ac7fd368..c265ff94617dfedca60ad9b3f1ce3de3364cfe56 100644 | ||
--- a/media/gpu/mac/vt_video_encode_accelerator_mac.cc | ||
+++ b/media/gpu/mac/vt_video_encode_accelerator_mac.cc | ||
@@ -129,13 +129,13 @@ VTVideoEncodeAccelerator::GetSupportedProfiles() { | ||
SupportedProfiles profiles; | ||
const bool rv = CreateCompressionSession( | ||
gfx::Size(kDefaultResolutionWidth, kDefaultResolutionHeight)); | ||
- DestroyCompressionSession(); | ||
if (!rv) { | ||
VLOG(1) | ||
<< "Hardware encode acceleration is not available on this platform."; | ||
return profiles; | ||
} | ||
|
||
+ DestroyCompressionSession(); | ||
SupportedProfile profile; | ||
profile.max_framerate_numerator = kMaxFrameRateNumerator; | ||
profile.max_framerate_denominator = kMaxFrameRateDenominator; | ||
@@ -533,10 +533,8 @@ bool VTVideoEncodeAccelerator::ResetCompressionSession() { | ||
DestroyCompressionSession(); | ||
|
||
bool session_rv = CreateCompressionSession(input_visible_size_); | ||
- if (!session_rv) { | ||
- DestroyCompressionSession(); | ||
+ if (!session_rv) | ||
return false; | ||
- } | ||
|
||
const bool configure_rv = ConfigureCompressionSession(); | ||
if (configure_rv) | ||
@@ -572,6 +570,12 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( | ||
&VTVideoEncodeAccelerator::CompressionCallback, | ||
reinterpret_cast<void*>(this), compression_session_.InitializeInto()); | ||
if (status != noErr) { | ||
+ // IMPORTANT: ScopedCFTypeRef::release() doesn't call CFRelease(). | ||
+ // In case of an error VTCompressionSessionCreate() is not supposed to | ||
+ // write a non-null value into compression_session_, but just in case, | ||
+ // we'll clear it without calling CFRelease() because it can be unsafe | ||
+ // to call on a not fully created session. | ||
+ (void)compression_session_.release(); | ||
DLOG(ERROR) << " VTCompressionSessionCreate failed: " << status; | ||
return false; | ||
} |