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

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

Issue 2064083002: media: Add Rappor reporting in MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 4 years, 6 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // |gpu_factories_| requires that its entry points be called on its 76 // |gpu_factories_| requires that its entry points be called on its
77 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the 77 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the
78 // factories, require that their message loops are identical. 78 // factories, require that their message loops are identical.
79 DCHECK(gpu_factories->GetTaskRunner() == media_task_runner.get()); 79 DCHECK(gpu_factories->GetTaskRunner() == media_task_runner.get());
80 80
81 if (decoder_factory_) { 81 if (decoder_factory_) {
82 decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories, 82 decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories,
83 &video_decoders); 83 &video_decoders);
84 } 84 }
85 video_decoders.push_back( 85 video_decoders.push_back(
86 new GpuVideoDecoder(gpu_factories, request_surface_cb)); 86 new GpuVideoDecoder(gpu_factories, request_surface_cb, media_log_));
87 } 87 }
88 88
89 #if !defined(MEDIA_DISABLE_LIBVPX) 89 #if !defined(MEDIA_DISABLE_LIBVPX)
90 video_decoders.push_back(new VpxVideoDecoder()); 90 video_decoders.push_back(new VpxVideoDecoder());
91 #endif 91 #endif
92 92
93 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) 93 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
94 video_decoders.push_back(new FFmpegVideoDecoder()); 94 video_decoders.push_back(new FFmpegVideoDecoder());
95 #endif 95 #endif
96 96
(...skipping 19 matching lines...) Expand all
116 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 116 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
117 media_task_runner, worker_task_runner, video_renderer_sink, 117 media_task_runner, worker_task_runner, video_renderer_sink,
118 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), 118 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories),
119 true, gpu_factories, media_log_)); 119 true, gpu_factories, media_log_));
120 120
121 return base::WrapUnique(new RendererImpl( 121 return base::WrapUnique(new RendererImpl(
122 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); 122 media_task_runner, std::move(audio_renderer), std::move(video_renderer)));
123 } 123 }
124 124
125 } // namespace media 125 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698