| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 mailbox_holder.texture_target, mailbox_holder.mailbox.name); | 732 mailbox_holder.texture_target, mailbox_holder.mailbox.name); |
| 733 | 733 |
| 734 // Application itself needs to take care of setting the right flip_y | 734 // Application itself needs to take care of setting the right flip_y |
| 735 // value down to get the expected result. | 735 // value down to get the expected result. |
| 736 // flip_y==true means to reverse the video orientation while | 736 // flip_y==true means to reverse the video orientation while |
| 737 // flip_y==false means to keep the intrinsic orientation. | 737 // flip_y==false means to keep the intrinsic orientation. |
| 738 gl->CopyTextureCHROMIUM(src_texture, texture, internal_format, type, flip_y, | 738 gl->CopyTextureCHROMIUM(src_texture, texture, internal_format, type, flip_y, |
| 739 premultiply_alpha, false); | 739 premultiply_alpha, false); |
| 740 | 740 |
| 741 gl->DeleteTextures(1, &src_texture); | 741 gl->DeleteTextures(1, &src_texture); |
| 742 web_graphics_context->flush(); | 742 gl->Flush(); |
| 743 | 743 |
| 744 SyncTokenClientImpl client(gl); | 744 SyncTokenClientImpl client(gl); |
| 745 video_frame->UpdateReleaseSyncToken(&client); | 745 video_frame->UpdateReleaseSyncToken(&client); |
| 746 return true; | 746 return true; |
| 747 } | 747 } |
| 748 | 748 |
| 749 bool WebMediaPlayerAndroid::hasSingleSecurityOrigin() const { | 749 bool WebMediaPlayerAndroid::hasSingleSecurityOrigin() const { |
| 750 DCHECK(main_thread_checker_.CalledOnValidThread()); | 750 DCHECK(main_thread_checker_.CalledOnValidThread()); |
| 751 if (player_type_ != MEDIA_PLAYER_TYPE_URL) | 751 if (player_type_ != MEDIA_PLAYER_TYPE_URL) |
| 752 return true; | 752 return true; |
| (...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1675 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; | 1675 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; |
| 1676 } else if (is_hls_url == is_hls) { | 1676 } else if (is_hls_url == is_hls) { |
| 1677 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; | 1677 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; |
| 1678 } | 1678 } |
| 1679 UMA_HISTOGRAM_ENUMERATION( | 1679 UMA_HISTOGRAM_ENUMERATION( |
| 1680 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", | 1680 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", |
| 1681 result, PREDICTION_RESULT_MAX); | 1681 result, PREDICTION_RESULT_MAX); |
| 1682 } | 1682 } |
| 1683 | 1683 |
| 1684 } // namespace content | 1684 } // namespace content |
| OLD | NEW |