-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #78 from GetStream/fix/m114-patches1
Fix m114 patches + update binary compatibilities
- Loading branch information
Showing
17 changed files
with
2,678 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
stream-webrtc-android/src/main/java/org/webrtc/ContextUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright 2017 The WebRTC project authors. All Rights Reserved. | ||
| * | ||
| * Use of this source code is governed by a BSD-style license | ||
| * that can be found in the LICENSE file in the root of the source | ||
| * tree. An additional intellectual property rights grant can be found | ||
| * in the file PATENTS. All contributing project authors may | ||
| * be found in the AUTHORS file in the root of the source tree. | ||
| */ | ||
|
|
||
| package org.webrtc; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| /** | ||
| * Class for storing the application context and retrieving it in a static context. Similar to | ||
| * org.chromium.base.ContextUtils. | ||
| */ | ||
| public class ContextUtils { | ||
| private static final String TAG = "ContextUtils"; | ||
| private static Context applicationContext; | ||
|
|
||
| /** | ||
| * Stores the application context that will be returned by getApplicationContext. This is called | ||
| * by PeerConnectionFactory.initialize. The application context must be set before creating | ||
| * a PeerConnectionFactory and must not be modified while it is alive. | ||
| */ | ||
| public static void initialize(Context applicationContext) { | ||
| if (applicationContext == null) { | ||
| throw new IllegalArgumentException( | ||
| "Application context cannot be null for ContextUtils.initialize."); | ||
| } | ||
| ContextUtils.applicationContext = applicationContext; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the stored application context. | ||
| * | ||
| * @deprecated crbug.com/webrtc/8937 | ||
| */ | ||
| @Deprecated | ||
| public static Context getApplicationContext() { | ||
| return applicationContext; | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
stream-webrtc-android/src/main/java/org/webrtc/LibaomAv1Decoder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.webrtc; | ||
|
|
||
| public class LibaomAv1Decoder extends WrappedNativeVideoDecoder { | ||
| public LibaomAv1Decoder() { | ||
| } | ||
|
|
||
| public long createNativeVideoDecoder() { | ||
| return nativeCreateDecoder(); | ||
| } | ||
|
|
||
| static native long nativeCreateDecoder(); | ||
|
|
||
| static native boolean nativeIsSupported(); | ||
| } |
22 changes: 22 additions & 0 deletions
22
stream-webrtc-android/src/main/java/org/webrtc/Loggable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved. | ||
| * | ||
| * Use of this source code is governed by a BSD-style license | ||
| * that can be found in the LICENSE file in the root of the source | ||
| * tree. An additional intellectual property rights grant can be found | ||
| * in the file PATENTS. All contributing project authors may | ||
| * be found in the AUTHORS file in the root of the source tree. | ||
| */ | ||
|
|
||
| package org.webrtc; | ||
|
|
||
| import org.webrtc.Logging.Severity; | ||
|
|
||
| /** | ||
| * Java interface for WebRTC logging. The default implementation uses webrtc.Logging. | ||
| * | ||
| * When injected, the Loggable will receive logging from both Java and native. | ||
| */ | ||
| public interface Loggable { | ||
| public void onLogMessage(String message, Severity severity, String tag); | ||
| } |
Oops, something went wrong.