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

Unified Diff: media/base/android/media_source_player_unittest.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: 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
« no previous file with comments | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/base/decoder_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_source_player_unittest.cc
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc
index 65318bcaf6cf842b066d30da6271d6aa6871be4f..31466400c95a7250b5f70e91ff2e8ce8e15d6b05 100644
--- a/media/base/android/media_source_player_unittest.cc
+++ b/media/base/android/media_source_player_unittest.cc
@@ -109,8 +109,8 @@ class MediaSourcePlayerTest : public testing::Test {
params.duration_ms = kDefaultDurationInMs;
scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-extradata");
params.audio_extra_data = std::vector<uint8>(
- buffer->GetData(),
- buffer->GetData() + buffer->GetDataSize());
+ buffer->data(),
+ buffer->data() + buffer->data_size());
Start(params);
}
@@ -137,7 +137,7 @@ class MediaSourcePlayerTest : public testing::Test {
ack_params.access_units[0].status = DemuxerStream::kOk;
scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-packet-0");
ack_params.access_units[0].data = std::vector<uint8>(
- buffer->GetData(), buffer->GetData() + buffer->GetDataSize());
+ buffer->data(), buffer->data() + buffer->data_size());
// Vorbis needs 4 extra bytes padding on Android to decode properly. Check
// NuMediaExtractor.cpp in Android source code.
uint8 padding[4] = { 0xff , 0xff , 0xff , 0xff };
@@ -155,7 +155,7 @@ class MediaSourcePlayerTest : public testing::Test {
scoped_refptr<DecoderBuffer> buffer =
ReadTestDataFile("vp8-I-frame-320x240");
ack_params.access_units[0].data = std::vector<uint8>(
- buffer->GetData(), buffer->GetData() + buffer->GetDataSize());
+ buffer->data(), buffer->data() + buffer->data_size());
return ack_params;
}
@@ -361,8 +361,8 @@ TEST_F(MediaSourcePlayerTest, DecoderJobsCannotStartWithoutAudio) {
params.is_audio_encrypted = false;
scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile("vorbis-extradata");
params.audio_extra_data = std::vector<uint8>(
- buffer->GetData(),
- buffer->GetData() + buffer->GetDataSize());
+ buffer->data(),
+ buffer->data() + buffer->data_size());
params.video_codec = kCodecVP8;
params.video_size = gfx::Size(320, 240);
params.is_video_encrypted = false;
« no previous file with comments | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/base/decoder_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698