media/cdm/cdm_wrapper.h - Issue 1534273002: Switch to standard integer types 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/cdm_wrapper.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more Created 5 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

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 #ifndef MEDIA_CDM_CDM_WRAPPER_H_	5 #ifndef MEDIA_CDM_CDM_WRAPPER_H_

6 #define MEDIA_CDM_CDM_WRAPPER_H_	6 #define MEDIA_CDM_CDM_WRAPPER_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"

11 #include "media/cdm/api/content_decryption_module.h"	10 #include "media/cdm/api/content_decryption_module.h"

12 #include "media/cdm/supported_cdm_versions.h"	11 #include "media/cdm/supported_cdm_versions.h"

13	12

14 #if defined(USE_PPAPI_CDM_ADAPTER)	13 #if defined(USE_PPAPI_CDM_ADAPTER)

15 // When building the ppapi adapter do not include any non-trivial base/ headers.	14 // When building the ppapi adapter do not include any non-trivial base/ headers.

16 #include "ppapi/cpp/logging.h"	15 #include "ppapi/cpp/logging.h"

17 #define PLATFORM_DCHECK PP_DCHECK	16 #define PLATFORM_DCHECK PP_DCHECK

18 #else	17 #else

19 #include "base/logging.h"	18 #include "base/logging.h"

20 #define PLATFORM_DCHECK DCHECK	19 #define PLATFORM_DCHECK DCHECK

(...skipping 296 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
317 // Also update supported_cdm_versions.h.	316 // Also update supported_cdm_versions.h.

318 static_assert(cdm::ContentDecryptionModule::kVersion ==	317 static_assert(cdm::ContentDecryptionModule::kVersion ==

319 cdm::ContentDecryptionModule_8::kVersion,	318 cdm::ContentDecryptionModule_8::kVersion,

320 "ensure cdm wrapper templates have old version support");	319 "ensure cdm wrapper templates have old version support");

321	320

322 } // namespace media	321 } // namespace media

323	322

324 #undef PLATFORM_DCHECK	323 #undef PLATFORM_DCHECK

325	324

326 #endif // MEDIA_CDM_CDM_WRAPPER_H_	325 #endif // MEDIA_CDM_CDM_WRAPPER_H_

OLD	NEW

« no previous file with comments | « media/cdm/cdm_helpers.h ('k') | media/cdm/cenc_utils.h » ('j') | media/cdm/stub/stub_cdm.h » ('J')