Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(713)

Issue 1494113002: Revert "Fix race on demuxer memory usage. Reuse previous calculation." (Closed)

Created:
5 years ago by wdzierzanowski
Modified:
5 years ago
Reviewers:
DaleCurtis
CC:
chromium-reviews, feature-media-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert "Fix race on demuxer memory usage. Reuse previous calculation." This reverts commit 9ac642d1d2ed95b810ff276fb65c2be7b461e791. Now that Demuxer::GetMemoryUsage() runs on the media thread (fd4cd91c5eea8b3a4970f5512a306e4a03e33101), the reason for the race is removed and so the synchronization in FFmpegDemuxer can be removed too. BUG=564034 TEST=Crash page from https://crbug.com/447898 still doesn't crash Committed: https://crrev.com/9836863217881492da2ff68a74dd66323d11768a Cr-Commit-Position: refs/heads/master@{#363173}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+25 lines, -25 lines) Patch
M media/base/demuxer.h View 1 chunk +1 line, -2 lines 0 comments Download
M media/filters/ffmpeg_demuxer.h View 2 chunks +2 lines, -7 lines 0 comments Download
M media/filters/ffmpeg_demuxer.cc View 4 chunks +22 lines, -16 lines 0 comments Download

Messages

Total messages: 13 (5 generated)
wdzierzanowski
Hey Dale, please take a look at the next step after https://codereview.chromium.org/1480213005/.
5 years ago (2015-12-03 09:49:11 UTC) #2
DaleCurtis
lgtm
5 years ago (2015-12-03 21:55:23 UTC) #3
wdzierzanowski
Thanks!
5 years ago (2015-12-04 08:08:15 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1494113002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1494113002/1
5 years ago (2015-12-04 08:08:48 UTC) #6
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/138079)
5 years ago (2015-12-04 08:48:42 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1494113002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1494113002/1
5 years ago (2015-12-04 08:52:06 UTC) #10
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years ago (2015-12-04 09:22:13 UTC) #11
commit-bot: I haz the power
5 years ago (2015-12-04 09:23:13 UTC) #13
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/9836863217881492da2ff68a74dd66323d11768a
Cr-Commit-Position: refs/heads/master@{#363173}

Powered by Google App Engine
This is Rietveld 408576698