webkit/media/crypto/ppapi/cdm_video_decoder.h - Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4.

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.h

Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « DEPS ('k') | webkit/media/crypto/ppapi/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_CDM_VIDEO_DECODER_H_	5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_

6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_	6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_

7	7

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

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

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

(...skipping 18 matching lines...) Expand all Loading...
29 virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,	29 virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,

30 int32_t compressed_frame_size,	30 int32_t compressed_frame_size,

31 int64_t timestamp,	31 int64_t timestamp,

32 cdm::VideoFrame* decoded_frame) = 0;	32 cdm::VideoFrame* decoded_frame) = 0;

33 };	33 };

34	34

35 // Initializes appropriate video decoder based on GYP flags and the value of	35 // Initializes appropriate video decoder based on GYP flags and the value of

36 // \|config.codec\|. Returns a scoped_ptr containing a non-null initialized	36 // \|config.codec\|. Returns a scoped_ptr containing a non-null initialized

37 // CdmVideoDecoder* upon success.	37 // CdmVideoDecoder* upon success.

38 scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(	38 scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(

39 cdm::Allocator* allocator,	39 cdm::Host* host, const cdm::VideoDecoderConfig& config);

40 const cdm::VideoDecoderConfig& config);

41	40

42 } // namespace webkit_media	41 } // namespace webkit_media

43	42

44 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_	43 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_

OLD	NEW