Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: d987bee007
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.8 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687 
  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/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
    16. 

  16. index c19436994faa21246c8c2e53e96c7ce3fffede4f..31c2efe2acd8c11bb5a861fa42841fe0e76c1141 100644
    17. 

  17. --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
    18. 

  18. +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
    19. 

  19. @@ -11,8 +11,10 @@
    20. 

  20.  #include "base/containers/adapters.h"
    21. 

  21.  #include "base/location.h"
    22. 

  22.  #include "base/memory/raw_ptr.h"
    23. 

  23. +#include "base/no_destructor.h"
    24. 

  24.  #include "base/numerics/safe_conversions.h"
    25. 

  25.  #include "base/task/single_thread_task_runner.h"
    26. 

  26. +#include "base/strings/string_util.h"
    27. 

  27.  #include "media/base/media_log.h"
    28. 

  28.  #include "net/base/net_errors.h"
    29. 

  29.  #include "third_party/blink/renderer/platform/media/buffered_data_source_host_impl.h"
    30. 

  30. @@ -67,8 +69,20 @@ const int kUpdateBufferSizeFrequency = 32;
    31. 

  31.  // How long to we delay a seek after a read?
    32. 

  32.  constexpr base::TimeDelta kSeekDelay = base::Milliseconds(20);
    33. 

  33.  
    34. 

  34. +std::vector<std::string>* GetStreamingSchemes() {
    35. 

  35. +  static base::NoDestructor<std::vector<std::string>> streaming_schemes({
    36. 

  36. +    url::kHttpsScheme,
    37. 

  37. +    url::kHttpScheme
    38. 

  38. +  });
    39. 

  39. +  return streaming_schemes.get();
    40. 

  40. +}
    41. 

  41. +
    42. 

  42.  }  // namespace
    43. 

  43.  
    44. 

  44. +void AddStreamingScheme(const char* new_scheme) {
    45. 

  45. +  GetStreamingSchemes()->push_back(new_scheme);
    46. 

  46. +}
    47. 

  47. +
    48. 

  48.  class MultiBufferDataSource::ReadOperation {
    49. 

  49.   public:
    50. 

  50.    ReadOperation() = delete;
    51. 

  51. @@ -160,7 +174,14 @@ bool MultiBufferDataSource::media_has_played() const {
    52. 

  52.  
    53. 

  53.  bool MultiBufferDataSource::AssumeFullyBuffered() const {
    54. 

  54.    DCHECK(url_data_);
    55. 

  55. -  return !url_data_->url().ProtocolIsInHTTPFamily();
    56. 

  56. +
    57. 

  57. +  const std::string scheme = url_data_->url().Protocol().Ascii();
    58. 

  58. +  for (const std::string& streaming_scheme : *GetStreamingSchemes()) {
    59. 

  59. +    if (base::EqualsCaseInsensitiveASCII(scheme, streaming_scheme)) {
    60. 

  60. +      return false;
    61. 

  61. +    }
    62. 

  62. +  }
    63. 

  63. +  return true;
    64. 

  64.  }
    65. 

  65.  
    66. 

  66.  void MultiBufferDataSource::SetReader(
    67. 

  67. diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
    68. 

  68. index 5277d480ce3ac065501a986b323e8f3a983acd75..6666dd87cd8971c7ed05a4bc141e19b9be549e54 100644
    69. 

  69. --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
    70. 

  70. +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
    71. 

  71. @@ -17,6 +17,7 @@
    72. 

  72.  #include "media/base/data_source.h"
    73. 

  73.  #include "media/base/ranges.h"
    74. 

  74.  #include "media/base/tuneable.h"
    75. 

  75. +#include "third_party/blink/public/platform/web_common.h"
    76. 

  76.  #include "third_party/blink/renderer/platform/media/url_index.h"
    77. 

  77.  #include "third_party/blink/renderer/platform/platform_export.h"
    78. 

  78.  #include "third_party/blink/renderer/platform/wtf/vector.h"
    79. 

  79. @@ -34,6 +35,8 @@ namespace blink {
    80. 

  80.  class BufferedDataSourceHost;
    81. 

  81.  class MultiBufferReader;
    82. 

  82.  
    83. 

  83. +void BLINK_PLATFORM_EXPORT AddStreamingScheme(const char* new_scheme);
    84. 

  84. +
    85. 

  85.  // A data source capable of loading URLs and buffering the data using an
    86. 

  86.  // in-memory sliding window.
    87. 

  87.  //
    88.