Changes of com.discord v1290

This commit is contained in:
root 2020-10-06 17:21:08 +00:00
parent 47f788dbde
commit 6c8b723fba
565 changed files with 17200 additions and 17419 deletions

View file

@ -44,13 +44,13 @@
iget-object v0, p0, Lf/a/h/s/b$a;->d:Lf/a/h/s/b;
iget v1, v0, Lf/a/h/s/b;->f:I
iget v1, v0, Lf/a/h/s/b;->i:I
if-lez v1, :cond_1
if-lez v1, :cond_2
iget-object v0, v0, Lf/a/h/s/b;->h:Ljava/lang/Long;
iget-object v0, v0, Lf/a/h/s/b;->k:Ljava/lang/Long;
if-eqz v0, :cond_0
if-eqz v0, :cond_1
invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
@ -64,13 +64,13 @@
iget-object v4, p0, Lf/a/h/s/b$a;->d:Lf/a/h/s/b;
iget v5, v4, Lf/a/h/s/b;->g:I
iget v5, v4, Lf/a/h/s/b;->j:I
int-to-long v5, v5
cmp-long v7, v0, v5
if-lez v7, :cond_0
if-lez v7, :cond_1
iget-object v0, v4, Lf/a/h/s/b;->e:Lco/discord/media_engine/NativeCapturerObserver;
@ -78,11 +78,23 @@
invoke-virtual {v0, v2, v3}, Lco/discord/media_engine/NativeCapturerObserver;->repeatLastFrame(J)V
:cond_0
iget-object v0, p0, Lf/a/h/s/b$a;->d:Lf/a/h/s/b;
goto :goto_0
invoke-virtual {v0}, Lf/a/h/s/b;->c()V
:cond_0
const-string v0, "nativeObserver"
invoke-static {v0}, Lc0/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
const/4 v0, 0x0
throw v0
:cond_1
:goto_0
iget-object v0, p0, Lf/a/h/s/b$a;->d:Lf/a/h/s/b;
invoke-virtual {v0}, Lf/a/h/s/b;->d()V
:cond_2
return-void
.end method

View file

