media/base/media_util.cc - Issue 1490613005: media config: expand is_encrypted to a struct.

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/base/media_util.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more xhwang comments Created 4 years, 9 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:

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "media/base/media_util.h"	5 #include "media/base/media_util.h"

6	6

7 namespace media {	7 namespace media {

8	8

9 std::vector<uint8_t> EmptyExtraData() {	9 std::vector<uint8_t> EmptyExtraData() {

10 return std::vector<uint8_t>();	10 return std::vector<uint8_t>();

11 }	11 }

12	12

	13 EncryptionScheme Unencrypted() {

	14 return EncryptionScheme();

	15 }

	16

	17 EncryptionScheme AesCtrEncryptionScheme() {

	18 return EncryptionScheme(EncryptionScheme::CIPHER_MODE_AES_CTR,

	19 EncryptionScheme::Pattern());
	xhwang 2016/03/07 18:39:52 nit: EncryptionScheme(EncryptionScheme::CIPHER_MOD nit: EncryptionScheme(EncryptionScheme::CIPHER_MODE_AES_CTR) should work? Well ignore this since you'll drop this constructor per ddorwin's comment :) dougsteed 2016/03/07 21:12:40 Done. Show quoted text On 2016/03/07 18:39:52, xhwang wrote: > nit: EncryptionScheme(EncryptionScheme::CIPHER_MODE_AES_CTR) should work? > > Well ignore this since you'll drop this constructor per ddorwin's comment :) Done.
	20 }

	21

13 } // namespace media	22 } // namespace media

OLD	NEW