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

Unified Diff: media/filters/decrypting_video_decoder.cc

Issue 57403003: Remove EMPTY from VideoFrame::Format. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@vframe_rgb
Patch Set: Created 7 years, 1 month 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/base/video_frame_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index cb94c8ca75842dc2a13fa137ff3b59b7c4c07cb6..43b1a1d1467c0a234a4f269a882794d30d676a33 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -80,7 +80,7 @@ void DecryptingVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
// Return empty frames if decoding has finished.
if (state_ == kDecodeFinished) {
- base::ResetAndReturn(&decode_cb_).Run(kOk, VideoFrame::CreateEmptyFrame());
+ base::ResetAndReturn(&decode_cb_).Run(kOk, VideoFrame::CreateEOSFrame());
return;
}
@@ -282,7 +282,7 @@ void DecryptingVideoDecoder::DeliverFrame(
if (scoped_pending_buffer_to_decode->end_of_stream()) {
state_ = kDecodeFinished;
base::ResetAndReturn(&decode_cb_).Run(
- kOk, media::VideoFrame::CreateEmptyFrame());
+ kOk, media::VideoFrame::CreateEOSFrame());
return;
}
@@ -293,7 +293,7 @@ void DecryptingVideoDecoder::DeliverFrame(
DCHECK_EQ(status, Decryptor::kSuccess);
// No frame returned with kSuccess should be end-of-stream frame.
- DCHECK(!frame->IsEndOfStream());
+ DCHECK(!frame->end_of_stream());
state_ = kIdle;
base::ResetAndReturn(&decode_cb_).Run(kOk, frame);
}
« no previous file with comments | « media/base/video_frame_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698