OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_player_bridge.h" | 5 #include "media/base/android/media_player_bridge.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/logging.h" | 10 #include "base/logging.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 // is available. | 27 // is available. |
28 static const int kTemporaryDuration = 100; | 28 static const int kTemporaryDuration = 100; |
29 | 29 |
30 namespace media { | 30 namespace media { |
31 | 31 |
32 #if !defined(GOOGLE_TV) | 32 #if !defined(GOOGLE_TV) |
33 // static | 33 // static |
34 MediaPlayerBridge* MediaPlayerBridge::Create( | 34 MediaPlayerBridge* MediaPlayerBridge::Create( |
35 int player_id, | 35 int player_id, |
36 const GURL& url, | 36 const GURL& url, |
37 bool is_media_source, | 37 int flags, |
38 const GURL& first_party_for_cookies, | 38 const GURL& first_party_for_cookies, |
39 MediaResourceGetter* resource_getter, | 39 MediaResourceGetter* resource_getter, |
40 bool hide_url_log, | 40 bool hide_url_log, |
41 MediaPlayerBridgeManager* manager, | 41 MediaPlayerBridgeManager* manager, |
42 const MediaErrorCB& media_error_cb, | 42 const MediaErrorCB& media_error_cb, |
43 const VideoSizeChangedCB& video_size_changed_cb, | 43 const VideoSizeChangedCB& video_size_changed_cb, |
44 const BufferingUpdateCB& buffering_update_cb, | 44 const BufferingUpdateCB& buffering_update_cb, |
45 const MediaMetadataChangedCB& media_prepared_cb, | 45 const MediaMetadataChangedCB& media_prepared_cb, |
46 const PlaybackCompleteCB& playback_complete_cb, | 46 const PlaybackCompleteCB& playback_complete_cb, |
47 const SeekCompleteCB& seek_complete_cb, | 47 const SeekCompleteCB& seek_complete_cb, |
48 const TimeUpdateCB& time_update_cb, | 48 const TimeUpdateCB& time_update_cb, |
49 const MediaInterruptedCB& media_interrupted_cb) { | 49 const MediaInterruptedCB& media_interrupted_cb) { |
50 LOG_IF(WARNING, is_media_source) << "MSE is not supported"; | 50 LOG_IF(WARNING, (flags & FLAG_MEDIA_SOURCE)) << "MSE is not supported"; |
51 return new MediaPlayerBridge( | 51 return new MediaPlayerBridge( |
52 player_id, | 52 player_id, |
53 url, | 53 url, |
54 first_party_for_cookies, | 54 first_party_for_cookies, |
55 resource_getter, | 55 resource_getter, |
56 hide_url_log, | 56 hide_url_log, |
57 manager, | 57 manager, |
58 media_error_cb, | 58 media_error_cb, |
59 video_size_changed_cb, | 59 video_size_changed_cb, |
60 buffering_update_cb, | 60 buffering_update_cb, |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 NOTREACHED() << "Unexpected ipc received"; | 459 NOTREACHED() << "Unexpected ipc received"; |
460 } | 460 } |
461 | 461 |
462 void MediaPlayerBridge::ReadFromDemuxerAck( | 462 void MediaPlayerBridge::ReadFromDemuxerAck( |
463 const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { | 463 const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { |
464 NOTREACHED() << "Unexpected ipc received"; | 464 NOTREACHED() << "Unexpected ipc received"; |
465 } | 465 } |
466 #endif | 466 #endif |
467 | 467 |
468 } // namespace media | 468 } // namespace media |
OLD | NEW |