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

Side by Side Diff: media/base/android/media_source_player.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "media/base/android/media_source_player.h" 5 #include "media/base/android/media_source_player.h"
6 6
7 #include <stddef.h>
8 #include <stdint.h>
9
7 #include <limits> 10 #include <limits>
8 11
9 #include "base/android/jni_android.h" 12 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 13 #include "base/android/jni_string.h"
11 #include "base/barrier_closure.h" 14 #include "base/barrier_closure.h"
12 #include "base/bind.h" 15 #include "base/bind.h"
13 #include "base/bind_helpers.h" 16 #include "base/bind_helpers.h"
14 #include "base/callback_helpers.h" 17 #include "base/callback_helpers.h"
15 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/macros.h"
16 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
17 #include "base/trace_event/trace_event.h" 21 #include "base/trace_event/trace_event.h"
18 #include "media/base/android/audio_decoder_job.h" 22 #include "media/base/android/audio_decoder_job.h"
19 #include "media/base/android/media_player_manager.h" 23 #include "media/base/android/media_player_manager.h"
20 #include "media/base/android/video_decoder_job.h" 24 #include "media/base/android/video_decoder_job.h"
21 #include "media/base/bind_to_current_loop.h" 25 #include "media/base/bind_to_current_loop.h"
22 #include "media/base/timestamp_constants.h" 26 #include "media/base/timestamp_constants.h"
23 27
24 namespace media { 28 namespace media {
25 29
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 is_waiting_for_key_ = false; 848 is_waiting_for_key_ = false;
845 key_added_while_decode_pending_ = false; 849 key_added_while_decode_pending_ = false;
846 850
847 // StartInternal() will trigger a prefetch, where in most cases we'll just 851 // StartInternal() will trigger a prefetch, where in most cases we'll just
848 // use previously received data. 852 // use previously received data.
849 if (playing_) 853 if (playing_)
850 StartInternal(); 854 StartInternal();
851 } 855 }
852 856
853 } // namespace media 857 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_resource_getter.h ('k') | media/base/android/media_source_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698