Commit 927563f
Android improvements. (#20)
Start/Stop receiving stream method for VideoTrack (#25)
Properly remove observer upon deconstruction (#26)
feat: Expose setCodecPreferences/getCapabilities for android. (#61)
fix: add WrappedVideoDecoderFactory.java. (#74)
Exposing Adapter types in PeerConnectionFactory (#78)
Co-authored-by: davidliu <[email protected]>
Co-authored-by: Mohamed Risaldar UT <[email protected]>
(cherry picked from commit e91f003)
# Conflicts:
# media/base/media_channel.h
# media/engine/webrtc_video_engine.cc
# media/engine/webrtc_video_engine.h1 parent 988c839 commit 927563f
File tree
2 files changed
+14
-1
lines changed- media/engine
- sdk/android/src/jni
2 files changed
+14
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
286 | 286 | | |
287 | 287 | | |
288 | 288 | | |
289 | | - | |
290 | 289 | | |
291 | 290 | | |
292 | 291 | | |
| |||
719 | 718 | | |
720 | 719 | | |
721 | 720 | | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
722 | 724 | | |
723 | 725 | | |
724 | 726 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
60 | 71 | | |
61 | 72 | | |
0 commit comments