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

Unified Diff: media/renderers/video_renderer_impl_unittest.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/renderers/audio_renderer_impl_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/video_renderer_impl_unittest.cc
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc
index 3b0b27382bb2df2225cae82f6a9722db14da4627..af589d83112c111f28e651cf2519ffe42718cb51 100644
--- a/media/renderers/video_renderer_impl_unittest.cc
+++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -172,14 +172,14 @@ class VideoRendererImplTest
if (token == "abort") {
scoped_refptr<VideoFrame> null_frame;
decode_results_.push_back(
- std::make_pair(VideoDecoder::kAborted, null_frame));
+ std::make_pair(DecodeStatus::ABORTED, null_frame));
continue;
}
if (token == "error") {
scoped_refptr<VideoFrame> null_frame;
decode_results_.push_back(
- std::make_pair(VideoDecoder::kDecodeError, null_frame));
+ std::make_pair(DecodeStatus::DECODE_ERROR, null_frame));
continue;
}
@@ -189,7 +189,7 @@ class VideoRendererImplTest
scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame(
PIXEL_FORMAT_YV12, natural_size, gfx::Rect(natural_size),
natural_size, base::TimeDelta::FromMilliseconds(timestamp_in_ms));
- decode_results_.push_back(std::make_pair(VideoDecoder::kOk, frame));
+ decode_results_.push_back(std::make_pair(DecodeStatus::OK, frame));
continue;
}
@@ -251,13 +251,13 @@ class VideoRendererImplTest
// Satify pending |decode_cb_| to trigger a new DemuxerStream::Read().
message_loop_.PostTask(
FROM_HERE,
- base::Bind(base::ResetAndReturn(&decode_cb_), VideoDecoder::kOk));
+ base::Bind(base::ResetAndReturn(&decode_cb_), DecodeStatus::OK));
WaitForPendingRead();
message_loop_.PostTask(
FROM_HERE,
- base::Bind(base::ResetAndReturn(&decode_cb_), VideoDecoder::kOk));
+ base::Bind(base::ResetAndReturn(&decode_cb_), DecodeStatus::OK));
}
void AdvanceWallclockTimeInMs(int time_ms) {
@@ -352,8 +352,8 @@ class VideoRendererImplTest
// Run during DecodeRequested() to unblock WaitForPendingRead().
base::Closure wait_for_pending_decode_cb_;
- std::deque<std::pair<
- VideoDecoder::Status, scoped_refptr<VideoFrame> > > decode_results_;
+ std::deque<std::pair<DecodeStatus, scoped_refptr<VideoFrame>>>
+ decode_results_;
DISALLOW_COPY_AND_ASSIGN(VideoRendererImplTest);
};
« no previous file with comments | « media/renderers/audio_renderer_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698