upstream: bump version to v11.5.3

Signed-off-by: qwq233 <qwq233@qwq2333.top>
qwq233 · Dec 10, 2024 · 2771215 · 2771215
2 parents 893dff3 + 9dcd88b
commit 2771215
Show file tree

Hide file tree

Showing 179 changed files with 12,843 additions and 2,547 deletions.
diff --git a/TMessagesProj/jni/audio.c b/TMessagesProj/jni/audio.c
@@ -917,6 +917,8 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Stories_recorder_FfmpegAudioWaveform
     int skip = 4;
     int barWidth = (int) round((double) duration_in_seconds * sampleRate / count / (1 + skip)); // Assuming you have 'duration' and 'count' defined somewhere
 
+    int channels = codecContext->channels;
+
     short peak = 0;
     int currentCount = 0;
     int index = 0;
@@ -937,9 +939,43 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Stories_recorder_FfmpegAudioWaveform
                     break;
                 }
 
-                int16_t* samples = (int16_t*) frame->data[0];
+                const int is_planar = av_sample_fmt_is_planar(codecContext->sample_fmt);
+                const int sample_size = av_get_bytes_per_sample(codecContext->sample_fmt);
                 for (int i = 0; i < frame->nb_samples; i++) {
-                    short value = samples[i];  // Read the 16-bit PCM sample
+                    int sum = 0;
+                    for (int channel = 0; channel < channels; channel++) {
+                        uint8_t *data;
+                        if (is_planar) {
+                            data = frame->data[channel] + i * sample_size;
+                        } else {
+                            data = frame->data[0] + (i * channels + channel) * sample_size;
+                        }
+                        short sample_value = 0;
+                        switch (codecContext->sample_fmt) {
+                            case AV_SAMPLE_FMT_S16:
+                            case AV_SAMPLE_FMT_S16P:
+                                // Signed 16-bit PCM
+                                sample_value = *(int16_t *)data;
+                                break;
+
+                            case AV_SAMPLE_FMT_FLT:
+                            case AV_SAMPLE_FMT_FLTP:
+                                // 32-bit float, scale to 16-bit PCM range
+                                sample_value = (short)(*(float *)data * 32767.0f);
+                                break;
+
+                            case AV_SAMPLE_FMT_U8:
+                            case AV_SAMPLE_FMT_U8P:
+                                // Unsigned 8-bit PCM, scale to 16-bit PCM range
+                                sample_value = (*(uint8_t *)data - 128) * 256;
+                                break;
+
+                            default:
+                                break;
+                        }
+                        sum += sample_value;
+                    }
+                    short value = sum / channels;
 
                     if (currentCount >= barWidth) {
                         waveformChunkData[index - chunkIndex] = peak;

diff --git a/TMessagesProj/jni/gifvideo.cpp b/TMessagesProj/jni/gifvideo.cpp
@@ -176,7 +176,7 @@ int open_codec_context(int *stream_idx, AVCodecContext **dec_ctx, AVFormatContex
 
         dec = avcodec_find_decoder(st->codecpar->codec_id);
         if (!dec) {
-            LOGE("failed to find %s codec", av_get_media_type_string(type));
+            LOGE("failed to find %d codec", st->codecpar->codec_id);
             return AVERROR(EINVAL);
         }
 
@@ -858,7 +858,7 @@ extern "C" JNIEXPORT int JNICALL Java_org_telegram_ui_Components_AnimatedFileDra
 }
 
 extern "C" JNIEXPORT jint JNICALL Java_org_telegram_ui_Components_AnimatedFileDrawable_getVideoFrame(JNIEnv *env, jclass clazz, jlong ptr, jobject bitmap, jintArray data, jint stride, jboolean preview, jfloat start_time, jfloat end_time, jboolean loop) {
-    if (ptr == NULL || bitmap == nullptr) {
+    if (ptr == NULL) {
         return 0;
     }
     //int64_t time = ConnectionsManager::getInstance(0).getCurrentTimeMonotonicMillis();
@@ -947,10 +947,11 @@ extern "C" JNIEXPORT jint JNICALL Java_org_telegram_ui_Components_AnimatedFileDr
         }
         if (got_frame) {
             //LOGD("decoded frame with w = %d, h = %d, format = %d", info->frame->width, info->frame->height, info->frame->format);
-            if (info->frame->format == AV_PIX_FMT_YUV420P || info->frame->format == AV_PIX_FMT_BGRA || info->frame->format == AV_PIX_FMT_YUVJ420P || info->frame->format == AV_PIX_FMT_YUV444P || info->frame->format == AV_PIX_FMT_YUVA420P) {
+            if (bitmap != nullptr && (info->frame->format == AV_PIX_FMT_YUV420P || info->frame->format == AV_PIX_FMT_BGRA || info->frame->format == AV_PIX_FMT_YUVJ420P || info->frame->format == AV_PIX_FMT_YUV444P || info->frame->format == AV_PIX_FMT_YUVA420P)) {
                 writeFrameToBitmap(env, info, data, bitmap, stride);
             }
             info->has_decoded_frames = true;
+            push_time(env, info, data);
             av_frame_unref(info->frame);
             return 1;
         }

diff --git a/TMessagesProj/src/main/assets/models/coin_stars.binobj b/TMessagesProj/src/main/assets/models/coin_stars.binobj
diff --git a/TMessagesProj/src/main/assets/models/deal_logo.binobj b/TMessagesProj/src/main/assets/models/deal_logo.binobj
diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.media.MediaCodec;
 import android.media.PlaybackParams;
+import android.opengl.EGLContext;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.IntDef;
@@ -286,13 +287,15 @@ public DefaultRenderersFactory setAllowedVideoJoiningTimeMs(long allowedVideoJoi
   @Override
   public Renderer[] createRenderers(
       Handler eventHandler,
+      EGLContext parentContext,
       VideoRendererEventListener videoRendererEventListener,
       AudioRendererEventListener audioRendererEventListener,
       TextOutput textRendererOutput,
       MetadataOutput metadataRendererOutput) {
     ArrayList<Renderer> renderersList = new ArrayList<>();
     buildVideoRenderers(
         context,
+        parentContext,
         extensionRendererMode,
         mediaCodecSelector,
         enableDecoderFallback,
@@ -348,6 +351,7 @@ public Renderer[] createRenderers(
    */
   protected void buildVideoRenderers(
       Context context,
+      EGLContext parentContext,
       @ExtensionRendererMode int extensionRendererMode,
       MediaCodecSelector mediaCodecSelector,
       boolean enableDecoderFallback,
@@ -358,6 +362,7 @@ protected void buildVideoRenderers(
     MediaCodecVideoRenderer videoRenderer =
         new MediaCodecVideoRenderer(
             context,
+            parentContext,
             getCodecAdapterFactory(),
             mediaCodecSelector,
             allowedVideoJoiningTimeMs,

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -23,6 +23,7 @@
 import android.media.AudioDeviceInfo;
 import android.media.AudioTrack;
 import android.media.MediaCodec;
+import android.opengl.EGLContext;
 import android.os.Looper;
 import android.os.Process;
 import android.view.Surface;
@@ -454,6 +455,7 @@ default void onExperimentalOffloadedPlayback(boolean offloadedPlayback) {}
   final class Builder {
 
     /* package */ final Context context;
+    public EGLContext eglContext;
 
     /* package */ Clock clock;
     /* package */ long foregroundModeTimeoutMs;

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -249,6 +249,7 @@ public ExoPlayerImpl(ExoPlayer.Builder builder, @Nullable Player wrappingPlayer)
               .get()
               .createRenderers(
                   eventHandler,
+                  builder.eglContext,
                   componentListener,
                   componentListener,
                   componentListener,

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/RenderersFactory.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
+import android.opengl.EGLContext;
 import android.os.Handler;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.metadata.MetadataOutput;
@@ -36,6 +37,7 @@ public interface RenderersFactory {
    */
   Renderer[] createRenderers(
       Handler eventHandler,
+      EGLContext parentContext,
       VideoRendererEventListener videoRendererEventListener,
       AudioRendererEventListener audioRendererEventListener,
       TextOutput textRendererOutput,

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -28,6 +28,7 @@
 import android.media.MediaCodec;
 import android.media.MediaCrypto;
 import android.media.MediaFormat;
+import android.opengl.EGLContext;
 import android.os.Handler;
 import androidx.annotation.CallSuper;
 import androidx.annotation.DoNotInline;
@@ -418,7 +419,9 @@ protected MediaCodecAdapter.Configuration getMediaCodecConfiguration(
       MediaCodecInfo codecInfo,
       Format format,
       @Nullable MediaCrypto crypto,
-      float codecOperatingRate) {
+      float codecOperatingRate,
+      EGLContext parentContext
+  ) {
     codecMaxInputSize = getCodecMaxInputSize(codecInfo, format, getStreamFormats());
     codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name);
     MediaFormat mediaFormat =

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -39,6 +39,7 @@
 import android.media.MediaCryptoException;
 import android.media.MediaFormat;
 import android.media.metrics.LogSessionId;
+import android.opengl.EGLContext;
 import android.os.Bundle;
 import android.os.SystemClock;
 import androidx.annotation.CallSuper;
@@ -75,6 +76,8 @@
 import com.google.android.exoplayer2.util.TimedValueQueue;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -487,7 +490,8 @@ protected abstract MediaCodecAdapter.Configuration getMediaCodecConfiguration(
       MediaCodecInfo codecInfo,
       Format format,
       @Nullable MediaCrypto crypto,
-      float codecOperatingRate);
+      float codecOperatingRate,
+      EGLContext context);
 
   protected final void maybeInitCodecOrBypass() throws ExoPlaybackException {
     if (codec != null || bypassEnabled || inputFormat == null) {
@@ -1099,7 +1103,7 @@ private void initCodec(MediaCodecInfo codecInfo, MediaCrypto crypto) throws Exce
     }
     codecInitializingTimestamp = SystemClock.elapsedRealtime();
     MediaCodecAdapter.Configuration configuration =
-        getMediaCodecConfiguration(codecInfo, inputFormat, crypto, codecOperatingRate);
+        getMediaCodecConfiguration(codecInfo, inputFormat, crypto, codecOperatingRate, this instanceof MediaCodecVideoRenderer ? ((MediaCodecVideoRenderer) this).eglContext : null);
     if (Util.SDK_INT >= 31) {
       Api31.setLogSessionIdToMediaCodecFormat(configuration, getPlayerId());
     }

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -152,6 +152,7 @@ public static RendererCapabilities[] getRendererCapabilities(RenderersFactory re
     Renderer[] renderers =
         renderersFactory.createRenderers(
             Util.createHandlerForCurrentOrMainLooper(),
+            null,
             new VideoRendererEventListener() {},
             new AudioRendererEventListener() {},
             (cues) -> {},

diff --git a/...sagesProj/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/...sagesProj/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
@@ -292,7 +292,7 @@ public static synchronized DefaultBandwidthMeter getSingletonInstance(Context co
   private @C.NetworkType int networkType;
   private long totalElapsedTimeMs;
   private long totalBytesTransferred;
-  private long bitrateEstimate;
+  private volatile long bitrateEstimate;
   private long lastReportedBitrateEstimate;
 
   private boolean networkTypeOverrideSet;
@@ -420,7 +420,7 @@ public synchronized void onTransferEnd(DataSource source, DataSpec dataSpec, boo
     streamCount--;
   }
 
-  public void onTransfer(long bytes, long duration) {
+  public synchronized void onTransfer(long bytes, long duration) {
     long nowMs = clock.elapsedRealtime();
     int sampleElapsedTimeMs = (int) (nowMs - sampleStartTimeMs);
     totalElapsedTimeMs += sampleElapsedTimeMs;

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
@@ -90,7 +90,7 @@ public interface TextureImageListener {
   /**
    * @param handler The {@link Handler} that will be used to call {@link
    *     SurfaceTexture#updateTexImage()} to update images on the {@link SurfaceTexture}. Note that
-   *     {@link #init(int)} has to be called on the same looper thread as the {@link Handler}'s
+   *     {@link #init(int, EGLContext)} has to be called on the same looper thread as the {@link Handler}'s
    *     looper.
    */
   public EGLSurfaceTexture(Handler handler) {
@@ -100,7 +100,7 @@ public EGLSurfaceTexture(Handler handler) {
   /**
    * @param handler The {@link Handler} that will be used to call {@link
    *     SurfaceTexture#updateTexImage()} to update images on the {@link SurfaceTexture}. Note that
-   *     {@link #init(int)} has to be called on the same looper thread as the looper of the {@link
+   *     {@link #init(int, EGLContext)} has to be called on the same looper thread as the looper of the {@link
    *     Handler}.
    * @param callback The {@link TextureImageListener} to be called when the texture image on {@link
    *     SurfaceTexture} has been updated. This callback will be called on the same handler thread
@@ -117,10 +117,10 @@ public EGLSurfaceTexture(Handler handler, @Nullable TextureImageListener callbac
    *
    * @param secureMode The {@link SecureMode} to be used for EGL surface.
    */
-  public void init(@SecureMode int secureMode) throws GlUtil.GlException {
+  public void init(@SecureMode int secureMode, EGLContext parentContext) throws GlUtil.GlException {
     display = getDefaultDisplay();
     EGLConfig config = chooseEGLConfig(display);
-    context = createEGLContext(display, config, secureMode);
+    context = createEGLContext(display, config, secureMode, parentContext);
     surface = createEGLSurface(display, config, context, secureMode);
     generateTextureIds(textureIdHolder);
     texture = new SurfaceTexture(textureIdHolder[0]);
@@ -164,7 +164,7 @@ public void release() {
   }
 
   /**
-   * Returns the wrapped {@link SurfaceTexture}. This can only be called after {@link #init(int)}.
+   * Returns the wrapped {@link SurfaceTexture}. This can only be called after {@link #init(int, EGLContext)}.
    */
   public SurfaceTexture getSurfaceTexture() {
     return Assertions.checkNotNull(texture);
@@ -232,7 +232,7 @@ private static EGLConfig chooseEGLConfig(EGLDisplay display) throws GlUtil.GlExc
   }
 
   private static EGLContext createEGLContext(
-      EGLDisplay display, EGLConfig config, @SecureMode int secureMode) throws GlUtil.GlException {
+      EGLDisplay display, EGLConfig config, @SecureMode int secureMode, EGLContext eglContext) throws GlUtil.GlException {
     int[] glAttributes;
     if (secureMode == SECURE_MODE_NONE) {
       glAttributes = new int[] {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE};
@@ -248,7 +248,7 @@ private static EGLContext createEGLContext(
     }
     EGLContext context =
         EGL14.eglCreateContext(
-            display, config, android.opengl.EGL14.EGL_NO_CONTEXT, glAttributes, 0);
+            display, config, eglContext == null ? android.opengl.EGL14.EGL_NO_CONTEXT : eglContext, glAttributes, 0);
     GlUtil.checkGlException(context != null, "eglCreateContext failed");
     return context;
   }

diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -34,6 +34,7 @@
 import android.media.MediaCodecInfo.CodecProfileLevel;
 import android.media.MediaCrypto;
 import android.media.MediaFormat;
+import android.opengl.EGLContext;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -123,6 +124,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   private static boolean deviceNeedsSetOutputSurfaceWorkaround;
 
   private final Context context;
+  public EGLContext eglContext;
   private final VideoFrameReleaseHelper frameReleaseHelper;
   private final EventDispatcher eventDispatcher;
   private final long allowedJoiningTimeMs;
@@ -207,6 +209,7 @@ public MediaCodecVideoRenderer(
       int maxDroppedFramesToNotify) {
     this(
         context,
+        null,
         MediaCodecAdapter.Factory.DEFAULT,
         mediaCodecSelector,
         allowedJoiningTimeMs,
@@ -241,6 +244,7 @@ public MediaCodecVideoRenderer(
       int maxDroppedFramesToNotify) {
     this(
         context,
+        null,
         MediaCodecAdapter.Factory.DEFAULT,
         mediaCodecSelector,
         allowedJoiningTimeMs,
@@ -269,6 +273,7 @@ public MediaCodecVideoRenderer(
    */
   public MediaCodecVideoRenderer(
       Context context,
+      EGLContext parentContext,
       MediaCodecAdapter.Factory codecAdapterFactory,
       MediaCodecSelector mediaCodecSelector,
       long allowedJoiningTimeMs,
@@ -279,6 +284,7 @@ public MediaCodecVideoRenderer(
 
     this(
         context,
+        parentContext,
         codecAdapterFactory,
         mediaCodecSelector,
         allowedJoiningTimeMs,
@@ -312,6 +318,7 @@ public MediaCodecVideoRenderer(
    */
   public MediaCodecVideoRenderer(
       Context context,
+      EGLContext parentContext,
       MediaCodecAdapter.Factory codecAdapterFactory,
       MediaCodecSelector mediaCodecSelector,
       long allowedJoiningTimeMs,
@@ -329,6 +336,7 @@ public MediaCodecVideoRenderer(
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
     this.context = context.getApplicationContext();
+    this.eglContext = parentContext;
     frameReleaseHelper = new VideoFrameReleaseHelper(this.context);
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
     deviceNeedsNoPostProcessWorkaround = deviceNeedsNoPostProcessWorkaround();
@@ -674,7 +682,7 @@ private void setOutput(@Nullable Object output) throws ExoPlaybackException {
       } else {
         MediaCodecInfo codecInfo = getCodecInfo();
         if (codecInfo != null && shouldUsePlaceholderSurface(codecInfo)) {
-          placeholderSurface = PlaceholderSurface.newInstanceV17(context, codecInfo.secure);
+          placeholderSurface = PlaceholderSurface.newInstanceV17(context, codecInfo.secure, eglContext);
           surface = placeholderSurface;
         }
       }
@@ -739,8 +747,10 @@ protected MediaCodecAdapter.Configuration getMediaCodecConfiguration(
       MediaCodecInfo codecInfo,
       Format format,
       @Nullable MediaCrypto crypto,
-      float codecOperatingRate) {
-    if (placeholderSurface != null && placeholderSurface.secure != codecInfo.secure) {
+      float codecOperatingRate,
+      EGLContext parentContext
+  ) {
+    if (placeholderSurface != null && (placeholderSurface.secure != codecInfo.secure || placeholderSurface.parentContext != parentContext)) {
       // We can't re-use the current DummySurface instance with the new decoder.
       releasePlaceholderSurface();
     }
@@ -759,7 +769,7 @@ protected MediaCodecAdapter.Configuration getMediaCodecConfiguration(
         throw new IllegalStateException();
       }
       if (placeholderSurface == null) {
-        placeholderSurface = PlaceholderSurface.newInstanceV17(context, codecInfo.secure);
+        placeholderSurface = PlaceholderSurface.newInstanceV17(context, codecInfo.secure, parentContext);
       }
       surface = placeholderSurface;
     }