| OLD | NEW |
| 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> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "media/base/bind_to_current_loop.h" | 25 #include "media/base/bind_to_current_loop.h" |
| 26 #include "media/base/timestamp_constants.h" | 26 #include "media/base/timestamp_constants.h" |
| 27 | 27 |
| 28 namespace media { | 28 namespace media { |
| 29 | 29 |
| 30 MediaSourcePlayer::MediaSourcePlayer( | 30 MediaSourcePlayer::MediaSourcePlayer( |
| 31 int player_id, | 31 int player_id, |
| 32 MediaPlayerManager* manager, | 32 MediaPlayerManager* manager, |
| 33 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, | 33 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, |
| 34 scoped_ptr<DemuxerAndroid> demuxer, | 34 scoped_ptr<DemuxerAndroid> demuxer, |
| 35 const GURL& frame_url) | 35 const GURL& frame_url, |
| 36 int session_id) |
| 36 : MediaPlayerAndroid(player_id, | 37 : MediaPlayerAndroid(player_id, |
| 37 manager, | 38 manager, |
| 38 on_decoder_resources_released_cb, | 39 on_decoder_resources_released_cb, |
| 39 frame_url), | 40 frame_url, |
| 41 session_id), |
| 40 demuxer_(std::move(demuxer)), | 42 demuxer_(std::move(demuxer)), |
| 41 pending_event_(NO_EVENT_PENDING), | 43 pending_event_(NO_EVENT_PENDING), |
| 42 playing_(false), | 44 playing_(false), |
| 43 interpolator_(&default_tick_clock_), | 45 interpolator_(&default_tick_clock_), |
| 44 doing_browser_seek_(false), | 46 doing_browser_seek_(false), |
| 45 pending_seek_(false), | 47 pending_seek_(false), |
| 46 cdm_registration_id_(0), | 48 cdm_registration_id_(0), |
| 47 is_waiting_for_key_(false), | 49 is_waiting_for_key_(false), |
| 48 key_added_while_decode_pending_(false), | 50 key_added_while_decode_pending_(false), |
| 49 is_waiting_for_audio_decoder_(false), | 51 is_waiting_for_audio_decoder_(false), |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 is_waiting_for_key_ = false; | 850 is_waiting_for_key_ = false; |
| 849 key_added_while_decode_pending_ = false; | 851 key_added_while_decode_pending_ = false; |
| 850 | 852 |
| 851 // StartInternal() will trigger a prefetch, where in most cases we'll just | 853 // StartInternal() will trigger a prefetch, where in most cases we'll just |
| 852 // use previously received data. | 854 // use previously received data. |
| 853 if (playing_) | 855 if (playing_) |
| 854 StartInternal(); | 856 StartInternal(); |
| 855 } | 857 } |
| 856 | 858 |
| 857 } // namespace media | 859 } // namespace media |
| OLD | NEW |