Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 28ada6ea8b
Branches Tags
electron
/
patches
/
chromium
/
feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch

feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch 3.4 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Paul Frazee <[email protected]>
    3. 

  3. Date: Sat, 6 Jun 2020 10:30:45 -0500
    4. 

  4. Subject: feat: add streaming-protocol registry to multibuffer_data_source
    5. 

  5. 

  6. blink::WebMediaPlayerImpl - which provides the <video> and <audio> behaviors - needs to know
    7. 

  7. whether a data source will stream or fully buffer the response. It determines this behavior
    8. 

  8. with MultibufferDataSource::AssumeFullyBuffered() which has http/s hardwired. An incorrect
    9. 

  9. determination will cause the video/audio to fail playing.
    10. 

  10. 

  11. This patch adds a list of "streaming protocols" to the MultibufferDataSource in order to allow
    12. 

  12. other protocols to register their streaming behavior. MultibufferDataSource::AssumeFullyBuffered()
    13. 

  13. then refers to the list so that it can correctly determine the data source's settings.
    14. 

  14. 

  15. diff --git a/third_party/blink/public/platform/media/multi_buffer_data_source.h b/third_party/blink/public/platform/media/multi_buffer_data_source.h
    16. 

  16. index fd2441add0c816c5031ed0e9321d2be7e0937161..c324d855b26f6dcb63d127d7ddafa509cb1074e4 100644
    17. 

  17. --- a/third_party/blink/public/platform/media/multi_buffer_data_source.h
    18. 

  18. +++ b/third_party/blink/public/platform/media/multi_buffer_data_source.h
    19. 

  19. @@ -33,6 +33,8 @@ namespace blink {
    20. 

  20.  class BufferedDataSourceHost;
    21. 

  21.  class MultiBufferReader;
    22. 

  22.  
    23. 

  23. +void BLINK_PLATFORM_EXPORT AddStreamingScheme(const char* new_scheme);
    24. 

  24. +
    25. 

  25.  // A data source capable of loading URLs and buffering the data using an
    26. 

  26.  // in-memory sliding window.
    27. 

  27.  //
    28. 

  28. diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
    29. 

  29. index ba3e8d75ce49614e26dd77692166a11b614a5d9c..4c3170ecb94716ec2869c363381759cbf08f3ae6 100644
    30. 

  30. --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
    31. 

  31. +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
    32. 

  32. @@ -10,8 +10,10 @@
    33. 

  33.  #include "base/callback_helpers.h"
    34. 

  34.  #include "base/cxx17_backports.h"
    35. 

  35.  #include "base/location.h"
    36. 

  36. +#include "base/no_destructor.h"
    37. 

  37.  #include "base/numerics/safe_conversions.h"
    38. 

  38.  #include "base/task/single_thread_task_runner.h"
    39. 

  39. +#include "base/strings/string_util.h"
    40. 

  40.  #include "media/base/media_log.h"
    41. 

  41.  #include "net/base/net_errors.h"
    42. 

  42.  #include "third_party/blink/public/platform/media/buffered_data_source_host_impl.h"
    43. 

  43. @@ -60,8 +62,20 @@ const int kUpdateBufferSizeFrequency = 32;
    44. 

  44.  // How long to we delay a seek after a read?
    45. 

  45.  constexpr base::TimeDelta kSeekDelay = base::Milliseconds(20);
    46. 

  46.  
    47. 

  47. +std::vector<std::string>* GetStreamingSchemes() {
    48. 

  48. +  static base::NoDestructor<std::vector<std::string>> streaming_schemes({
    49. 

  49. +    url::kHttpsScheme,
    50. 

  50. +    url::kHttpScheme
    51. 

  51. +  });
    52. 

  52. +  return streaming_schemes.get();
    53. 

  53. +}
    54. 

  54. +
    55. 

  55.  }  // namespace
    56. 

  56.  
    57. 

  57. +void AddStreamingScheme(const char* new_scheme) {
    58. 

  58. +  GetStreamingSchemes()->push_back(new_scheme);
    59. 

  59. +}
    60. 

  60. +
    61. 

  61.  class MultiBufferDataSource::ReadOperation {
    62. 

  62.   public:
    63. 

  63.    ReadOperation() = delete;
    64. 

  64. @@ -153,7 +167,14 @@ bool MultiBufferDataSource::media_has_played() const {
    65. 

  65.  
    66. 

  66.  bool MultiBufferDataSource::AssumeFullyBuffered() const {
    67. 

  67.    DCHECK(url_data_);
    68. 

  68. -  return !url_data_->url().SchemeIsHTTPOrHTTPS();
    69. 

  69. +
    70. 

  70. +  const std::string scheme = url_data_->url().scheme();
    71. 

  71. +  for (const std::string& streaming_scheme : *GetStreamingSchemes()) {
    72. 

  72. +    if (base::LowerCaseEqualsASCII(scheme, streaming_scheme)) {
    73. 

  73. +      return false;
    74. 

  74. +    }
    75. 

  75. +  }
    76. 

  76. +  return true;
    77. 

  77.  }
    78. 

  78.  
    79. 

  79.  void MultiBufferDataSource::SetReader(MultiBufferReader* reader) {
    80.