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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1665513002: Pass both 32 and 64 bit snapshot and natives fds to child processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 26d50ebf8542464d15c23acb4409f97565ab9272..a7f19ee7c534460800b661d5cd778f06b222142b 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1227,8 +1227,10 @@ void WebMediaPlayerAndroid::ReallocateVideoFrame() {
&OnReleaseTexture, stream_texture_factory_, texture_id_ref)),
natural_size_, gfx::Rect(natural_size_), natural_size_,
base::TimeDelta());
- new_frame->metadata()->SetBoolean(media::VideoFrameMetadata::COPY_REQUIRED,
- enable_texture_copy_);
+ if (new_frame.get()) {
+ new_frame->metadata()->SetBoolean(
Torne 2016/02/03 11:05:32 Did you mean to change this?
Tobias Sargeant 2016/02/03 11:14:11 No, comes from another CL. Will remove.
+ media::VideoFrameMetadata::COPY_REQUIRED, enable_texture_copy_);
+ }
SetCurrentFrameInternal(new_frame);
}
}

Powered by Google App Engine
This is Rietveld 408576698