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

Side by Side Diff: media/filters/pipeline_integration_test_base.cc

Issue 11414076: Roll FFMpeg DEPS to pick up security fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/ffmpeg/ffmpeg_regression_tests.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/pipeline_integration_test_base.h" 5 #include "media/filters/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/base/media_log.h" 8 #include "media/base/media_log.h"
9 #include "media/filters/audio_renderer_impl.h" 9 #include "media/filters/audio_renderer_impl.h"
10 #include "media/filters/chunk_demuxer.h" 10 #include "media/filters/chunk_demuxer.h"
(...skipping 29 matching lines...) Expand all
40 40
41 void PipelineIntegrationTestBase::OnStatusCallback( 41 void PipelineIntegrationTestBase::OnStatusCallback(
42 PipelineStatus status) { 42 PipelineStatus status) {
43 pipeline_status_ = status; 43 pipeline_status_ = status;
44 message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure()); 44 message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
45 } 45 }
46 46
47 void PipelineIntegrationTestBase::OnStatusCallbackChecked( 47 void PipelineIntegrationTestBase::OnStatusCallbackChecked(
48 PipelineStatus expected_status, 48 PipelineStatus expected_status,
49 PipelineStatus status) { 49 PipelineStatus status) {
50 EXPECT_EQ(status, expected_status); 50 EXPECT_EQ(expected_status, status);
51 OnStatusCallback(status); 51 OnStatusCallback(status);
52 } 52 }
53 53
54 PipelineStatusCB PipelineIntegrationTestBase::QuitOnStatusCB( 54 PipelineStatusCB PipelineIntegrationTestBase::QuitOnStatusCB(
55 PipelineStatus expected_status) { 55 PipelineStatus expected_status) {
56 return base::Bind(&PipelineIntegrationTestBase::OnStatusCallbackChecked, 56 return base::Bind(&PipelineIntegrationTestBase::OnStatusCallbackChecked,
57 base::Unretained(this), 57 base::Unretained(this),
58 expected_status); 58 expected_status);
59 } 59 }
60 60
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 base::MD5Final(&digest, &md5_context_); 245 base::MD5Final(&digest, &md5_context_);
246 return base::MD5DigestToBase16(digest); 246 return base::MD5DigestToBase16(digest);
247 } 247 }
248 248
249 std::string PipelineIntegrationTestBase::GetAudioHash() { 249 std::string PipelineIntegrationTestBase::GetAudioHash() {
250 DCHECK(hashing_enabled_); 250 DCHECK(hashing_enabled_);
251 return audio_sink_->GetAudioHashForTesting(); 251 return audio_sink_->GetAudioHashForTesting();
252 } 252 }
253 253
254 } // namespace media 254 } // namespace media
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_regression_tests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698