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

Unified Diff: media/filters/fake_video_decoder.cc

Issue 1834303005: Refactor audio and video decoder status into common file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments. Created 4 years, 9 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
« no previous file with comments | « media/filters/fake_video_decoder.h ('k') | media/filters/fake_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/fake_video_decoder.cc
diff --git a/media/filters/fake_video_decoder.cc b/media/filters/fake_video_decoder.cc
index f1188d00c4b33429bb8150258e22584bc1a1f99e..407fdedf3ce42cee1e72dbc3aa18714defbd2b93 100644
--- a/media/filters/fake_video_decoder.cc
+++ b/media/filters/fake_video_decoder.cc
@@ -93,7 +93,7 @@ void FakeVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
BindToCurrentLoop(decode_cb));
if (state_ == STATE_ERROR) {
- wrapped_decode_cb.Run(kDecodeError);
+ wrapped_decode_cb.Run(DecodeStatus::DECODE_ERROR);
return;
}
@@ -180,7 +180,7 @@ void FakeVideoDecoder::SimulateError() {
state_ = STATE_ERROR;
while (!held_decode_callbacks_.empty()) {
- held_decode_callbacks_.front().Run(kDecodeError);
+ held_decode_callbacks_.front().Run(DecodeStatus::DECODE_ERROR);
held_decode_callbacks_.pop_front();
}
decoded_frames_.clear();
@@ -196,10 +196,10 @@ int FakeVideoDecoder::GetMaxDecodeRequests() const {
void FakeVideoDecoder::OnFrameDecoded(int buffer_size,
const DecodeCB& decode_cb,
- Status status) {
+ DecodeStatus status) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (status == kOk) {
+ if (status == DecodeStatus::OK) {
total_bytes_decoded_ += buffer_size;
bytes_decoded_cb_.Run(buffer_size);
}
@@ -222,7 +222,7 @@ void FakeVideoDecoder::RunDecodeCallback(const DecodeCB& decode_cb) {
if (!reset_cb_.IsNull()) {
DCHECK(decoded_frames_.empty());
- decode_cb.Run(kAborted);
+ decode_cb.Run(DecodeStatus::ABORTED);
return;
}
@@ -247,7 +247,7 @@ void FakeVideoDecoder::RunDecodeCallback(const DecodeCB& decode_cb) {
}
}
- decode_cb.Run(kOk);
+ decode_cb.Run(DecodeStatus::OK);
}
void FakeVideoDecoder::DoReset() {
« no previous file with comments | « media/filters/fake_video_decoder.h ('k') | media/filters/fake_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698