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

Issue 8294027: Merge r104540 into 874 (m15). (Closed)

Created:
9 years, 2 months ago by Ami GONE FROM CHROMIUM
Modified:
9 years, 2 months ago
CC:
chromium-reviews, hclam+watch_chromium.org, ddorwin+watch_chromium.org, fischman+watch_chromium.org, jam, acolwell+watch_chromium.org, annacc+watch_chromium.org, joi+watch-content_chromium.org, darin-cc_chromium.org, ajwong+watch_chromium.org, vrk (LEFT CHROMIUM), scherkus (not reviewing)
Visibility:
Public.

Description

Merge 104540 - Fix hangs & crashes in teardown-during-Seek. Hangs: - AudioRendererImpl: Don't hold lock_ in the call to Join() b/c OnStop wants to acquire the lock before exiting. - FFmpegDemuxerStream::Stop: signal EOS to waiting read callbacks (instead of silently dropping them on the floor) so decoders can exit instead of stalling (and causing renderers to stall). Crashes: - CompositeFilter::Stop: clear out the Seek callback when Stopping. - FFmpegVideoDecoder::ProduceVideoFrame: early-return if already stopped (racing with webkit repaints makes this necessary). Also fixed a bunch of mis-indentation where I saw it. BUG=98975, 98948, 98955, 96861 TEST=trybots, manual Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=105930

Patch Set 1 #

Patch Set 2 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+41 lines, -19 lines) Patch
M content/renderer/media/audio_renderer_impl.cc View 1 chunk +19 lines, -10 lines 0 comments Download
M media/base/composite_filter.cc View 1 chunk +6 lines, -0 lines 0 comments Download
M media/filters/ffmpeg_demuxer.cc View 4 chunks +7 lines, -2 lines 0 comments Download
M media/filters/ffmpeg_video_decoder.cc View 1 chunk +7 lines, -4 lines 0 comments Download
M media/filters/video_renderer_base.cc View 3 chunks +2 lines, -3 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Ami GONE FROM CHROMIUM
9 years, 2 months ago (2011-10-17 21:38:52 UTC) #1
scherkus (not reviewing)
9 years, 2 months ago (2011-10-17 21:44:16 UTC) #2
LGTM

Powered by Google App Engine
This is Rietveld 408576698