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

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

Issue 2966643002: media: Plumb MediaLog to MojoVideoDecoderService. (Closed)
Patch Set: Swap client/service directory. Created 3 years, 5 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
« no previous file with comments | « media/mojo/services/mojo_video_decoder_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 // Prefer an external decoder since one will only exist if it is hardware 72 // Prefer an external decoder since one will only exist if it is hardware
73 // accelerated. 73 // accelerated.
74 if (gpu_factories) { 74 if (gpu_factories) {
75 // |gpu_factories_| requires that its entry points be called on its 75 // |gpu_factories_| requires that its entry points be called on its
76 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the 76 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the
77 // factories, require that their message loops are identical. 77 // factories, require that their message loops are identical.
78 DCHECK(gpu_factories->GetTaskRunner() == media_task_runner.get()); 78 DCHECK(gpu_factories->GetTaskRunner() == media_task_runner.get());
79 79
80 if (decoder_factory_) { 80 if (decoder_factory_) {
81 decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories, 81 decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories,
82 &video_decoders); 82 media_log_, &video_decoders);
83 } 83 }
84 video_decoders.push_back(base::MakeUnique<GpuVideoDecoder>( 84 video_decoders.push_back(base::MakeUnique<GpuVideoDecoder>(
85 gpu_factories, request_overlay_info_cb, media_log_)); 85 gpu_factories, request_overlay_info_cb, media_log_));
86 } 86 }
87 87
88 #if !defined(MEDIA_DISABLE_LIBVPX) 88 #if !defined(MEDIA_DISABLE_LIBVPX)
89 video_decoders.push_back(base::MakeUnique<VpxVideoDecoder>()); 89 video_decoders.push_back(base::MakeUnique<VpxVideoDecoder>());
90 #endif 90 #endif
91 91
92 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) 92 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 base::Bind(&DefaultRendererFactory::CreateVideoDecoders, 131 base::Bind(&DefaultRendererFactory::CreateVideoDecoders,
132 base::Unretained(this), media_task_runner, 132 base::Unretained(this), media_task_runner,
133 request_overlay_info_cb, gpu_factories), 133 request_overlay_info_cb, gpu_factories),
134 true, gpu_factories, media_log_)); 134 true, gpu_factories, media_log_));
135 135
136 return base::MakeUnique<RendererImpl>( 136 return base::MakeUnique<RendererImpl>(
137 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); 137 media_task_runner, std::move(audio_renderer), std::move(video_renderer));
138 } 138 }
139 139
140 } // namespace media 140 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_video_decoder_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698