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

Side by Side Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 1320893004: Mac Overlays: Enable h264 overlays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ScopedPtrMap, service/client names Created 5 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/common/gpu/media/gpu_video_decode_accelerator.h" 5 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage, 351 make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
352 base::Unretained(this)))); 352 base::Unretained(this))));
353 #endif 353 #endif
354 return decoder.Pass(); 354 return decoder.Pass();
355 } 355 }
356 356
357 scoped_ptr<media::VideoDecodeAccelerator> 357 scoped_ptr<media::VideoDecodeAccelerator>
358 GpuVideoDecodeAccelerator::CreateVTVDA() { 358 GpuVideoDecodeAccelerator::CreateVTVDA() {
359 scoped_ptr<media::VideoDecodeAccelerator> decoder; 359 scoped_ptr<media::VideoDecodeAccelerator> decoder;
360 #if defined(OS_MACOSX) 360 #if defined(OS_MACOSX)
361 decoder.reset(new VTVideoDecodeAccelerator(make_context_current_)); 361 decoder.reset(new VTVideoDecodeAccelerator(
362 make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
363 base::Unretained(this))));
362 #endif 364 #endif
363 return decoder.Pass(); 365 return decoder.Pass();
364 } 366 }
365 367
366 scoped_ptr<media::VideoDecodeAccelerator> 368 scoped_ptr<media::VideoDecodeAccelerator>
367 GpuVideoDecodeAccelerator::CreateOzoneVDA() { 369 GpuVideoDecodeAccelerator::CreateOzoneVDA() {
368 scoped_ptr<media::VideoDecodeAccelerator> decoder; 370 scoped_ptr<media::VideoDecodeAccelerator> decoder;
369 #if !defined(OS_CHROMEOS) && defined(USE_OZONE) 371 #if !defined(OS_CHROMEOS) && defined(USE_OZONE)
370 media::MediaOzonePlatform* platform = 372 media::MediaOzonePlatform* platform =
371 media::MediaOzonePlatform::GetInstance(); 373 media::MediaOzonePlatform::GetInstance();
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 return stub_->channel()->Send(message); 606 return stub_->channel()->Send(message);
605 } 607 }
606 608
607 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message, 609 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message,
608 bool succeeded) { 610 bool succeeded) {
609 GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded); 611 GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded);
610 Send(message); 612 Send(message);
611 } 613 }
612 614
613 } // namespace content 615 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698