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

Unified Diff: media/cast/net/cast_transport_sender_impl.cc

Issue 519443002: Cast: merge InsertCoded{Audio,Video}Frame into InsertFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more missing test file fixed Created 6 years, 3 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
« no previous file with comments | « media/cast/net/cast_transport_sender_impl.h ('k') | media/cast/net/cast_transport_sender_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/cast_transport_sender_impl.cc
diff --git a/media/cast/net/cast_transport_sender_impl.cc b/media/cast/net/cast_transport_sender_impl.cc
index 478f75a39b96524a57fce8ae69e26a07a365faae..a6b6fa4098c4e75b00212a94f228a383fae6dfa5 100644
--- a/media/cast/net/cast_transport_sender_impl.cc
+++ b/media/cast/net/cast_transport_sender_impl.cc
@@ -178,16 +178,15 @@ void EncryptAndSendFrame(const EncodedFrame& frame,
}
} // namespace
-void CastTransportSenderImpl::InsertCodedAudioFrame(
- const EncodedFrame& audio_frame) {
- DCHECK(audio_sender_) << "Audio sender uninitialized";
- EncryptAndSendFrame(audio_frame, &audio_encryptor_, audio_sender_.get());
-}
-
-void CastTransportSenderImpl::InsertCodedVideoFrame(
- const EncodedFrame& video_frame) {
- DCHECK(video_sender_) << "Video sender uninitialized";
- EncryptAndSendFrame(video_frame, &video_encryptor_, video_sender_.get());
+void CastTransportSenderImpl::InsertFrame(uint32 ssrc,
+ const EncodedFrame& frame) {
+ if (audio_sender_ && ssrc == audio_sender_->ssrc()) {
+ EncryptAndSendFrame(frame, &audio_encryptor_, audio_sender_.get());
+ } else if (video_sender_ && ssrc == video_sender_->ssrc()) {
+ EncryptAndSendFrame(frame, &video_encryptor_, video_sender_.get());
+ } else {
+ NOTREACHED() << "Invalid InsertFrame call.";
+ }
}
void CastTransportSenderImpl::SendSenderReport(
« no previous file with comments | « media/cast/net/cast_transport_sender_impl.h ('k') | media/cast/net/cast_transport_sender_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698