summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorowenlin <owenlin@chromium.org>2015-05-26 22:15:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-27 05:17:37 +0000
commite88fe07b4fd9c8146fb541b4cda6775105ecc2e4 (patch)
tree688a66ba61e9f4e741edb21a241e53be52739b91
parent29882b428437d2c70c2950c4699dc9277f7daa61 (diff)
downloadchromium_src-e88fe07b4fd9c8146fb541b4cda6775105ecc2e4.zip
chromium_src-e88fe07b4fd9c8146fb541b4cda6775105ecc2e4.tar.gz
chromium_src-e88fe07b4fd9c8146fb541b4cda6775105ecc2e4.tar.bz2
Loosen the requirement on the key frame request.
We should allow a keyframe comes after we request for one. BUG=485512 TEST=Run the test on Jerry. Review URL: https://codereview.chromium.org/1156103010 Cr-Commit-Position: refs/heads/master@{#331534}
-rw-r--r--content/common/gpu/media/video_encode_accelerator_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc
index 8405ac3..f870b9f 100644
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc
@@ -1195,8 +1195,7 @@ bool VEAClient::HandleEncodedFrame(bool keyframe) {
// kMaxKeyframeDelay frames after the frame, for which we requested
// it, comes back encoded.
if (keyframe) {
- if (num_keyframes_requested_ > 0 &&
- num_encoded_frames_ > next_keyframe_at_) {
+ if (num_keyframes_requested_ > 0) {
--num_keyframes_requested_;
next_keyframe_at_ += keyframe_period_;
}