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

Unified Diff: media/cast/video_sender/video_encoder_impl.cc

Issue 288103002: [Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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/video_sender/video_encoder_impl.cc
diff --git a/media/cast/video_sender/video_encoder_impl.cc b/media/cast/video_sender/video_encoder_impl.cc
index 2eceda30af00f893e506f03ee275d5d9c6ef65f3..7f8f1e48eed56b721fcd6fd783707ec7b1ced331 100644
--- a/media/cast/video_sender/video_encoder_impl.cc
+++ b/media/cast/video_sender/video_encoder_impl.cc
@@ -43,25 +43,24 @@ void EncodeVideoFrameOnEncoderThread(
dynamic_config.latest_frame_id_to_reference);
encoder->UpdateRates(dynamic_config.bit_rate);
- scoped_ptr<transport::EncodedVideoFrame> encoded_frame(
- new transport::EncodedVideoFrame());
- bool retval = encoder->Encode(video_frame, encoded_frame.get());
-
- encoded_frame->rtp_timestamp = transport::GetVideoRtpTimestamp(capture_time);
-
- if (!retval) {
+ scoped_ptr<transport::EncodedFrame> encoded_frame(
+ new transport::EncodedFrame());
+ if (!encoder->Encode(video_frame, encoded_frame.get())) {
VLOG(1) << "Encoding failed";
return;
}
- if (encoded_frame->data.size() <= 0) {
+ if (encoded_frame->data.empty()) {
VLOG(1) << "Encoding resulted in an empty frame";
return;
}
+ encoded_frame->rtp_timestamp = transport::GetVideoRtpTimestamp(capture_time);
+ encoded_frame->reference_time = capture_time;
+
environment->PostTask(
CastEnvironment::MAIN,
FROM_HERE,
base::Bind(
- frame_encoded_callback, base::Passed(&encoded_frame), capture_time));
+ frame_encoded_callback, base::Passed(&encoded_frame)));
}
} // namespace
« no previous file with comments | « media/cast/video_sender/video_encoder_impl.h ('k') | media/cast/video_sender/video_encoder_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698