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

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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 unified diff | Download patch
« no previous file with comments | « media/base/android/media_source_player.cc ('k') | media/base/android/media_url_interceptor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stdint.h>
6
5 #include <string> 7 #include <string>
6 8
7 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "build/build_config.h"
10 #include "media/base/android/audio_decoder_job.h" 14 #include "media/base/android/audio_decoder_job.h"
11 #include "media/base/android/media_codec_util.h" 15 #include "media/base/android/media_codec_util.h"
12 #include "media/base/android/media_drm_bridge.h" 16 #include "media/base/android/media_drm_bridge.h"
13 #include "media/base/android/media_player_manager.h" 17 #include "media/base/android/media_player_manager.h"
14 #include "media/base/android/media_source_player.h" 18 #include "media/base/android/media_source_player.h"
15 #include "media/base/android/media_url_interceptor.h" 19 #include "media/base/android/media_url_interceptor.h"
16 #include "media/base/android/sdk_media_codec_bridge.h" 20 #include "media/base/android/sdk_media_codec_bridge.h"
17 #include "media/base/android/video_decoder_job.h" 21 #include "media/base/android/video_decoder_job.h"
18 #include "media/base/bind_to_current_loop.h" 22 #include "media/base/bind_to_current_loop.h"
19 #include "media/base/decoder_buffer.h" 23 #include "media/base/decoder_buffer.h"
(...skipping 2355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2375 2379
2376 EXPECT_EQ(demuxer_->num_data_requests(), 0); 2380 EXPECT_EQ(demuxer_->num_data_requests(), 0);
2377 player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true)); 2381 player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true));
2378 2382
2379 manager_.set_allow_play(true); 2383 manager_.set_allow_play(true);
2380 player_.Start(); 2384 player_.Start();
2381 EXPECT_TRUE(player_.IsPlaying()); 2385 EXPECT_TRUE(player_.IsPlaying());
2382 } 2386 }
2383 2387
2384 } // namespace media 2388 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_source_player.cc ('k') | media/base/android/media_url_interceptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698