Index: media/mojo/services/media_type_converters_unittest.cc |
diff --git a/media/mojo/services/media_type_converters_unittest.cc b/media/mojo/services/media_type_converters_unittest.cc |
index e5ad20e3f3b81cf483b114ac2e18d4b516a0e484..29049b6e737e17f27d8dc4cfdc3099f9e4eb4d65 100644 |
--- a/media/mojo/services/media_type_converters_unittest.cc |
+++ b/media/mojo/services/media_type_converters_unittest.cc |
@@ -4,6 +4,7 @@ |
#include "media/mojo/services/media_type_converters.h" |
+#include "media/base/audio_decoder_config.h" |
#include "media/base/decoder_buffer.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -12,7 +13,7 @@ using media::DecoderBuffer; |
namespace mojo { |
namespace test { |
-TEST(MediaTypeConvertersTest, DecoderBuffer) { |
+TEST(MediaTypeConvertersTest, ConvertDecoderBuffer) { |
const uint8 kData[] = "hello, world"; |
const uint8 kSideData[] = "sideshow bob"; |
const int kDataSize = arraysize(kData); |
@@ -46,5 +47,24 @@ TEST(MediaTypeConvertersTest, DecoderBuffer) { |
// TODO(tim): Handle EOS, check other properties. |
+TEST(MediaTypeConvertersTest, ConvertAudioDecoderConfig) { |
+ const uint8 kExtraData[] = "config extra data"; |
+ const int kExtraDataSize = arraysize(kExtraData); |
+ media::AudioDecoderConfig config; |
+ config.Initialize(media::kCodecAAC, |
+ media::kSampleFormatU8, |
+ media::CHANNEL_LAYOUT_SURROUND, |
+ 48000, |
+ reinterpret_cast<const uint8*>(&kExtraData), |
+ kExtraDataSize, |
+ false, |
+ false, |
+ base::TimeDelta(), |
+ 0); |
+ AudioDecoderConfigPtr ptr(AudioDecoderConfig::From(config)); |
+ media::AudioDecoderConfig result(ptr.To<media::AudioDecoderConfig>()); |
+ EXPECT_TRUE(result.Matches(config)); |
+} |
+ |
} // namespace test |
} // namespace mojo |