Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable WebAudio on Android #21730

Merged
merged 7 commits into from Sep 25, 2018
Merged

Enable WebAudio on Android #21730

merged 7 commits into from Sep 25, 2018

Conversation

@ferjm
Copy link
Member

ferjm commented Sep 17, 2018

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #21619

This change is Reviewable

@highfive
Copy link

highfive commented Sep 17, 2018

Heads up! This PR modifies the following files:

@ferjm ferjm force-pushed the ferjm:android.gstreamer branch from df6af43 to 4b2a548 Sep 18, 2018
if not os.path.exists(gst_lib_path):
# Download GStreamer dependencies if they have not already been downloaded
print("Downloading GStreamer dependencies")
gst_url = "https://github.com/servo/libgstreamer_android_gen/blob/master/out/%s?raw=true" % gst_lib_zip

This comment has been minimized.

@Manishearth

Manishearth Sep 18, 2018

Member

make sure this is eventually put on s3

@ferjm ferjm force-pushed the ferjm:android.gstreamer branch from 4b2a548 to 47d845e Sep 18, 2018
@ferjm
Copy link
Member Author

ferjm commented Sep 18, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2018

Trying commit 47d845e with merge 3b2e29d...

bors-servo added a commit that referenced this pull request Sep 18, 2018
[WIP] Enable WebAudio on Android

- [X] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [X] These changes fix #21619

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21730)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2018

💔 Test failed - android-x86

@ferjm
Copy link
Member Author

ferjm commented Sep 18, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2018

Trying commit 2c8d790 with merge 7c1ca55...

bors-servo added a commit that referenced this pull request Sep 18, 2018
[WIP] Enable WebAudio on Android

- [X] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [X] These changes fix #21619

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21730)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2018

💔 Test failed - android-x86

@ferjm
Copy link
Member Author

ferjm commented Sep 18, 2018

test ran test-android-startup --release ( 27 secs )
test__1 ran test-wpt-android --release /_mozilla/mozilla/DOMParser.html ( 33 secs )
test__2 ran test-wpt-android --release /_mozilla/mozilla/webgl/context_creation_error.html failed (

This seems to be happening for other builds with one of these two tests. See http://build.servo.org/builders/android-x86

@ferjm
Copy link
Member Author

ferjm commented Sep 18, 2018

This seems to be happening for other builds with one of these two tests. See http://build.servo.org/builders/android-x86

And will hopefully be fixed by #21738

@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

The latest upstream changes (presumably #21712) made this pull request unmergeable. Please resolve the merge conflicts.

@ferjm ferjm force-pushed the ferjm:android.gstreamer branch from 2c8d790 to 75dce31 Sep 20, 2018
@ferjm ferjm changed the title [WIP] Enable WebAudio on Android Enable WebAudio on Android Sep 20, 2018
@ferjm
Copy link
Member Author

ferjm commented Sep 20, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2018

The latest upstream changes (presumably #21774) made this pull request unmergeable. Please resolve the merge conflicts.

GStreamer.init((Context) mActivity);
} catch (Exception e) {
e.printStackTrace();
}

This comment has been minimized.

@paulrouget

paulrouget Sep 24, 2018

Contributor

This code path is not used by ServoSurface. Move this in Servo.java.


copyGStreamerObjTask.dependsOn taskName
copyGStreamerTask.dependsOn copyGStreamerObjTask
compileTask.dependsOn copyGStreamerTask

This comment has been minimized.

@paulrouget

paulrouget Sep 24, 2018

Contributor

Could you add libgstreamer_android.so to LOCAL_SRC_FILES?

@ferjm ferjm force-pushed the ferjm:android.gstreamer branch from 89b1fba to 991fdbe Sep 24, 2018
@ferjm ferjm removed the S-needs-rebase label Sep 24, 2018
int width, int height, float density, boolean log) {
int width, int height,
float density, boolean log,
Context context) {

This comment has been minimized.

@paulrouget

paulrouget Sep 25, 2018

Contributor

Context and activity are the same objects. Can you only pass one and cast activity to context or context to activity?

This comment has been minimized.

@ferjm

ferjm Sep 25, 2018

Author Member

Ugh, of course. I'm blind.

@paulrouget
Copy link
Contributor

paulrouget commented Sep 25, 2018

r=me

@ferjm
Copy link
Member Author

ferjm commented Sep 25, 2018

@bors-servo r=paulrouget

@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

📌 Commit 879e391 has been approved by paulrouget

@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

Testing commit 879e391 with merge 6e844f2...

bors-servo added a commit that referenced this pull request Sep 25, 2018
Enable WebAudio on Android

- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [X] These changes fix #21619

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21730)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

💔 Test failed - mac-rel-wpt3

@ferjm
Copy link
Member Author

ferjm commented Sep 25, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

@bors-servo bors-servo merged commit 879e391 into servo:master Sep 25, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@ferjm ferjm deleted the ferjm:android.gstreamer branch Sep 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

7 participants
You can’t perform that action at this time.