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

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: Rebased against origin/master Created 7 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/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index dcdd339692a929465dce64d1a81353d143b1c796..c6110455b790a39f2cf3294d11d281d2eb30af06 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -221,10 +221,10 @@ class MockMediaSource {
file_data_ = ReadTestDataFile(filename);
if (initial_append_size_ == kAppendWholeFile)
- initial_append_size_ = file_data_->GetDataSize();
+ initial_append_size_ = file_data_->data_size();
DCHECK_GT(initial_append_size_, 0);
- DCHECK_LE(initial_append_size_, file_data_->GetDataSize());
+ DCHECK_LE(initial_append_size_, file_data_->data_size());
}
virtual ~MockMediaSource() {}
@@ -241,7 +241,7 @@ class MockMediaSource {
chunk_demuxer_->Abort(kSourceId);
DCHECK_GE(new_position, 0);
- DCHECK_LT(new_position, file_data_->GetDataSize());
+ DCHECK_LT(new_position, file_data_->data_size());
current_position_ = new_position;
AppendData(seek_append_size);
@@ -249,10 +249,10 @@ class MockMediaSource {
void AppendData(int size) {
DCHECK(chunk_demuxer_);
- DCHECK_LT(current_position_, file_data_->GetDataSize());
- DCHECK_LE(current_position_ + size, file_data_->GetDataSize());
+ DCHECK_LT(current_position_, file_data_->data_size());
+ DCHECK_LE(current_position_ + size, file_data_->data_size());
chunk_demuxer_->AppendData(
- kSourceId, file_data_->GetData() + current_position_, size);
+ kSourceId, file_data_->data() + current_position_, size);
current_position_ += size;
}
@@ -499,7 +499,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
ReadTestDataFile("bear-640x360.webm");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -525,7 +525,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
ReadTestDataFile("bear-640x360-av_enc-av.webm");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -553,7 +553,7 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-640x360-av_enc-av.webm");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -584,7 +584,7 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-640x360.webm");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -609,7 +609,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
ReadTestDataFile("bear-1280x720-av_frag.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -636,7 +636,7 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -665,7 +665,7 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();
@@ -696,7 +696,7 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-1280x720-av_frag.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->GetData(), second_file->GetDataSize());
+ second_file->data(), second_file->data_size());
source.EndOfStream();

Powered by Google App Engine
This is Rietveld 408576698