Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return the ffmpeg patch to fix memory usage #22981

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Return the ffmpeg patch to fix memory usage #22981

merged 1 commit into from
Apr 9, 2024

Conversation

atuchin-m
Copy link
Collaborator

@atuchin-m atuchin-m commented Apr 9, 2024 •
edited
Loading

Resolves brave/brave-browser#37414
The backport of https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/5411272

media_unittests are good for win-x64:

E:\work\brave-browser\src\brave>..\out\Component\media_unittests.exe
...
[8285/8285] VpxGeneric/SoftwareVideoEncoderTest.EncodeAndDecode/vp8__vp8__PIXEL_FORMAT_I420__ (119 ms)
SUCCESS: all tests passed.
Tests took 10 seconds.

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@atuchin-m atuchin-m self-assigned this Apr 9, 2024
@atuchin-m atuchin-m requested a review from a team as a code owner April 9, 2024 11:35
@atuchin-m atuchin-m requested a review from goodov April 9, 2024 11:37
@atuchin-m atuchin-m merged commit 3c39de1 into master Apr 9, 2024
20 checks passed
@atuchin-m atuchin-m deleted the return-ffmpeg-patch-to-fix-memory branch April 9, 2024 14:14
@github-actions github-actions bot added this to the 1.66.x - Nightly milestone Apr 9, 2024
@atuchin-m atuchin-m mentioned this pull request Apr 9, 2024
Merged
24 tasks
@mkarolin mkarolin mentioned this pull request Apr 9, 2024
Merged
24 tasks
mkarolin pushed a commit that referenced this pull request Apr 9, 2024
@atuchin-m @mkarolin
Return the ffmpeg patch to fix memory usage (#22981)
09800a9
mkarolin pushed a commit that referenced this pull request Apr 10, 2024
@atuchin-m @mkarolin
Return the ffmpeg patch to fix memory usage (#22981)
a42c494
mkarolin pushed a commit that referenced this pull request Apr 11, 2024
@atuchin-m @mkarolin
Return the ffmpeg patch to fix memory usage (#22981)
ea6c262
kjozwiak pushed a commit that referenced this pull request Apr 11, 2024
@mkarolin @kylehickinson
@atuchin-m @simonhong
Upgrade from Chromium 123 to Chromium 124 (1.65.x). (#22984)
23bc72b 
* Merge pull request #22320 from brave/cr124

Upgrade from Chromium 123 to Chromium 124.

* IWYU.

* Formatting fixes.

* [Android] Remove deprecated getLastUsedRegularProfile from Profile

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/913e0498eac18b4cd078eb402e04dbe985ac18e0

Remove deprecated getLastUsedRegularProfile from Profile.java

Bug: 40254448

* Fixes build error on Mac/iOS.

 ERROR at //brave/browser/mac/BUILD.gn:6:18: Assignment had no effect.
 check_includes = false
                  ^----
 You set the variable "check_includes" here and it was unused before it went
 out of scope.
 See //brave/browser/sources.gni:445:41: which caused the file to be included.
   brave_chrome_browser_public_deps += [ "//brave/browser/mac:keystone_glue" ]
                                         ^----------------------------------

* Merge pull request #22986 from brave/ios-disable-partition-alloc

[iOS] Fix crash on launch with cr124

* Merge pull request #22985 from brave/maxk-fix-resource-ids-spec

Fixes components_brave_strings.grd ids being out of sync.

* Return the ffmpeg patch to fix memory usage (#22981)

* Merge pull request #22994 from brave/maxk-fix-cr124-colors

[Cr124 follow up] Fixes combobox and toggle hover colors.

* Merge pull request #23005 from brave/maxk-move-tab-memory-usage-toggle-to-tabs-settings

Moves tabs memory usage toggle to Tabs section in Appearance.

* Merge pull request #22996 from brave/fix_side_panel_card_background

Fixed side panel color issues from CR 124

---------

Co-authored-by: Kyle Hickinson <[email protected]>
Co-authored-by: Mikhail <[email protected]>
Co-authored-by: Simon Hong <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@goodov goodov goodov approved these changes

Assignees

@atuchin-m atuchin-m

Labels
None yet
Projects
None yet
Milestone
1.66.x - Release
Development

Successfully merging this pull request may close these issues.

Return FFMpeg patch to fix memory use
2 participants
@atuchin-m @goodov