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

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

Issue 1913503002: Memory copy the VideoFrame to match the requirement for HW encoders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. Created 4 years, 8 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/sender/size_adaptable_video_encoder_base.cc
diff --git a/media/cast/sender/size_adaptable_video_encoder_base.cc b/media/cast/sender/size_adaptable_video_encoder_base.cc
index 6d1399fb154424461817135ac0eb668d955adef4..9f0d51171ab1d42aa0550b5fcfc24718a2d1dd40 100644
--- a/media/cast/sender/size_adaptable_video_encoder_base.cc
+++ b/media/cast/sender/size_adaptable_video_encoder_base.cc
@@ -79,8 +79,8 @@ void SizeAdaptableVideoEncoderBase::GenerateKeyFrame() {
encoder_->GenerateKeyFrame();
}
-scoped_ptr<VideoFrameFactory>
- SizeAdaptableVideoEncoderBase::CreateVideoFrameFactory() {
+std::unique_ptr<VideoFrameFactory>
+SizeAdaptableVideoEncoderBase::CreateVideoFrameFactory() {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
return nullptr;
}
@@ -152,10 +152,16 @@ void SizeAdaptableVideoEncoderBase::OnEncoderStatusChange(
void SizeAdaptableVideoEncoderBase::OnEncodedVideoFrame(
const FrameEncodedCallback& frame_encoded_callback,
- scoped_ptr<SenderEncodedFrame> encoded_frame) {
+ std::unique_ptr<SenderEncodedFrame> encoded_frame) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
--frames_in_encoder_;
DCHECK_GE(frames_in_encoder_, 0);
+ // Encoding was exited with errors.
miu 2016/05/03 19:05:43 nit: Simplify: if (encoded_frame) last_fram
xjz 2016/05/03 23:30:15 Done.
+ if (!encoded_frame) {
+ frame_encoded_callback.Run(std::move(encoded_frame));
+ return;
+ }
+
last_frame_id_ = encoded_frame->frame_id;
frame_encoded_callback.Run(std::move(encoded_frame));
}

Powered by Google App Engine
This is Rietveld 408576698