media/filters/pipeline_integration_test.cc - Issue 10539150: Add Decryptor interface.

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/filters/pipeline_integration_test.cc

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move decryptor.* and decryptor_client.h to src/media/base/ Created 8 years, 6 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

« media/crypto/aes_decryptor.h ('K') | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/media.gyp » ('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 #include "media/filters/pipeline_integration_test_base.h"	5 #include "media/filters/pipeline_integration_test_base.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "media/base/decoder_buffer.h"	8 #include "media/base/decoder_buffer.h"

	9 #include "media/base/decryptor_client.h"

9 #include "media/base/mock_filters.h"	10 #include "media/base/mock_filters.h"

10 #include "media/base/test_data_util.h"	11 #include "media/base/test_data_util.h"

11 #include "media/crypto/aes_decryptor.h"	12 #include "media/crypto/aes_decryptor.h"

12 #include "media/crypto/decryptor_client.h"

13 #include "media/filters/chunk_demuxer_client.h"	13 #include "media/filters/chunk_demuxer_client.h"

14	14

15 namespace media {	15 namespace media {

16	16

17 static const char kSourceId[] = "SourceId";	17 static const char kSourceId[] = "SourceId";

18 static const char kClearKeySystem[] = "org.w3.clearkey";	18 static const char kClearKeySystem[] = "org.w3.clearkey";

19 static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 };	19 static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 };

20	20

21 // Helper class that emulates calls made on the ChunkDemuxer by the	21 // Helper class that emulates calls made on the ChunkDemuxer by the

22 // Media Source API.	22 // Media Source API.

(...skipping 309 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
332	332

333 // Verify video decoder & renderer can handle aborted demuxer reads.	333 // Verify video decoder & renderer can handle aborted demuxer reads.

334 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {	334 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {

335 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,	335 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,

336 base::TimeDelta::FromMilliseconds(200),	336 base::TimeDelta::FromMilliseconds(200),

337 base::TimeDelta::FromMilliseconds(1668),	337 base::TimeDelta::FromMilliseconds(1668),

338 0x1C896, 65536, false, true));	338 0x1C896, 65536, false, true));

339 }	339 }

340	340

341 } // namespace media	341 } // namespace media

OLD	NEW