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

Side by Side Diff: media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
« no previous file with comments | « media/capture/video/win/video_capture_device_win.cc ('k') | media/midi/midi_manager_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" 6 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
7 7
8 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) 8 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
9 #include "media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h" 9 #include "media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h"
10 #endif 10 #endif
(...skipping 19 matching lines...) Expand all
30 #else 30 #else
31 31
32 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER) 32 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)
33 if (config.codec == cdm::VideoDecoderConfig::kCodecVp8 || 33 if (config.codec == cdm::VideoDecoderConfig::kCodecVp8 ||
34 config.codec == cdm::VideoDecoderConfig::kCodecVp9) { 34 config.codec == cdm::VideoDecoderConfig::kCodecVp9) {
35 video_decoder.reset(new LibvpxCdmVideoDecoder(host)); 35 video_decoder.reset(new LibvpxCdmVideoDecoder(host));
36 36
37 if (!video_decoder->Initialize(config)) 37 if (!video_decoder->Initialize(config))
38 video_decoder.reset(); 38 video_decoder.reset();
39 39
40 return video_decoder.Pass(); 40 return video_decoder;
41 } 41 }
42 #endif 42 #endif
43 43
44 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) 44 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
45 video_decoder.reset(new FFmpegCdmVideoDecoder(host)); 45 video_decoder.reset(new FFmpegCdmVideoDecoder(host));
46 46
47 if (!video_decoder->Initialize(config)) 47 if (!video_decoder->Initialize(config))
48 video_decoder.reset(); 48 video_decoder.reset();
49 #endif 49 #endif
50 50
51 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER 51 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
52 52
53 return video_decoder; 53 return video_decoder;
54 } 54 }
55 55
56 } // namespace media 56 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/win/video_capture_device_win.cc ('k') | media/midi/midi_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698