Index: chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
diff --git a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
index 26f903e855f30b1c36bf59fe44e887cfac3f9266..59f6c3da3afebed04881048f7f170e6d3cb7aa36 100644 |
--- a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
+++ b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc |
@@ -25,6 +25,8 @@ |
#include "chromecast/media/cma/backend/video_pipeline_device.h" |
#include "chromecast/media/cma/base/decoder_buffer_adapter.h" |
#include "chromecast/media/cma/base/decoder_buffer_base.h" |
+#include "chromecast/media/cma/base/decoder_config_adapter.h" |
+#include "chromecast/media/cma/public/decoder_config.h" |
#include "chromecast/media/cma/test/frame_segmenter_for_test.h" |
#include "chromecast/media/cma/test/media_component_device_feeder_for_test.h" |
#include "media/base/audio_decoder_config.h" |
@@ -154,7 +156,9 @@ void AudioVideoPipelineDeviceTest::LoadAudioStream(std::string filename) { |
AudioPipelineDevice* audio_pipeline_device = |
media_pipeline_device_->GetAudioPipelineDevice(); |
- bool success = audio_pipeline_device->SetConfig(demux_result.audio_config); |
+ bool success = |
+ audio_pipeline_device->SetConfig( |
+ DecoderConfigAdapter::ToAudioConfig(demux_result.audio_config)); |
ASSERT_TRUE(success); |
VLOG(2) << "Got " << frames.size() << " audio input frames"; |
@@ -174,7 +178,7 @@ void AudioVideoPipelineDeviceTest::LoadAudioStream(std::string filename) { |
void AudioVideoPipelineDeviceTest::LoadVideoStream(std::string filename, |
bool raw_h264) { |
BufferList frames; |
- ::media::VideoDecoderConfig video_config; |
+ VideoConfig video_config; |
if (raw_h264) { |
base::FilePath file_path = GetTestDataFilePath(filename); |
@@ -189,20 +193,17 @@ void AudioVideoPipelineDeviceTest::LoadVideoStream(std::string filename, |
gfx::Size natural_size(320, 240); |
// TODO(kjoswiak): Either pull data from stream or make caller specify value |
- video_config = ::media::VideoDecoderConfig( |
- ::media::kCodecH264, |
- ::media::H264PROFILE_MAIN, |
- ::media::VideoFrame::I420, |
- coded_size, |
- visible_rect, |
- natural_size, |
+ video_config = VideoConfig( |
+ VideoConfig::kCodecH264, |
+ VideoConfig::H264PROFILE_MAIN, |
NULL, 0, false); |
} else { |
base::FilePath file_path = GetTestDataFilePath(filename); |
DemuxResult demux_result = FFmpegDemuxForTest(file_path, |
/*audio*/ false); |
frames = demux_result.frames; |
- video_config = demux_result.video_config; |
+ video_config = |
+ DecoderConfigAdapter::ToVideoConfig(demux_result.video_config); |
} |
VideoPipelineDevice* video_pipeline_device = |