* Revert "Revert vcpkg ffmpeg (#8751)"
This reverts commit 5c16a8302e6c9c1381873aff45dba1487ee51d4f.
* vcpkg: Reland ffmpeg and try to fix sciter build
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
* vcpkg: Detect AVX2 by requiring __m256i
(ubuntu18.04 sciter)
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
* Install nasm from debian buster and python3.7
... from ubuntu universe
[Skip CI]
* vcpkg: Add libyuv port with fix for windows
From
abc59feabf
Found by @deep-soft
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
* Bump vcpkg baseline to 2024.07.12
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
* Fix F-Droid version action
I thought the latest release will be updated by the time hook starts
but it is not the case. Get tag from GITHUB_REF instead if GITHUB_REF_TYPE
is "tag".
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
---------
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
		
	
			
		
			
				
	
	
		
			41 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			41 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From be3d9d8092720bbe4239212648d2e9c4ffd7f40c Mon Sep 17 00:00:00 2001
 | 
						|
From: 21pages <pages21@163.com>
 | 
						|
Date: Wed, 22 May 2024 17:09:28 +0800
 | 
						|
Subject: [PATCH] android mediacodec encode align 64
 | 
						|
 | 
						|
Signed-off-by: 21pages <pages21@163.com>
 | 
						|
---
 | 
						|
 libavcodec/mediacodecenc.c | 11 ++++++-----
 | 
						|
 1 file changed, 6 insertions(+), 5 deletions(-)
 | 
						|
 | 
						|
diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c
 | 
						|
index 984014f1b1..8dcd3dcd64 100644
 | 
						|
--- a/libavcodec/mediacodecenc.c
 | 
						|
+++ b/libavcodec/mediacodecenc.c
 | 
						|
@@ -200,16 +200,17 @@ 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) {
 | 
						|
-        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.34.1
 | 
						|
 |