| OLD | NEW |
| 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 "content/renderer/media/android/webmediaplayer_android.h" | 5 #include "content/renderer/media/android/webmediaplayer_android.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 gl->WaitSyncPointCHROMIUM(release_sync_point); | 83 gl->WaitSyncPointCHROMIUM(release_sync_point); |
| 84 gl->DeleteTextures(1, &texture_id); | 84 gl->DeleteTextures(1, &texture_id); |
| 85 } | 85 } |
| 86 | 86 |
| 87 class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { | 87 class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { |
| 88 public: | 88 public: |
| 89 explicit SyncPointClientImpl( | 89 explicit SyncPointClientImpl( |
| 90 blink::WebGraphicsContext3D* web_graphics_context) | 90 blink::WebGraphicsContext3D* web_graphics_context) |
| 91 : web_graphics_context_(web_graphics_context) {} | 91 : web_graphics_context_(web_graphics_context) {} |
| 92 virtual ~SyncPointClientImpl() {} | 92 virtual ~SyncPointClientImpl() {} |
| 93 virtual uint32 InsertSyncPoint() OVERRIDE { | 93 virtual uint32 InsertSyncPoint() override { |
| 94 return web_graphics_context_->insertSyncPoint(); | 94 return web_graphics_context_->insertSyncPoint(); |
| 95 } | 95 } |
| 96 virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE { | 96 virtual void WaitSyncPoint(uint32 sync_point) override { |
| 97 web_graphics_context_->waitSyncPoint(sync_point); | 97 web_graphics_context_->waitSyncPoint(sync_point); |
| 98 } | 98 } |
| 99 | 99 |
| 100 private: | 100 private: |
| 101 blink::WebGraphicsContext3D* web_graphics_context_; | 101 blink::WebGraphicsContext3D* web_graphics_context_; |
| 102 }; | 102 }; |
| 103 | 103 |
| 104 // Used for calls to decryptor_ready_cb_ where the result can be ignored. | 104 // Used for calls to decryptor_ready_cb_ where the result can be ignored. |
| 105 void DoNothing(bool) { | 105 void DoNothing(bool) { |
| 106 } | 106 } |
| (...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1826 | 1826 |
| 1827 bool WebMediaPlayerAndroid::IsHLSStream() const { | 1827 bool WebMediaPlayerAndroid::IsHLSStream() const { |
| 1828 std::string mime; | 1828 std::string mime; |
| 1829 GURL url = redirected_url_.is_empty() ? url_ : redirected_url_; | 1829 GURL url = redirected_url_.is_empty() ? url_ : redirected_url_; |
| 1830 if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime)) | 1830 if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime)) |
| 1831 return false; | 1831 return false; |
| 1832 return !mime.compare("application/x-mpegurl"); | 1832 return !mime.compare("application/x-mpegurl"); |
| 1833 } | 1833 } |
| 1834 | 1834 |
| 1835 } // namespace content | 1835 } // namespace content |
| OLD | NEW |