webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h - 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/ffmpeg_cdm_video_decoder.h

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/ffmpeg_cdm_audio_decoder.cc ('k') | webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.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 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_	5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_

6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_	6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

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

10 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h"	11 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h"

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

12	12

13 struct AVCodecContext;	13 struct AVCodecContext;

14 struct AVFrame;	14 struct AVFrame;

15	15

16 namespace webkit_media {	16 namespace webkit_media {

17	17

18 class FFmpegCdmVideoDecoder : public CdmVideoDecoder {	18 class FFmpegCdmVideoDecoder : public CdmVideoDecoder {

19 public:	19 public:

20 explicit FFmpegCdmVideoDecoder(cdm::Allocator* allocator);	20 explicit FFmpegCdmVideoDecoder(cdm::Allocator* allocator);

21 virtual ~FFmpegCdmVideoDecoder();	21 virtual ~FFmpegCdmVideoDecoder();

(...skipping 27 matching lines...) Expand all Loading...
49 bool is_initialized_;	49 bool is_initialized_;

50	50

51 cdm::Allocator* const allocator_;	51 cdm::Allocator* const allocator_;

52	52

53 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);	53 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);

54 };	54 };

55	55

56 } // namespace webkit_media	56 } // namespace webkit_media

57	57

58 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_	58 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_

OLD	NEW