third_party/widevine/cdm/stub/widevine_cdm_version.h - Issue 1043673002: Allow widevinecdmadapter to be built in Chromium

Side by Side Diff: third_party/widevine/cdm/stub/widevine_cdm_version.h

Issue 1043673002: Allow widevinecdmadapter to be built in Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changes Created 5 years, 8 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

« third_party/widevine/cdm/copy_with_rename.py ('K') | « third_party/widevine/cdm/copy_with_rename.py ('k') | third_party/widevine/cdm/widevine_cdm.gyp » ('j') | third_party/widevine/cdm/widevine_cdm.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
	ddorwin 2015/04/01 23:27:32 Widevine file should be in t_p/wv. Widevine file should be in t_p/wv. jrummell 2015/04/02 23:47:55 The Android specific one is in t_p/wv/cdm/android, Show quoted text On 2015/04/01 23:27:32, ddorwin wrote: > Widevine file should be in t_p/wv. The Android specific one is in t_p/wv/cdm/android, and the generic one is in t_p/wv/cdm. I think it would be confusing to have it in the top directory. ddorwin 2015/04/03 02:06:56 WV-specific code doesn't belong here. You can put Show quoted text On 2015/04/02 23:47:55, jrummell wrote: > On 2015/04/01 23:27:32, ddorwin wrote: > > Widevine file should be in t_p/wv. > > The Android specific one is in t_p/wv/cdm/android, and the generic one is in > t_p/wv/cdm. I think it would be confusing to have it in the top directory. WV-specific code doesn't belong here. You can put it in a stub/ directory, name it stub_.../ or even just use the Android one. That might be the simplest. You can reference 349182, which will eliminate the need for such a file. ddorwin 2015/04/03 18:30:56 As discussed, this is fine. My original comment wa Show quoted text On 2015/04/03 02:06:56, ddorwin wrote: > On 2015/04/02 23:47:55, jrummell wrote: > > On 2015/04/01 23:27:32, ddorwin wrote: > > > Widevine file should be in t_p/wv. > > > > The Android specific one is in t_p/wv/cdm/android, and the generic one is in > > t_p/wv/cdm. I think it would be confusing to have it in the top directory. > > WV-specific code doesn't belong here. > > You can put it in a stub/ directory, name it stub_.../ or even just use the > Android one. That might be the simplest. You can reference 349182, which will > eliminate the need for such a file. As discussed, this is fine. My original comment was incorrect, which led to a confusing conversation. Sorry about that.
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 // This is a stand-in for a generated file that is available when the

	6 // Widevine CDM is available.

	7

5 #ifndef WIDEVINE_CDM_VERSION_H_	8 #ifndef WIDEVINE_CDM_VERSION_H_

6 #define WIDEVINE_CDM_VERSION_H_	9 #define WIDEVINE_CDM_VERSION_H_

7	10

8 #include "third_party/widevine/cdm/widevine_cdm_common.h"	11 #include "third_party/widevine/cdm/widevine_cdm_common.h"

9	12

10 // Indicates that the Widevine CDM is available.

11 #define WIDEVINE_CDM_AVAILABLE	13 #define WIDEVINE_CDM_AVAILABLE
	xhwang 2015/04/02 18:51:52 What's the long term plan on this? Should we just What's the long term plan on this? Should we just define WIDEVINE_CDM_AVAILABLE based on 'enable_widevine'? ddorwin 2015/04/02 23:20:59 Yes, this file will go away. Until we have the lon Show quoted text On 2015/04/02 18:51:52, xhwang wrote: > What's the long term plan on this? Should we just define WIDEVINE_CDM_AVAILABLE > based on 'enable_widevine'? Yes, this file will go away. Until we have the long-term GYP/GN fix, though, we rely on the magic of including this file in various parts of Chromium. jrummell 2015/04/02 23:47:55 enable_widevine is just a gyp variable currently, Show quoted text On 2015/04/02 18:51:52, xhwang wrote: > What's the long term plan on this? Should we just define WIDEVINE_CDM_AVAILABLE > based on 'enable_widevine'? enable_widevine is just a gyp variable currently, and doesn't make it into the code. sandersd@ CL was an attempt to clean it up, but ran into problems changing common.gypi (where the -D would need to be specified).
12	14

13 #endif // WIDEVINE_CDM_VERSION_H_	15 #endif // WIDEVINE_CDM_VERSION_H_

OLD	NEW