media/filters/decrypting_video_decoder.cc - Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/decrypting_video_decoder.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor

Patch Set: Created 7 years, 6 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

« media/filters/decrypting_demuxer_stream_unittest.cc ('K') | « media/filters/decrypting_demuxer_stream_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 3c39e3315fc7c3c73179be3bac0580b9e6efe556..cce8de05458c0d64cd92c7687ee6043424b7a9e9 100644

--- a/media/filters/decrypting_video_decoder.cc

+++ b/media/filters/decrypting_video_decoder.cc

@@ -260,8 +260,8 @@ void DecryptingVideoDecoder::DecodePendingBuffer() {

"eme", "DecryptingVideoDecoder::DecodePendingBuffer", ++trace_id_);

int buffer_size = 0;

- if (!pending_buffer_to_decode_->IsEndOfStream()) {

- buffer_size = pending_buffer_to_decode_->GetDataSize();

+ if (!pending_buffer_to_decode_->end_of_stream()) {

+ buffer_size = pending_buffer_to_decode_->data_size();

}

decryptor_->DecryptAndDecodeVideo(

@@ -332,7 +332,7 @@ void DecryptingVideoDecoder::DeliverFrame(

if (status == Decryptor::kNeedMoreData) {

DVLOG(2) << "DeliverFrame() - kNeedMoreData";

- if (scoped_pending_buffer_to_decode->IsEndOfStream()) {

+ if (scoped_pending_buffer_to_decode->end_of_stream()) {

state_ = kDecodeFinished;

base::ResetAndReturn(&read_cb_).Run(

kOk, media::VideoFrame::CreateEmptyFrame());