GStreamer default media backend

ports/libsimpleservo/api/Cargo.toml

@@ -35,7 +35,7 @@ vergen = { version = "8.0.0", features = ["git", "gitcl"] }
 
 [features]
 debugmozjs = ["libservo/debugmozjs"]
-default = ["max_log_level", "native-bluetooth", "webdriver"]
+default = ["max_log_level", "native-bluetooth", "webdriver", "media-gstreamer"]
 googlevr = ["libservo/googlevr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]

ports/libsimpleservo/capi/Cargo.toml

@@ -30,7 +30,7 @@ cbindgen = "0.26"
 
 [features]
 debugmozjs = ["simpleservo/debugmozjs"]
-default = ["webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level", "media-gstreamer"]
 googlevr = ["simpleservo/googlevr"]
 jitspew = ["simpleservo/jitspew"]
 js_backtrace = ["simpleservo/js_backtrace"]

ports/libsimpleservo/jniapi/Cargo.toml

@@ -28,7 +28,7 @@ cc = "1.0"
 
 [features]
 debugmozjs = ["simpleservo/debugmozjs"]
-default = ["max_log_level", "native-bluetooth", "webdriver"]
+default = ["max_log_level", "native-bluetooth", "webdriver", "media-gstreamer"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
 max_log_level = ["simpleservo/max_log_level"]

ports/servoshell/Cargo.toml

@@ -30,7 +30,7 @@ ProductName = "Servo"
 
 [features]
 debugmozjs = ["libservo/debugmozjs"]
-default = ["max_log_level", "native-bluetooth", "webdriver"]
+default = ["max_log_level", "native-bluetooth", "webdriver", "media-gstreamer"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]

python/servo/build_commands.py

@@ -60,7 +60,6 @@ class MachCommands(CommandBase):
  def build(self, build_type: BuildType, jobs=None, params=None, no_package=False,
  verbose=False, very_verbose=False, libsimpleservo=False, **kwargs):
  opts = params or []
- has_media_stack = "media-gstreamer" in self.features
 
  if build_type == BuildType.RELEASE:
  opts += ["--release"]
@@ -171,7 +170,7 @@ def package_generated_shared_libraries(libs, build_path, servo_exe_dir):
  status = 1
 
  # copy needed gstreamer DLLs in to servo.exe dir
- if has_media_stack:
+ if self.media_stack.is_gstreamer():
  print("Packaging gstreamer DLLs")
  if not package_gstreamer_dlls(env, servo_exe_dir, target_triple):
  status = 1
@@ -187,7 +186,7 @@ def package_generated_shared_libraries(libs, build_path, servo_exe_dir):
  servo_bin_dir = os.path.dirname(servo_path)
  assert os.path.exists(servo_bin_dir)
 
- if has_media_stack:
+ if self.media_stack.is_gstreamer():
  print("Packaging gstreamer dylibs")
  if not package_gstreamer_dylibs(self.cross_compile_target, servo_path):
  return 1

python/servo/command_base.py

@@ -52,6 +52,28 @@ class BuildType(Enum):
  RELEASE = 2
 
 
+class MediaStack(Enum):
+ """ Media stack """
+ DUMMY = 1
+ GSTREAMER = 2
+
+ def is_dummy(self) -> bool:
+ return self == MediaStack.DUMMY
+
+ def is_gstreamer(self) -> bool:
+ return self == MediaStack.GSTREAMER
+
+ @staticmethod
+ def from_str(s: str):
+ s = s.lower()
+ if s == "gstreamer":
+ return MediaStack.GSTREAMER
+ elif s == "dummy":
+ return MediaStack.DUMMY
+ else:
+ raise RuntimeError(f"Got unknown media stack {s}")
+
+
 @contextlib.contextmanager
 def cd(new_path):
  """Context manager for changing the current working directory"""
@@ -211,6 +233,7 @@ class CommandBase(object):
  def __init__(self, context):
  self.context = context
  self.features = []
+ self.media_stack: Optional[MediaStack] = None
  self.cross_compile_target = None
  self.is_android_build = False
  self.target_path = util.get_target_dir()
@@ -832,20 +855,21 @@ def configure_media_stack(self, media_stack: Optional[str]):
  """Determine what media stack to use based on the value of the build target
  platform and the value of the '--media-stack' command-line argument.
  The chosen media stack is written into the `features` instance variable."""
- if not media_stack:
- if self.config["build"]["media-stack"] != "auto":
- media_stack = self.config["build"]["media-stack"]
- assert media_stack
- elif (
- not self.cross_compile_target
- or ("armv7" in self.cross_compile_target and self.is_android_build)
- or "x86_64" in self.cross_compile_target
- ):
- media_stack = "gstreamer"
- else:
- media_stack = "dummy"
- if media_stack != "dummy":
- self.features += ["media-" + media_stack]
+
+ if media_stack: # In this case, the media stack is already configured.
+ self.media_stack = MediaStack.from_str(media_stack.lower())
+ return
+
+ if self.config["build"]["media-stack"] != "auto":
+ self.media_stack = MediaStack.from_str(self.config["build"]["media-stack"].lower())
+ elif (
+ not self.cross_compile_target
+ or ("armv7" in self.cross_compile_target and self.is_android_build)
+ or "x86_64" in self.cross_compile_target
+ ):
+ self.media_stack = MediaStack.GSTREAMER
+ else:
+ self.media_stack = MediaStack.DUMMY
 
  def run_cargo_build_like_command(
  self, command: str, cargo_args: List[str],
@@ -888,6 +912,10 @@ def run_cargo_build_like_command(
  features.append("webgl-backtrace")
  if self.config["build"]["dom-backtrace"]:
  features.append("dom-backtrace")
+
+ if self.media_stack.is_dummy() and "--no-default-features" not in cargo_args:
+ args += ["--no-default-features"]
+
  args += ["--features", " ".join(features)]
 
  if with_debug_assertions or self.config["build"]["debug-assertions"]: