jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux (Samsung): rebase patches for 6.9

Browse Source
This commit is contained in:
Rudi Heitbaum 2024-05-15 11:12:18 +00:00
parent 222b4353f7
commit d8d9a4a612
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
projects/Samsung/patches/linux/samsung-0012-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch
View File

@ -13,35 +13,35 @@ diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c b/drivers/medi
index b65e506665af..d445466046eb 100644 index b65e506665af..d445466046eb 100644
--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
@@ -1214,6 +1214,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) @@ -1231,6 +1231,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
{ {
struct s5p_mfc_dev *dev = ctx->dev; struct s5p_mfc_dev *dev = ctx->dev;
struct s5p_mfc_buf *mb_entry; struct s5p_mfc_buf *mb_entry;
+ struct s5p_mfc_buf *dst_buf; + struct s5p_mfc_buf *dst_buf;
unsigned long enc_y_addr = 0, enc_c_addr = 0; unsigned long enc_y_addr = 0, enc_c_addr = 0, enc_c_1_addr = 0;
unsigned long mb_y_addr, mb_c_addr; unsigned long mb_y_addr, mb_c_addr, mb_c_1_addr;
int slice_type; int slice_type;
@@ -1233,8 +1234,12 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) @@ -1259,8 +1260,12 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
&mb_entry->b->vb2_buf, 0); (&mb_entry->b->vb2_buf, 2);
mb_c_addr = vb2_dma_contig_plane_dma_addr( else
&mb_entry->b->vb2_buf, 1); mb_c_1_addr = 0;
+ dst_buf = list_entry(ctx->dst_queue.next, + dst_buf = list_entry(ctx->dst_queue.next,
+ struct s5p_mfc_buf, list); + struct s5p_mfc_buf, list);
if ((enc_y_addr == mb_y_addr) && if (enc_y_addr == mb_y_addr && enc_c_addr == mb_c_addr && enc_c_1_addr
(enc_c_addr == mb_c_addr)) { == mb_c_1_addr) {
+ dst_buf->b->timecode = mb_entry->b->timecode; + dst_buf->b->timecode = mb_entry->b->timecode;
+ dst_buf->b->vb2_buf.timestamp = mb_entry->b->vb2_buf.timestamp; + dst_buf->b->vb2_buf.timestamp = mb_entry->b->vb2_buf.timestamp;
list_del(&mb_entry->list); list_del(&mb_entry->list);
ctx->src_queue_cnt--; ctx->src_queue_cnt--;
vb2_buffer_done(&mb_entry->b->vb2_buf, vb2_buffer_done(&mb_entry->b->vb2_buf,
@@ -1247,8 +1252,12 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) @@ -1280,8 +1285,12 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
&mb_entry->b->vb2_buf, 0); mb_entry->b->vb2_buf, 2);
mb_c_addr = vb2_dma_contig_plane_dma_addr( else
&mb_entry->b->vb2_buf, 1); mb_c_1_addr = 0;
+ dst_buf = list_entry(ctx->dst_queue.next, + dst_buf = list_entry(ctx->dst_queue.next,
+ struct s5p_mfc_buf, list); + struct s5p_mfc_buf, list);
if ((enc_y_addr == mb_y_addr) && if (enc_y_addr == mb_y_addr && enc_c_addr == mb_c_addr && enc_c_1_addr
(enc_c_addr == mb_c_addr)) { == mb_c_1_addr) {
+ dst_buf->b->timecode = mb_entry->b->timecode; + dst_buf->b->timecode = mb_entry->b->timecode;
+ dst_buf->b->vb2_buf.timestamp = mb_entry->b->vb2_buf.timestamp; + dst_buf->b->vb2_buf.timestamp = mb_entry->b->vb2_buf.timestamp;
list_del(&mb_entry->list); list_del(&mb_entry->list);