media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc - Issue 1544313002: Convert Pass()→std::move() in //media

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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/cdm/json_web_key.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

OLD	NEW
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 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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.Pass();	53 return video_decoder;

54 }	54 }

55	55

56 } // namespace media	56 } // namespace media

OLD	NEW