media/mojo/common/media_type_converters_unittest.cc - Issue 1977173002: Rename media::interfaces to media::mojom.

Unified Diff: media/mojo/common/media_type_converters_unittest.cc

Issue 1977173002: Rename media::interfaces to media::mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: android + chromeos files Created 4 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: media/mojo/common/media_type_converters_unittest.cc

diff --git a/media/mojo/common/media_type_converters_unittest.cc b/media/mojo/common/media_type_converters_unittest.cc

index 0da9991c6799b22ce70f3b8b1a1f8c4f8aed6516..04389875cf4762109f9e6f2b742465e5d98669fd 100644

--- a/media/mojo/common/media_type_converters_unittest.cc

+++ b/media/mojo/common/media_type_converters_unittest.cc

@@ -191,7 +191,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_Normal) {

base::TimeDelta::FromMilliseconds(6)));

// Convert from and back.

- interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));

+ mojom::DecoderBufferPtr ptr(mojom::DecoderBuffer::From(buffer));

scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());

// Compare.

@@ -216,7 +216,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_EOS) {

scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CreateEOSBuffer());

// Convert from and back.

- interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));

+ mojom::DecoderBufferPtr ptr(mojom::DecoderBuffer::From(buffer));

scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());

// Compare.

@@ -234,7 +234,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_KeyFrame) {

EXPECT_TRUE(buffer->is_key_frame());

// Convert from and back.

- interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));

+ mojom::DecoderBufferPtr ptr(mojom::DecoderBuffer::From(buffer));

scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());

// Compare.

@@ -262,7 +262,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_EncryptedBuffer) {

base::WrapUnique(new DecryptConfig(kKeyId, kIv, subsamples)));

// Convert from and back.

- interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));

+ mojom::DecoderBufferPtr ptr(mojom::DecoderBuffer::From(buffer));

scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());

// Compare.

@@ -274,8 +274,8 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_EncryptedBuffer) {

// Test empty IV. This is used for clear buffer in an encrypted stream.

buffer->set_decrypt_config(base::WrapUnique(

new DecryptConfig(kKeyId, "", std::vector<SubsampleEntry>())));

- result = interfaces::DecoderBuffer::From(buffer)

- .To<scoped_refptr<DecoderBuffer>>();

+ result =

+ mojom::DecoderBuffer::From(buffer).To<scoped_refptr<DecoderBuffer>>();

EXPECT_TRUE(buffer->decrypt_config()->Matches(*result->decrypt_config()));

EXPECT_TRUE(buffer->decrypt_config()->iv().empty());

}

