Skip to content

Commit

Permalink
Roll Fuchsia SDK from f209e0ff1228 to 7e1509cb5b0c
Browse files Browse the repository at this point in the history
The AutoRoll server is located here: https://fuchsia-sdk-chromium-roll.skia.org

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

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio
TBR=cr-fuchsia+bot@chromium.org

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I6a13ee017776283e0ecad95a24d0e663699c3c3d
Reviewed-on: https://chromium-review.googlesource.com/1171867
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Fuchsia SDK Autoroller <fuchsia-sdk-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#582466}
  • Loading branch information
Wez authored and Commit Bot committed Aug 12, 2018
1 parent 0bbad76 commit 8822492
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build/fuchsia/sdk.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f209e0ff12286a37573f5ba2695f083470613d0e
7e1509cb5b0c7b5d9f7dea87dc762bd3bae353c5
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool MixerOutputStreamFuchsia::Start(int requested_sample_rate, int channels) {
fuchsia::media::AudioPtr audio_server =
base::fuchsia::ComponentContext::GetDefault()
->ConnectToService<fuchsia::media::Audio>();
audio_server->CreateRendererV2(audio_renderer_.NewRequest());
audio_server->CreateAudioRenderer2(audio_renderer_.NewRequest());
audio_renderer_.set_error_handler(
fit::bind_member(this, &MixerOutputStreamFuchsia::OnRendererError));

Expand Down
4 changes: 2 additions & 2 deletions media/audio/fuchsia/audio_output_stream_fuchsia.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ bool AudioOutputStreamFuchsia::Open() {
fuchsia::media::AudioPtr audio_server =
base::fuchsia::ComponentContext::GetDefault()
->ConnectToService<fuchsia::media::Audio>();
audio_server->CreateRendererV2(audio_renderer_.NewRequest());
audio_server->CreateAudioRenderer2(audio_renderer_.NewRequest());
audio_renderer_.set_error_handler(
fit::bind_member(this, &AudioOutputStreamFuchsia::OnRendererError));

Expand Down Expand Up @@ -200,7 +200,7 @@ void AudioOutputStreamFuchsia::PumpSamples() {

if (reference_time_.is_null()) {
audio_renderer_->Play(
fuchsia::media::kNoTimestamp, stream_position_samples_ - frames_filled,
fuchsia::media::NO_TIMESTAMP, stream_position_samples_ - frames_filled,
[this](int64_t reference_time, int64_t media_time) {
if (!callback_)
return;
Expand Down
6 changes: 4 additions & 2 deletions third_party/fuchsia-sdk/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,11 @@ fuchsia_sdk_fidl_pkg("media") {

sources = [
"audio.fidl",
"audio_capturer.fidl",
"audio_in.fidl",
"audio_out.fidl",
"audio_renderer.fidl",
"media_transport.fidl",
"gain_control.fidl",
"stream.fidl",
"stream_type.fidl",
]
}
Expand Down

0 comments on commit 8822492

Please sign in to comment.