@ -16,17 +16,27 @@
.field public e:Lco/discord/media_engine/NativeCapturerObserver;
.field public f:I
.field public f:Lorg/webrtc/SurfaceTextureHelper;
.field public g:I
.field public g:Landroid/view/Display;
.field public h:Ljava/lang/Long;
.field public final h:Lco/discord/media_engine/SoundshareAudioSource;
.field public i:Lorg/webrtc/SurfaceTextureHelper;
.field public i:I
.field public final j:Lco/discord/media_engine/SoundshareAudioSource;
.field public j:I
.field public final k:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
.field public k:Ljava/lang/Long;
.field public final l:Landroid/graphics/Point;
.field public final m:Landroid/graphics/Point;
.field public final n:Landroid/graphics/Point;
.field public o:I
.field public final p:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
# direct methods
@ -57,7 +67,7 @@
invoke-direct {p0, p1, p2}, Lorg/webrtc/ScreenCapturerAndroid;-><init>(Landroid/content/Intent;Landroid/media/projection/MediaProjection$Callback;)V
iput-object p3, p0, Lf/a/h/s/b;->k:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
iput-object p3, p0, Lf/a/h/s/b;->p:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
new-instance p1, Lf/a/h/s/b$a;
@ -69,14 +79,105 @@
invoke-direct {p1}, Lco/discord/media_engine/SoundshareAudioSource;-><init>()V
iput-object p1, p0, Lf/a/h/s/b;->j:Lco/discord/media_engine/SoundshareAudioSource;
iput-object p1, p0, Lf/a/h/s/b;->h:Lco/discord/media_engine/SoundshareAudioSource;
new-instance p1, Landroid/graphics/Point;
invoke-direct {p1}, Landroid/graphics/Point;-><init>()V
iput-object p1, p0, Lf/a/h/s/b;->l:Landroid/graphics/Point;
new-instance p1, Landroid/graphics/Point;
invoke-direct {p1}, Landroid/graphics/Point;-><init>()V
iput-object p1, p0, Lf/a/h/s/b;->m:Landroid/graphics/Point;
new-instance p1, Landroid/graphics/Point;
invoke-direct {p1}, Landroid/graphics/Point;-><init>()V
iput-object p1, p0, Lf/a/h/s/b;->n:Landroid/graphics/Point;
return-void
.end method
# virtual methods
.method public final a()Landroid/media/AudioRecord;
.method public final declared-synchronized a(Landroid/graphics/Point;I)V
.locals 2
monitor-enter p0
:try_start_0
const-string v0, "measuredSize"
invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
iget v0, p1, Landroid/graphics/Point;->x:I
iget v1, p1, Landroid/graphics/Point;->y:I
invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I
move-result v0
if-lez v0, :cond_0
int-to-float p2, p2
int-to-float v0, v0
div-float/2addr p2, v0
iget-object v0, p0, Lf/a/h/s/b;->n:Landroid/graphics/Point;
iget v1, p1, Landroid/graphics/Point;->x:I
int-to-float v1, v1
mul-float v1, v1, p2
float-to-int v1, v1
iget p1, p1, Landroid/graphics/Point;->y:I
int-to-float p1, p1
mul-float p1, p1, p2
float-to-int p1, p1
invoke-virtual {v0, v1, p1}, Landroid/graphics/Point;->set(II)V
iget-object p1, p0, Lf/a/h/s/b;->n:Landroid/graphics/Point;
iget p1, p1, Landroid/graphics/Point;->x:I
iget-object p2, p0, Lf/a/h/s/b;->n:Landroid/graphics/Point;
iget p2, p2, Landroid/graphics/Point;->y:I
iget v0, p0, Lf/a/h/s/b;->i:I
invoke-super {p0, p1, p2, v0}, Lorg/webrtc/ScreenCapturerAndroid;->changeCaptureFormat(III)V
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
:cond_0
monitor-exit p0
return-void
:catchall_0
move-exception p1
monitor-exit p0
throw p1
.end method
.method public final b()Landroid/media/AudioRecord;
.locals 4
.annotation build Landroidx/annotation/RequiresApi;
value = 0x1d
@ -166,12 +267,12 @@
return-object v0
.end method
.method public final b()V
.method public final c()V
.locals 3
invoke-virtual {p0}, Lf/a/h/s/b;->stopCapture()V
iget-object v0, p0, Lf/a/h/s/b;->k:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
iget-object v0, p0, Lf/a/h/s/b;->p:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
if-eqz v0, :cond_0
@ -209,72 +310,45 @@
:cond_0
:goto_0
iget-object v0, p0, Lf/a/h/s/b;->j:Lco/discord/media_engine/SoundshareAudioSource;
iget-object v0, p0, Lf/a/h/s/b;->h:Lco/discord/media_engine/SoundshareAudioSource;
invoke-virtual {v0}, Lco/discord/media_engine/SoundshareAudioSource;->release()V
return-void
.end method
.method public final c()V
.locals 6
iget v0, p0, Lf/a/h/s/b;->f:I
if-lez v0, :cond_0
iget-object v0, p0, Lf/a/h/s/b;->i:Lorg/webrtc/SurfaceTextureHelper;
if-eqz v0, :cond_0
invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->getHandler()Landroid/os/Handler;
move-result-object v0
iget-object v1, p0, Lf/a/h/s/b;->d:Lf/a/h/s/b$a;
iget v2, p0, Lf/a/h/s/b;->g:I
int-to-long v2, v2
const v4, 0xf4240
int-to-long v4, v4
div-long/2addr v2, v4
invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
:cond_0
return-void
.end method
.method public declared-synchronized changeCaptureFormat(III)V
.locals 0
.locals 1
monitor-enter p0
:try_start_0
invoke-super {p0, p1, p2, p3}, Lorg/webrtc/ScreenCapturerAndroid;->changeCaptureFormat(III)V
iget-object v0, p0, Lf/a/h/s/b;->l:Landroid/graphics/Point;
invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
move-result p1
invoke-virtual {p0, v0, p1}, Lf/a/h/s/b;->a(Landroid/graphics/Point;I)V
if-gtz p3, :cond_0
const/4 p1, 0x0
iput p1, p0, Lf/a/h/s/b;->f:I
iput p1, p0, Lf/a/h/s/b;->i:I
iput p1, p0, Lf/a/h/s/b;->g:I
iput p1, p0, Lf/a/h/s/b;->j:I
goto :goto_0
:cond_0
iput p3, p0, Lf/a/h/s/b;->f:I
iput p3, p0, Lf/a/h/s/b;->i:I
const p1, 0x3b9aca00
div-int/2addr p1, p3
iput p1, p0, Lf/a/h/s/b;->g:I
iput p1, p0, Lf/a/h/s/b;->j:I
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
@ -291,8 +365,53 @@
throw p1
.end method
.method public final d()V
.locals 6
iget v0, p0, Lf/a/h/s/b;->i:I
if-lez v0, :cond_1
iget-object v0, p0, Lf/a/h/s/b;->f:Lorg/webrtc/SurfaceTextureHelper;
if-eqz v0, :cond_0
invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->getHandler()Landroid/os/Handler;
move-result-object v0
iget-object v1, p0, Lf/a/h/s/b;->d:Lf/a/h/s/b$a;
iget v2, p0, Lf/a/h/s/b;->j:I
int-to-long v2, v2
const v4, 0xf4240
int-to-long v4, v4
div-long/2addr v2, v4
invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
goto :goto_0
:cond_0
const-string/jumbo v0, "surfaceTextureHelper"
invoke-static {v0}, Lc0/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
const/4 v0, 0x0
throw v0
:cond_1
:goto_0
return-void
.end method
.method public declared-synchronized initialize(Lorg/webrtc/SurfaceTextureHelper;Landroid/content/Context;Lorg/webrtc/CapturerObserver;)V
.locals 1
.locals 2
monitor-enter p0
@ -309,7 +428,27 @@
invoke-static {p3, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
iput-object p1, p0, Lf/a/h/s/b;->i:Lorg/webrtc/SurfaceTextureHelper;
iput-object p1, p0, Lf/a/h/s/b;->f:Lorg/webrtc/SurfaceTextureHelper;
const-string/jumbo v0, "window"
invoke-virtual {p2, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
move-result-object v0
if-eqz v0, :cond_0
check-cast v0, Landroid/view/WindowManager;
invoke-interface {v0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
move-result-object v0
const-string/jumbo v1, "wm.defaultDisplay"
invoke-static {v0, v1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
iput-object v0, p0, Lf/a/h/s/b;->g:Landroid/view/Display;
move-object v0, p3
@ -325,6 +464,18 @@
return-void
:cond_0
:try_start_1
new-instance p1, Ljava/lang/NullPointerException;
const-string p2, "null cannot be cast to non-null type android.view.WindowManager"
invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
throw p1
:try_end_1
.catchall {:try_start_1 .. :try_end_1} :catchall_0
:catchall_0
move-exception p1
@ -336,6 +487,43 @@
.method public onFrame(Lorg/webrtc/VideoFrame;)V
.locals 8
iget-object v0, p0, Lf/a/h/s/b;->g:Landroid/view/Display;
if-eqz v0, :cond_3
iget-object v1, p0, Lf/a/h/s/b;->m:Landroid/graphics/Point;
invoke-virtual {v0, v1}, Landroid/view/Display;->getRealSize(Landroid/graphics/Point;)V
iget-object v0, p0, Lf/a/h/s/b;->m:Landroid/graphics/Point;
iget-object v1, p0, Lf/a/h/s/b;->l:Landroid/graphics/Point;
invoke-static {v0, v1}, Lc0/n/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
move-result v0
xor-int/lit8 v0, v0, 0x1
if-eqz v0, :cond_0
iget-object v0, p0, Lf/a/h/s/b;->l:Landroid/graphics/Point;
iget-object v1, p0, Lf/a/h/s/b;->m:Landroid/graphics/Point;
iget v2, v1, Landroid/graphics/Point;->x:I
iget v1, v1, Landroid/graphics/Point;->y:I
invoke-virtual {v0, v2, v1}, Landroid/graphics/Point;->set(II)V
iget-object v0, p0, Lf/a/h/s/b;->m:Landroid/graphics/Point;
iget v1, p0, Lf/a/h/s/b;->o:I
invoke-virtual {p0, v0, v1}, Lf/a/h/s/b;->a(Landroid/graphics/Point;I)V
:cond_0
invoke-virtual {p1}, Lorg/webrtc/VideoFrame;->getTimestampNs()J
move-result-wide v0
@ -344,11 +532,11 @@
move-result-object v0
iput-object v0, p0, Lf/a/h/s/b;->h:Ljava/lang/Long;
iput-object v0, p0, Lf/a/h/s/b;->k:Ljava/lang/Long;
iget-object v0, p0, Lf/a/h/s/b;->k:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
iget-object v0, p0, Lf/a/h/s/b;->p:Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;
if-eqz v0, :cond_1
if-eqz v0, :cond_2
monitor-enter v0
@ -379,7 +567,7 @@
cmp-long v7, v1, v5
if-lez v7, :cond_0
if-lez v7, :cond_1
iget-wide v1, v0, Lcom/discord/rtcconnection/mediaengine/ThumbnailEmitter;->i:J
@ -393,7 +581,7 @@
cmp-long v5, v3, v1
if-lez v5, :cond_0
if-lez v5, :cond_1
invoke-virtual {p1}, Lorg/webrtc/VideoFrame;->getTimestampNs()J
@ -411,7 +599,7 @@
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
:cond_0
:cond_1
monitor-exit v0
goto :goto_0
@ -423,11 +611,20 @@
throw p1
:cond_1
:cond_2
:goto_0
invoke-super {p0, p1}, Lorg/webrtc/ScreenCapturerAndroid;->onFrame(Lorg/webrtc/VideoFrame;)V
return-void
:cond_3
const-string p1, "defaultDisplay"
invoke-static {p1}, Lc0/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
const/4 p1, 0x0
throw p1
.end method
.method public declared-synchronized startCapture(III)V
@ -438,24 +635,30 @@
:try_start_0
invoke-super {p0, p1, p2, p3}, Lorg/webrtc/ScreenCapturerAndroid;->startCapture(III)V
invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
move-result p1
iput p1, p0, Lf/a/h/s/b;->o:I
if-gtz p3, :cond_0
const/4 p1, 0x0
iput p1, p0, Lf/a/h/s/b;->f:I
iput p1, p0, Lf/a/h/s/b;->i:I
iput p1, p0, Lf/a/h/s/b;->g:I
iput p1, p0, Lf/a/h/s/b;->j:I
goto :goto_0
:cond_0
iput p3, p0, Lf/a/h/s/b;->f:I
iput p3, p0, Lf/a/h/s/b;->i:I
const p1, 0x3b9aca00
div-int/2addr p1, p3
iput p1, p0, Lf/a/h/s/b;->g:I
iput p1, p0, Lf/a/h/s/b;->j:I
:goto_0
sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
@ -464,18 +667,18 @@
if-lt p1, p2, :cond_1
invoke-virtual {p0}, Lf/a/h/s/b;->a()Landroid/media/AudioRecord;
invoke-virtual {p0}, Lf/a/h/s/b;->b()Landroid/media/AudioRecord;
move-result-object p1
if-eqz p1, :cond_1
iget-object p2, p0, Lf/a/h/s/b;->j:Lco/discord/media_engine/SoundshareAudioSource;
iget-object p2, p0, Lf/a/h/s/b;->h:Lco/discord/media_engine/SoundshareAudioSource;
invoke-virtual {p2, p1}, Lco/discord/media_engine/SoundshareAudioSource;->startRecording(Landroid/media/AudioRecord;)Z
:cond_1
invoke-virtual {p0}, Lf/a/h/s/b;->c()V
invoke-virtual {p0}, Lf/a/h/s/b;->d()V
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
@ -499,17 +702,17 @@
:try_start_0
invoke-super {p0}, Lorg/webrtc/ScreenCapturerAndroid;->stopCapture()V
iget-object v0, p0, Lf/a/h/s/b;->j:Lco/discord/media_engine/SoundshareAudioSource;
iget-object v0, p0, Lf/a/h/s/b;->h:Lco/discord/media_engine/SoundshareAudioSource;
invoke-virtual {v0}, Lco/discord/media_engine/SoundshareAudioSource;->stopRecording()Z
const/4 v0, 0x0
iput v0, p0, Lf/a/h/s/b;->f:I
iput v0, p0, Lf/a/h/s/b;->i:I
const/4 v0, 0x0
iput-object v0, p0, Lf/a/h/s/b;->h:Ljava/lang/Long;
iput-object v0, p0, Lf/a/h/s/b;->k:Ljava/lang/Long;
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0

View file

@ -57,7 +57,7 @@
iget-object v0, p0, Lf/a/h/s/c/e$p;->$screenCapturer:Lf/a/h/s/b;
iget-object v1, v0, Lf/a/h/s/b;->j:Lco/discord/media_engine/SoundshareAudioSource;
iget-object v1, v0, Lf/a/h/s/b;->h:Lco/discord/media_engine/SoundshareAudioSource;
invoke-virtual {v1}, Lco/discord/media_engine/SoundshareAudioSource;->getNativeInstance()J

View file

@ -365,7 +365,7 @@
if-eqz v0, :cond_0
invoke-virtual {v0}, Lf/a/h/s/b;->b()V
invoke-virtual {v0}, Lf/a/h/s/b;->c()V
:cond_0
new-instance v0, Lf/a/h/s/c/e$q;
@ -462,7 +462,7 @@
if-eqz v0, :cond_0
invoke-virtual {v0}, Lf/a/h/s/b;->b()V
invoke-virtual {v0}, Lf/a/h/s/b;->c()V
:cond_0
const/4 v0, 0x0