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

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

Issue 19622002: Use a direct include of the message_loop header in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/audio/win/audio_unified_win_unittest.cc ('k') | media/base/bind_to_loop_unittest.cc » ('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 (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 "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "media/base/android/media_codec_bridge.h" 15 #include "media/base/android/media_codec_bridge.h"
16 #include "media/base/android/media_drm_bridge.h" 16 #include "media/base/android/media_drm_bridge.h"
17 #include "media/base/android/media_player_manager.h" 17 #include "media/base/android/media_player_manager.h"
18 #include "media/base/audio_timestamp_helper.h" 18 #include "media/base/audio_timestamp_helper.h"
19 19
20 namespace { 20 namespace {
21 21
22 // Timeout value for media codec operations. Because the first 22 // Timeout value for media codec operations. Because the first
23 // DequeInputBuffer() can take about 150 milliseconds, use 250 milliseconds 23 // DequeInputBuffer() can take about 150 milliseconds, use 250 milliseconds
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 886
887 bool MediaSourcePlayer::HasAudioData() const { 887 bool MediaSourcePlayer::HasAudioData() const {
888 return audio_access_unit_index_ < received_audio_.access_units.size(); 888 return audio_access_unit_index_ < received_audio_.access_units.size();
889 } 889 }
890 890
891 bool MediaSourcePlayer::HasVideoData() const { 891 bool MediaSourcePlayer::HasVideoData() const {
892 return video_access_unit_index_ < received_video_.access_units.size(); 892 return video_access_unit_index_ < received_video_.access_units.size();
893 } 893 }
894 894
895 } // namespace media 895 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/win/audio_unified_win_unittest.cc ('k') | media/base/bind_to_loop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698