Skip to content

GitLab

T
tangled
Commit 3d05a0fe authored by btolsch's avatar btolsch Committed by Commit Bot
Browse files
Options

Roll Open Screen from 6d0991e9c086 to 53a6a132f50c (23 revisions) 

https://chromium.googlesource.com/openscreen.git/+log/6d0991e9c086..53a6a132f50c

2020-09-26 jophba@chromium.org Disable discovery tests in Chrome
2020-09-26 jophba@chromium.org Roll JsonCpp dependency
2020-09-26 jophba@chromium.org Fixup standalone_{receiver, sender}
2020-09-26 emaxx@chromium.org Fix useless move() in //discovery/
2020-09-25 jophba@chromium.org Fix standalone build with libs
2020-09-25 jophba@chromium.org Cleanup Receiver, ReceiverSession APIs
2020-09-25 jophba@chromium.org [Hotfix] Fix Mac OSX build
2020-09-24 jeffyoon@google.com Update Mac mixin to Mac-10.15
2020-09-23 jophba@chromium.org Update MdnsReader::Read to return ErrorOr
2020-09-23 jophba@chromium.org Remove duplicate cert code, refactor
2020-09-22 jophba@chromium.org [Hotfix] Fix Mac OS X build
2020-09-22 jophba@chromium.org Add note about Abseil StrFormat
2020-09-21 jophba@chromium.org [Cast Streaming] Implement CastAgent for standalone sender
2020-09-21 jophba@chromium.org [Cast Streaming] Implement sender session class
2020-09-16 jophba@chromium.org Fix Mac OS X builders
2020-09-14 gbeaty@chromium.org Remove refs.cfg.
2020-09-11 gbeaty@chromium.org Switch builders to use builder_group property instead of mastername.
2020-09-10 mfoltz@chromium.org [Open Screen] Remove obsolete TODOs.
2020-09-09 jophba@chromium.org Remove unused private DER key
2020-09-01 jophba@chromium.org Remove string_view from message port
2020-08-26 miu@chromium.org Cast Standalone Receiver: Start CastAgent and Discovery within a Task.
2020-08-24 joshuaduong@google.com Accept service names with multiple non-adjacent hyphens.
2020-08-19 sokcevic@google.com Rename PRESUBMIT constants

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/openscreen-chromium
Please CC jophba@chromium.org on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: chromium:1098560,chromium:1109276,chromium:1122844,chromium:1128042,chromium:1128044,chromium:1132604,chromium:166160029,chromium:169447969
Tbr: jophba@chromium.org
Test: Test: openscreen_unittests
Change-Id: Ie84792699ac9c2e0827eb2a009513b3e38e14fe4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437050Reviewed-by: default avatarFabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: default avatarchromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811590}
parent c1373da3
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 25 deletions
DEPS
View file @ 3d05a0fe
......@@ -1237,7 +1237,7 @@ deps = {
Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '3dd5b80bc4f172dd82925bb259cb7c82348409c5',
'src/third_party/openscreen/src':
Var('chromium_git') + '/openscreen' + '@' + '6d0991e9c086d35630fa744a7ec4e0e35e2d82f9',
Var('chromium_git') + '/openscreen' + '@' + '53a6a132f50cea8150cedbb11e6bb939f29e756d',
'src/third_party/openxr/src': {
'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '9e97b73e7dd2bfc07745489d728f6a36665c648f',
......
fuchsia/cast_streaming/BUILD.gn
View file @ 3d05a0fe
......@@ -15,6 +15,7 @@ source_set("cast_streaming") {
"//media/mojo/mojom",
"//mojo/public/cpp/system",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
"//third_party/openscreen/src/cast/common:public",
"//third_party/openscreen/src/cast/streaming:receiver",
"//third_party/openscreen/src/platform:api",
"//third_party/openscreen/src/util",
......
fuchsia/cast_streaming/cast_message_port_impl.cc
View file @ 3d05a0fe
......@@ -85,13 +85,13 @@ bool ParseMessageBuffer(const fuchsia::mem::Buffer& buffer,
// Creates a WebMessage out of the |sender_id|, |message_namespace| and
// |message|.
fuchsia::web::WebMessage CreateWebMessage(absl::string_view sender_id,
absl::string_view message_namespace,
absl::string_view message) {
fuchsia::web::WebMessage CreateWebMessage(const std::string& sender_id,
const std::string& message_namespace,
const std::string& message) {
base::Value value(base::Value::Type::DICTIONARY);
value.SetStringKey(kKeyNamespace, std::string(message_namespace));
value.SetStringKey(kKeySenderId, std::string(sender_id));
value.SetStringKey(kKeyData, std::string(message));
value.SetStringKey(kKeyNamespace, message_namespace);
value.SetStringKey(kKeySenderId, sender_id);
value.SetStringKey(kKeyData, message);
std::string json_message;
CHECK(base::JSONWriter::Write(value, &json_message));
......@@ -148,7 +148,8 @@ void CastMessagePortImpl::MaybeCloseWithEpitaph(zx_status_t epitaph) {
}
void CastMessagePortImpl::SetClient(
openscreen::cast::MessagePort::Client* client) {
openscreen::cast::MessagePort::Client* client,
std::string client_sender_id) {
DVLOG(2) << __func__;
DCHECK_NE(!client_, !client);
client_ = client;
......@@ -156,9 +157,14 @@ void CastMessagePortImpl::SetClient(
MaybeCloseWithEpitaph(ZX_OK);
}
void CastMessagePortImpl::PostMessage(absl::string_view sender_id,
absl::string_view message_namespace,
absl::string_view message) {
void CastMessagePortImpl::ResetClient() {
client_ = nullptr;
MaybeCloseWithEpitaph(ZX_OK);
}
void CastMessagePortImpl::PostMessage(const std::string& sender_id,
const std::string& message_namespace,
const std::string& message) {
DVLOG(3) << __func__;
if (!message_port_binding_.is_bound())
return;
......
fuchsia/cast_streaming/cast_message_port_impl.h
View file @ 3d05a0fe
......@@ -9,7 +9,7 @@
#include <lib/fidl/cpp/binding.h>
#include "base/containers/circular_deque.h"
#include "third_party/openscreen/src/cast/streaming/message_port.h"
#include "third_party/openscreen/src/cast/common/public/message_port.h"
namespace cast_streaming {
......@@ -26,10 +26,11 @@ class CastMessagePortImpl : public openscreen::cast::MessagePort,
CastMessagePortImpl& operator=(const CastMessagePortImpl&) = delete;
// openscreen::cast::MessagePort implementation.
void SetClient(Client* client) final;
void PostMessage(absl::string_view sender_id,
absl::string_view message_namespace,
absl::string_view message) final;
void SetClient(Client* client, std::string client_sender_id) final;
void ResetClient() final;
void PostMessage(const std::string& sender_id,
const std::string& message_namespace,
const std::string& message) final;
private:
// Sends one message in |pending_fidl_messages_| if
......
fuchsia/cast_streaming/cast_streaming_session.cc
View file @ 3d05a0fe
......@@ -50,15 +50,14 @@ class CastStreamingSession::Internal
cast_message_port_impl_(std::move(message_port_request)),
// TODO(crbug.com/1087520): Add streaming session Constraints and
// DisplayDescription.
receiver_session_(
this,
&environment_,
&cast_message_port_impl_,
openscreen::cast::ReceiverSession::Preferences(
{openscreen::cast::ReceiverSession::VideoCodec::kH264,
openscreen::cast::ReceiverSession::VideoCodec::kVp8},
{openscreen::cast::ReceiverSession::AudioCodec::kAac,
openscreen::cast::ReceiverSession::AudioCodec::kOpus})),
receiver_session_(this,
&environment_,
&cast_message_port_impl_,
openscreen::cast::ReceiverSession::Preferences(
{openscreen::cast::VideoCodec::kH264,
openscreen::cast::VideoCodec::kVp8},
{openscreen::cast::AudioCodec::kAac,
openscreen::cast::AudioCodec::kOpus})),
client_(client) {
DCHECK(task_runner);
DCHECK(client_);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment