jellyfin/jellyfin-ffmpeg
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-ffmpeg.git synced 2026-09-02 21:03:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sync fixes from ffmpeg-rockchip

Browse Source 
- Replace mpp_packet_get_data with mpp_packet_get_pos
- Fix rkrga scaling ratio calc after w/h swapping

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka
2026-07-04 15:03:24 +08:00
parent 6d44178f7e
commit 24bd5c9fdf
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/patches/0042-add-full-hwa-pipeline-for-rockchip-rk3588-platform.patch
Vendored
+10 -4
View File
@@ -3563,7 +3563,7 @@ Index: FFmpeg/libavcodec/rkmppenc.c
+ av_log(avctx, AV_LOG_ERROR, "ff_get_encode_buffer failed: %d\n", ret);
+ goto exit;
+ }
+ memcpy(packet->data, mpp_packet_get_data(mpp_pkt), mpp_pkt_length);
+ memcpy(packet->data, mpp_packet_get_pos(mpp_pkt), mpp_pkt_length);
+ }
- int64_t pts = mpp_packet_get_pts(packet);
@@ -4489,7 +4489,7 @@ Index: FFmpeg/libavfilter/rkrga_common.c
===================================================================
--- /dev/null
+++ FFmpeg/libavfilter/rkrga_common.c
@@ -0,0 +1,1447 @@
@@ -0,0 +1,1453 @@
+/*
+ * Copyright (c) 2023 NyanMisaka
+ *
@@ -5361,8 +5361,14 @@ Index: FFmpeg/libavfilter/rkrga_common.c
+ if (!src || !dst)
+ return AVERROR(EINVAL);
+
+ scale_ratio_w = (float)dst->act_w / (float)src->act_w;
+ scale_ratio_h = (float)dst->act_h / (float)src->act_h;
+ if ((src->rotate_mode & 0x04) == 0x04 /* HAL_TRANSFORM_ROT_90 */ ||
+ (src->rotate_mode & 0x07) == 0x07 /* HAL_TRANSFORM_ROT_270 */) {
+ scale_ratio_w = (float)dst->act_h / (float)src->act_w;
+ scale_ratio_h = (float)dst->act_w / (float)src->act_h;
+ } else {
+ scale_ratio_w = (float)dst->act_w / (float)src->act_w;
+ scale_ratio_h = (float)dst->act_h / (float)src->act_h;
+ }
+
+ /* P010 requires RGA3 */
+ if (!r->has_rga3 &&