Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Side by Side Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 610733002: Rename kWebMEncryptInitDataType to kWebMInitDataType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back webm_crypto_helpers.h changes. Created 6 years, 2 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
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 5 #include <algorithm>
6 #include <deque> 6 #include <deque>
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 stream = demuxer_->GetStream(DemuxerStream::AUDIO); 351 stream = demuxer_->GetStream(DemuxerStream::AUDIO);
352 ASSERT_TRUE(stream); 352 ASSERT_TRUE(stream);
353 EXPECT_EQ(DemuxerStream::AUDIO, stream->type()); 353 EXPECT_EQ(DemuxerStream::AUDIO, stream->type());
354 EXPECT_EQ(kCodecVorbis, stream->audio_decoder_config().codec()); 354 EXPECT_EQ(kCodecVorbis, stream->audio_decoder_config().codec());
355 355
356 // Unknown stream should never be present. 356 // Unknown stream should never be present.
357 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::UNKNOWN)); 357 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::UNKNOWN));
358 } 358 }
359 359
360 TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) { 360 TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) {
361 EXPECT_CALL(*this, NeedKeyCBMock(kWebMEncryptInitDataType, NotNull(), 361 EXPECT_CALL(*this, NeedKeyCBMock(kWebMInitDataType, NotNull(),
362 DecryptConfig::kDecryptionKeySize)) 362 DecryptConfig::kDecryptionKeySize))
363 .Times(Exactly(2)); 363 .Times(Exactly(2));
364 364
365 CreateDemuxer("bear-320x240-av_enc-av.webm"); 365 CreateDemuxer("bear-320x240-av_enc-av.webm");
366 InitializeDemuxer(); 366 InitializeDemuxer();
367 } 367 }
368 368
369 TEST_F(FFmpegDemuxerTest, Read_Audio) { 369 TEST_F(FFmpegDemuxerTest, Read_Audio) {
370 // We test that on a successful audio packet read. 370 // We test that on a successful audio packet read.
371 CreateDemuxer("bear-320x240.webm"); 371 CreateDemuxer("bear-320x240.webm");
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 InitializeDemuxer(); 942 InitializeDemuxer();
943 943
944 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); 944 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
945 ASSERT_TRUE(stream); 945 ASSERT_TRUE(stream);
946 ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation()); 946 ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation());
947 } 947 }
948 948
949 #endif 949 #endif
950 950
951 } // namespace media 951 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698