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

Unified Diff: media/filters/ffmpeg_audio_decoder_unittest.cc

Issue 10669022: Add status parameter to DemuxerStream::ReadCB (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix seek_tester build buster Created 8 years, 5 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/ffmpeg_audio_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc
index b81b73bc596437c016207c059d46b3c65fdda3a5..f3dfaea033203e5bb1762e5d93eaa22409cbdd57 100644
--- a/media/filters/ffmpeg_audio_decoder_unittest.cc
+++ b/media/filters/ffmpeg_audio_decoder_unittest.cc
@@ -82,8 +82,10 @@ class FFmpegAudioDecoderTest : public testing::Test {
CHECK(!encoded_audio_.empty()) << "ReadPacket() called too many times";
scoped_refptr<DecoderBuffer> buffer(encoded_audio_.front());
+ DemuxerStream::Status status =
+ buffer ? DemuxerStream::kOk : DemuxerStream::kAborted;
encoded_audio_.pop_front();
- read_cb.Run(buffer);
+ read_cb.Run(status, buffer);
}
void Read() {
@@ -92,7 +94,8 @@ class FFmpegAudioDecoderTest : public testing::Test {
message_loop_.RunAllPending();
}
- void DecodeFinished(scoped_refptr<Buffer> buffer) {
+ void DecodeFinished(AudioDecoder::Status status,
+ const scoped_refptr<Buffer>& buffer) {
decoded_audio_.push_back(buffer);
}

Powered by Google App Engine
This is Rietveld 408576698