Index: media/cast/test/sender.cc |
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc |
index 603b2de847c0124afda6e6dec1ff6becb689b513..89f91125b882ea326c7de2ffd966802752d74b6f 100644 |
--- a/media/cast/test/sender.cc |
+++ b/media/cast/test/sender.cc |
@@ -297,7 +297,9 @@ void UpdateCastTransportStatus( |
media::cast::transport::CastTransportStatus status) {} |
void InitializationResult(media::cast::CastInitializationStatus result) { |
- CHECK_EQ(result, media::cast::STATUS_INITIALIZED); |
+ bool end_result = result == media::cast::STATUS_AUDIO_INITIALIZED || |
+ result == media::cast::STATUS_VIDEO_INITIALIZED; |
+ CHECK(end_result); |
Ami GONE FROM CHROMIUM
2014/02/13 18:02:14
ditto
mikhal1
2014/02/14 18:03:16
Probably an overkill here, as it's just a test app
|
VLOG(1) << "Cast Sender initialized"; |
Ami GONE FROM CHROMIUM
2014/02/13 18:02:14
a bit of an overstatement now
mikhal1
2014/02/14 18:03:16
Done.
|
} |
@@ -365,12 +367,12 @@ int main(int argc, char** argv) { |
scoped_ptr<media::cast::CastSender> cast_sender( |
media::cast::CastSender::CreateCastSender( |
cast_environment, |
- &audio_config, |
- &video_config, |
- NULL, // gpu_factories. |
base::Bind(&InitializationResult), |
transport_sender.get())); |
+ cast_sender->InitializeVideo(video_config, NULL); |
+ cast_sender->InitializeAudio(audio_config); |
+ |
transport_sender->SetPacketReceiver(cast_sender->packet_receiver()); |
media::cast::FrameInput* frame_input = cast_sender->frame_input(); |