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

Unified Diff: media/filters/decrypting_video_decoder.cc

Issue 11929015: Tighten up media::DecoderBuffer API contract for end of stream buffers (round 2). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index 3ea3bba54b2d3fdc056d229915d57acf0b20fe86..e10596ffd0f6cf9c11a51e462d802f6c2d63d722 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -287,10 +287,15 @@ void DecryptingVideoDecoder::DecodePendingBuffer() {
DCHECK_EQ(state_, kPendingDecode) << state_;
TRACE_EVENT_ASYNC_BEGIN0(
"eme", "DecryptingVideoDecoder::DecodePendingBuffer", ++trace_id_);
+
+ int buffer_size = 0;
+ if (!pending_buffer_to_decode_->IsEndOfStream()) {
+ buffer_size = pending_buffer_to_decode_->GetDataSize();
+ }
+
decryptor_->DecryptAndDecodeVideo(
pending_buffer_to_decode_, BindToCurrentLoop(base::Bind(
- &DecryptingVideoDecoder::DeliverFrame, this,
- pending_buffer_to_decode_->GetDataSize())));
+ &DecryptingVideoDecoder::DeliverFrame, this, buffer_size)));
}
void DecryptingVideoDecoder::DeliverFrame(

Powered by Google App Engine
This is Rietveld 408576698