webkit/media/crypto/ppapi/cdm_video_decoder.cc - Issue 11568045: Replace Chromium's content_decryption_module.h with the independent DEPS'd instance.

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: webkit/media/crypto/ppapi/cdm_video_decoder.cc

Issue 11568045: Replace Chromium's content_decryption_module.h with the independent DEPS'd instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years 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 | Annotate | Revision Log

« no previous file with comments | « webkit/media/crypto/ppapi/cdm_video_decoder.h ('k') | webkit/media/crypto/ppapi/cdm_wrapper.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

	7 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"

7 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h"	8 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h"

8 #include "webkit/media/crypto/ppapi/content_decryption_module.h"

9	9

10 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)	10 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)

11 #include "webkit/media/crypto/ppapi/fake_cdm_video_decoder.h"	11 #include "webkit/media/crypto/ppapi/fake_cdm_video_decoder.h"

12 #endif	12 #endif

13	13

14 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)	14 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)

15 #include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"	15 #include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"

16 #endif	16 #endif

17	17

18 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)	18 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)

(...skipping 30 matching lines...) Expand all Loading...
49 if (!video_decoder->Initialize(config))	49 if (!video_decoder->Initialize(config))

50 video_decoder.reset();	50 video_decoder.reset();

51 #endif	51 #endif

52	52

53 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER	53 #endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER

54	54

55 return video_decoder.Pass();	55 return video_decoder.Pass();

56 }	56 }

57	57

58 } // namespace webkit_media	58 } // namespace webkit_media

OLD	NEW