TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-17 14:31:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

android mediacodec encode align 64 (#12852)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages
2025-09-06 12:09:21 +08:00
committed by GitHub
parent ed5cd21cb6
commit 4080907d2b
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
res/vcpkg/ffmpeg/patch/0011-android-mediacodec-encode-align-64.patch Normal file
View File

@@ -0,0 +1,42 @@
From a609e1666c79ccce4faf7aa61d509bf202df9149 Mon Sep 17 00:00:00 2001
From: 21pages <sunboeasy@gmail.com>
Date: Fri, 5 Sep 2025 21:35:37 +0800
Subject: [PATCH] android mediacodec encode align 64
Signed-off-by: 21pages <sunboeasy@gmail.com>
---
libavcodec/mediacodecenc.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c
index 221f7360f4..768c8151df 100644
--- a/libavcodec/mediacodecenc.c
+++ b/libavcodec/mediacodecenc.c
@@ -242,18 +242,19 @@ static av_cold int mediacodec_init(AVCodecContext *avctx)
ff_AMediaFormat_setString(format, "mime", codec_mime);
// Workaround the alignment requirement of mediacodec. We can't do it
// silently for AV_PIX_FMT_MEDIACODEC.
+ const int align = 64;
if (avctx->pix_fmt != AV_PIX_FMT_MEDIACODEC &&
(avctx->codec_id == AV_CODEC_ID_H264 ||
avctx->codec_id == AV_CODEC_ID_HEVC)) {
- s->width = FFALIGN(avctx->width, 16);
- s->height = FFALIGN(avctx->height, 16);
+ s->width = FFALIGN(avctx->width, align);
+ s->height = FFALIGN(avctx->height, align);
} else {
s->width = avctx->width;
s->height = avctx->height;
- if (s->width % 16 || s->height % 16)
+ if (s->width % align || s->height % align)
av_log(avctx, AV_LOG_WARNING,
- "Video size %dx%d isn't align to 16, it may have device compatibility issue\n",
- s->width, s->height);
+ "Video size %dx%d isn't align to %d, it may have device compatibility issue\n",
+ s->width, s->height, align);
}
ff_AMediaFormat_setInt32(format, "width", s->width);
ff_AMediaFormat_setInt32(format, "height", s->height);
--
2.43.0.windows.1

1
res/vcpkg/ffmpeg/portfile.cmake
View File

@@ -26,6 +26,7 @@ vcpkg_from_github(
patch/0008-remove-amf-loop-query.patch patch/0008-remove-amf-loop-query.patch
patch/0009-fix-nvenc-reconfigure-blur.patch patch/0009-fix-nvenc-reconfigure-blur.patch
patch/0010.disable-loading-DLLs-from-app-dir.patch patch/0010.disable-loading-DLLs-from-app-dir.patch
patch/0011-android-mediacodec-encode-align-64.patch
) )
if(SOURCE_PATH MATCHES " ") if(SOURCE_PATH MATCHES " ")