@@ -290,8 +290,7 @@ TEST(MediaTypeConvertersTest, ConvertAudioDecoderConfig_Normal) {

AudioDecoderConfig config;

config.Initialize(kCodecAAC, kSampleFormatU8, CHANNEL_LAYOUT_SURROUND, 48000,

kExtraDataVector, Unencrypted(), base::TimeDelta(), 0);

- interfaces::AudioDecoderConfigPtr ptr(

- interfaces::AudioDecoderConfig::From(config));

+ mojom::AudioDecoderConfigPtr ptr(mojom::AudioDecoderConfig::From(config));

EXPECT_FALSE(ptr->extra_data.is_null());

AudioDecoderConfig result(ptr.To<AudioDecoderConfig>());

EXPECT_TRUE(result.Matches(config));

@@ -301,8 +300,7 @@ TEST(MediaTypeConvertersTest, ConvertAudioDecoderConfig_EmptyExtraData) {

AudioDecoderConfig config;

config.Initialize(kCodecAAC, kSampleFormatU8, CHANNEL_LAYOUT_SURROUND, 48000,

EmptyExtraData(), Unencrypted(), base::TimeDelta(), 0);

- interfaces::AudioDecoderConfigPtr ptr(

- interfaces::AudioDecoderConfig::From(config));

+ mojom::AudioDecoderConfigPtr ptr(mojom::AudioDecoderConfig::From(config));

EXPECT_TRUE(ptr->extra_data.is_null());

AudioDecoderConfig result(ptr.To<AudioDecoderConfig>());

EXPECT_TRUE(result.Matches(config));

@@ -313,8 +311,7 @@ TEST(MediaTypeConvertersTest, ConvertAudioDecoderConfig_Encrypted) {

config.Initialize(kCodecAAC, kSampleFormatU8, CHANNEL_LAYOUT_SURROUND, 48000,

EmptyExtraData(), AesCtrEncryptionScheme(),

base::TimeDelta(), 0);

- interfaces::AudioDecoderConfigPtr ptr(

- interfaces::AudioDecoderConfig::From(config));

+ mojom::AudioDecoderConfigPtr ptr(mojom::AudioDecoderConfig::From(config));

AudioDecoderConfig result(ptr.To<AudioDecoderConfig>());

EXPECT_TRUE(result.Matches(config));

}

@@ -327,8 +324,7 @@ TEST(MediaTypeConvertersTest, ConvertVideoDecoderConfig_Normal) {

VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, PIXEL_FORMAT_YV12,

COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,

kNaturalSize, kExtraDataVector, Unencrypted());

- interfaces::VideoDecoderConfigPtr ptr(

- interfaces::VideoDecoderConfig::From(config));

+ mojom::VideoDecoderConfigPtr ptr(mojom::VideoDecoderConfig::From(config));

EXPECT_FALSE(ptr->extra_data.is_null());

VideoDecoderConfig result(ptr.To<VideoDecoderConfig>());

EXPECT_TRUE(result.Matches(config));

@@ -338,8 +334,7 @@ TEST(MediaTypeConvertersTest, ConvertVideoDecoderConfig_EmptyExtraData) {

VideoDecoderConfig config(kCodecVP8, VP8PROFILE_ANY, PIXEL_FORMAT_YV12,

COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,

kNaturalSize, EmptyExtraData(), Unencrypted());

- interfaces::VideoDecoderConfigPtr ptr(

- interfaces::VideoDecoderConfig::From(config));

+ mojom::VideoDecoderConfigPtr ptr(mojom::VideoDecoderConfig::From(config));

EXPECT_TRUE(ptr->extra_data.is_null());

VideoDecoderConfig result(ptr.To<VideoDecoderConfig>());

EXPECT_TRUE(result.Matches(config));

@@ -350,8 +345,7 @@ TEST(MediaTypeConvertersTest, ConvertVideoDecoderConfig_Encrypted) {

COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,

kNaturalSize, EmptyExtraData(),

AesCtrEncryptionScheme());

- interfaces::VideoDecoderConfigPtr ptr(

- interfaces::VideoDecoderConfig::From(config));

+ mojom::VideoDecoderConfigPtr ptr(mojom::VideoDecoderConfig::From(config));

VideoDecoderConfig result(ptr.To<VideoDecoderConfig>());

EXPECT_TRUE(result.Matches(config));

}

@@ -362,7 +356,7 @@ TEST(MediaTypeConvertersTest, ConvertCdmConfig) {

config.allow_persistent_state = false;

config.use_hw_secure_codecs = true;

- interfaces::CdmConfigPtr ptr(interfaces::CdmConfig::From(config));

+ mojom::CdmConfigPtr ptr(mojom::CdmConfig::From(config));

CdmConfig result(ptr.To<CdmConfig>());

EXPECT_EQ(config.allow_distinctive_identifier,

@@ -376,7 +370,7 @@ TEST(MediaTypeConvertersTest, ConvertAudioBuffer_EOS) {

scoped_refptr<AudioBuffer> buffer(AudioBuffer::CreateEOSBuffer());

// Convert to and back.

- interfaces::AudioBufferPtr ptr(interfaces::AudioBuffer::From(buffer));

+ mojom::AudioBufferPtr ptr(mojom::AudioBuffer::From(buffer));

scoped_refptr<AudioBuffer> result(ptr.To<scoped_refptr<AudioBuffer>>());

// Compare.

@@ -393,7 +387,7 @@ TEST(MediaTypeConvertersTest, ConvertAudioBuffer_MONO) {

kSampleRate / 100, base::TimeDelta());

// Convert to and back.

- interfaces::AudioBufferPtr ptr(interfaces::AudioBuffer::From(buffer));

+ mojom::AudioBufferPtr ptr(mojom::AudioBuffer::From(buffer));

scoped_refptr<AudioBuffer> result(ptr.To<scoped_refptr<AudioBuffer>>());

// Compare.

@@ -410,7 +404,7 @@ TEST(MediaTypeConvertersTest, ConvertAudioBuffer_FLOAT) {

ChannelLayoutToChannelCount(kChannelLayout), kSampleRate, 0.0f, 1.0f,

kSampleRate / 10, start_time);

// Convert to and back.

- interfaces::AudioBufferPtr ptr(interfaces::AudioBuffer::From(buffer));

+ mojom::AudioBufferPtr ptr(mojom::AudioBuffer::From(buffer));

scoped_refptr<AudioBuffer> result(ptr.To<scoped_refptr<AudioBuffer>>());

// Compare.

@@ -422,7 +416,7 @@ TEST(MediaTypeConvertersTest, ConvertVideoFrame_EOS) {

scoped_refptr<VideoFrame> buffer(VideoFrame::CreateEOSFrame());

// Convert to and back.

- interfaces::VideoFramePtr ptr(interfaces::VideoFrame::From(buffer));

+ mojom::VideoFramePtr ptr(mojom::VideoFrame::From(buffer));

scoped_refptr<VideoFrame> result(ptr.To<scoped_refptr<VideoFrame>>());

// Compare.

@@ -435,7 +429,7 @@ TEST(MediaTypeConvertersTest, ConvertVideoFrame_EmptyFrame) {

gfx::Size(100, 100), base::TimeDelta::FromSeconds(100)));

// Convert to and back.

- interfaces::VideoFramePtr ptr(interfaces::VideoFrame::From(frame));

+ mojom::VideoFramePtr ptr(mojom::VideoFrame::From(frame));

scoped_refptr<VideoFrame> result(ptr.To<scoped_refptr<VideoFrame>>());

EXPECT_NE(result.get(), nullptr);

@@ -447,7 +441,7 @@ TEST(MediaTypeConvertersTest, ConvertVideoFrame_ColorFrame) {

scoped_refptr<VideoFrame> frame(CreateMojoSharedBufferColorFrame());

// Convert to and back.

- interfaces::VideoFramePtr ptr(interfaces::VideoFrame::From(frame));

+ mojom::VideoFramePtr ptr(mojom::VideoFrame::From(frame));

scoped_refptr<VideoFrame> result(ptr.To<scoped_refptr<VideoFrame>>());

EXPECT_NE(result.get(), nullptr);

@@ -461,8 +455,7 @@ TEST(MediaTypeConvertersTest, ConvertEncryptionSchemeAesCbcWithPattern) {

EncryptionScheme::Pattern(1, 9));

// Convert to and back.

- interfaces::EncryptionSchemePtr ptr(

- interfaces::EncryptionScheme::From(scheme));

+ mojom::EncryptionSchemePtr ptr(mojom::EncryptionScheme::From(scheme));

EncryptionScheme result(ptr.To<EncryptionScheme>());

EXPECT_TRUE(result.Matches(scheme));

« no previous file with comments | « media/mojo/common/media_type_converters.cc ('k') | media/mojo/common/mojo_shared_buffer_video_frame.h » ('j') | no next file with comments »