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

Unified Diff: media/cast/test/sender.cc

Issue 163553006: Cast: Refactoring Cast API's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/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();

Powered by Google App Engine
This is Rietveld 408576698