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

Unified Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 148423005: Use FF_THREAD_SLICE threading mode in FFmpeg for MediaSource streams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/filters/ffmpeg_video_decoder.h » ('j') | media/filters/ffmpeg_video_decoder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index b314732cf47c2ba22f1f12c39a0466308def80c8..b6bedb9e7ca43bba7c19605d1fc854307becd967 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -1139,7 +1139,14 @@ void WebMediaPlayerImpl::StartPipeline() {
video_decoders.push_back(new media::VpxVideoDecoder(media_loop_));
#endif // !defined(MEDIA_DISABLE_LIBVPX)
- video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_));
+ // Use slice-based threading for MediaSource streams to make sure the decoder
+ // doesn't retain decoded frames.
+ media::FFmpegVideoDecoder::ThreadingMode threading_mode =
+ load_type_ == LoadTypeMediaSource
+ ? media::FFmpegVideoDecoder::THREADING_SLICE
+ : media::FFmpegVideoDecoder::THREADING_FRAME;
+ video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_,
+ threading_mode));
Ami GONE FROM CHROMIUM 2014/01/28 07:17:10 git cl format
scoped_ptr<media::VideoRenderer> video_renderer(
new media::VideoRendererImpl(
« no previous file with comments | « no previous file | media/filters/ffmpeg_video_decoder.h » ('j') | media/filters/ffmpeg_video_decoder.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698