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

Unified Diff: media/filters/vpx_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/opus_audio_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/vpx_video_decoder.cc
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
index 8fe66250cd480eedfff3b400670e6542c4a5ef6a..2d60d917a43d1855ee1226ac0c74dcf726002e30 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -401,25 +401,25 @@ void VpxVideoDecoder::DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer,
<< "Called Decode() before successful Initialize()";
if (state_ == kError) {
- bound_decode_cb.Run(kDecodeError);
+ bound_decode_cb.Run(DecodeStatus::DECODE_ERROR);
return;
}
if (state_ == kDecodeFinished) {
- bound_decode_cb.Run(kOk);
+ bound_decode_cb.Run(DecodeStatus::OK);
return;
}
if (state_ == kNormal && buffer->end_of_stream()) {
state_ = kDecodeFinished;
- bound_decode_cb.Run(kOk);
+ bound_decode_cb.Run(DecodeStatus::OK);
return;
}
scoped_refptr<VideoFrame> video_frame;
if (!VpxDecode(buffer, &video_frame)) {
state_ = kError;
- bound_decode_cb.Run(kDecodeError);
+ bound_decode_cb.Run(DecodeStatus::DECODE_ERROR);
return;
}
@@ -432,7 +432,7 @@ void VpxVideoDecoder::DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer,
}
// VideoDecoderShim expects |decode_cb| call after |output_cb_|.
- bound_decode_cb.Run(kOk);
+ bound_decode_cb.Run(DecodeStatus::OK);
}
void VpxVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
« no previous file with comments | « media/filters/opus_audio_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698