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

Side by Side Diff: media/renderers/default_renderer_factory.cc

Issue 2768713002: Pass a |media_log| to FFmpegVideoDecoder and roll ffmpeg (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/renderers/default_renderer_factory.h" 5 #include "media/renderers/default_renderer_factory.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 video_decoders.push_back( 82 video_decoders.push_back(
83 new GpuVideoDecoder(gpu_factories, request_surface_cb, media_log_)); 83 new GpuVideoDecoder(gpu_factories, request_surface_cb, media_log_));
84 } 84 }
85 85
86 #if !defined(MEDIA_DISABLE_LIBVPX) 86 #if !defined(MEDIA_DISABLE_LIBVPX)
87 video_decoders.push_back(new VpxVideoDecoder()); 87 video_decoders.push_back(new VpxVideoDecoder());
88 #endif 88 #endif
89 89
90 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) 90 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
91 video_decoders.push_back(new FFmpegVideoDecoder()); 91 video_decoders.push_back(new FFmpegVideoDecoder(media_log_));
92 #endif 92 #endif
93 93
94 return video_decoders; 94 return video_decoders;
95 } 95 }
96 96
97 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer( 97 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
98 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 98 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
99 const scoped_refptr<base::TaskRunner>& worker_task_runner, 99 const scoped_refptr<base::TaskRunner>& worker_task_runner,
100 AudioRendererSink* audio_renderer_sink, 100 AudioRendererSink* audio_renderer_sink,
101 VideoRendererSink* video_renderer_sink, 101 VideoRendererSink* video_renderer_sink,
(...skipping 11 matching lines...) Expand all
113 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 113 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
114 media_task_runner, worker_task_runner, video_renderer_sink, 114 media_task_runner, worker_task_runner, video_renderer_sink,
115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), 115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories),
116 true, gpu_factories, media_log_)); 116 true, gpu_factories, media_log_));
117 117
118 return base::MakeUnique<RendererImpl>( 118 return base::MakeUnique<RendererImpl>(
119 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); 119 media_task_runner, std::move(audio_renderer), std::move(video_renderer));
120 } 120 }
121 121
122 } // namespace media 122 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698