mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 15:21:39 +00:00
f49c6f8e2b
1: update meson 4K support patches: 2, HDMI i2s improvement patches: 3, update vdec patches: 4, update meson audio patches: 5, add meson crypto engine driver 6, remove disabled patches: 7 remove unknown patch or no need 8, remove merged patches: 9, remove unknown patches from khadas should be covered by patches set 2 10, rename patches for better grouping 11, update kernel config accordingly Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
155 lines
5 KiB
Diff
155 lines
5 KiB
Diff
From 0f7fb280bd77cef388b15a0f91eb318dc82ee32f Mon Sep 17 00:00:00 2001
|
|
From: Maxime Jourdan <mjourdan@baylibre.com>
|
|
Date: Thu, 17 Jan 2019 16:59:11 +0100
|
|
Subject: [PATCH 09/14] media: meson: vdec: add VP9 input support
|
|
|
|
Amlogic VP9 decoder requires an additional 16-byte payload before every
|
|
frame header.
|
|
|
|
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
|
|
---
|
|
drivers/staging/media/meson/vdec/esparser.c | 101 +++++++++++++++++++-
|
|
1 file changed, 97 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
|
|
index 3a21a8cec799..97a4cd409c5f 100644
|
|
--- a/drivers/staging/media/meson/vdec/esparser.c
|
|
+++ b/drivers/staging/media/meson/vdec/esparser.c
|
|
@@ -52,6 +52,7 @@
|
|
#define PARSER_VIDEO_HOLE 0x90
|
|
|
|
#define SEARCH_PATTERN_LEN 512
|
|
+#define VP9_HEADER_SIZE 16
|
|
|
|
static DECLARE_WAIT_QUEUE_HEAD(wq);
|
|
static int search_done;
|
|
@@ -74,14 +75,103 @@ static irqreturn_t esparser_isr(int irq, void *dev)
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
+/**
|
|
+ * VP9 frame headers need to be appended by a 16-byte long
|
|
+ * Amlogic custom header
|
|
+ */
|
|
+static int vp9_update_header(struct vb2_buffer *buf)
|
|
+{
|
|
+ uint8_t *dp;
|
|
+ uint8_t marker;
|
|
+ int dsize;
|
|
+ int num_frames, cur_frame;
|
|
+ int cur_mag, mag, mag_ptr;
|
|
+ int frame_size[8], tot_frame_size[8];
|
|
+ int total_datasize = 0;
|
|
+ int new_frame_size;
|
|
+ unsigned char *old_header = NULL;
|
|
+
|
|
+ dp = (uint8_t *) vb2_plane_vaddr(buf, 0);
|
|
+ dsize = vb2_get_plane_payload(buf, 0);
|
|
+
|
|
+ marker = dp[dsize - 1];
|
|
+ if ((marker & 0xe0) == 0xc0) {
|
|
+ num_frames = (marker & 0x7) + 1;
|
|
+ mag = ((marker >> 3) & 0x3) + 1;
|
|
+ mag_ptr = dsize - mag * num_frames - 2;
|
|
+ if (dp[mag_ptr] != marker) {
|
|
+ return 0;
|
|
+ }
|
|
+ mag_ptr++;
|
|
+ for (cur_frame = 0; cur_frame < num_frames; cur_frame++) {
|
|
+ frame_size[cur_frame] = 0;
|
|
+ for (cur_mag = 0; cur_mag < mag; cur_mag++) {
|
|
+ frame_size[cur_frame] |= (dp[mag_ptr] << (cur_mag * 8));
|
|
+ mag_ptr++;
|
|
+ }
|
|
+ if (cur_frame == 0)
|
|
+ tot_frame_size[cur_frame] = frame_size[cur_frame];
|
|
+ else
|
|
+ tot_frame_size[cur_frame] = tot_frame_size[cur_frame - 1] + frame_size[cur_frame];
|
|
+ total_datasize += frame_size[cur_frame];
|
|
+ }
|
|
+ } else {
|
|
+ num_frames = 1;
|
|
+ frame_size[0] = dsize;
|
|
+ tot_frame_size[0] = dsize;
|
|
+ total_datasize = dsize;
|
|
+ }
|
|
+
|
|
+ new_frame_size = total_datasize + num_frames * VP9_HEADER_SIZE;
|
|
+
|
|
+ for (cur_frame = num_frames - 1; cur_frame >= 0; cur_frame--) {
|
|
+ int framesize = frame_size[cur_frame];
|
|
+ int framesize_header = framesize + 4;
|
|
+ int oldframeoff = tot_frame_size[cur_frame] - framesize;
|
|
+ int outheaderoff = oldframeoff + cur_frame * VP9_HEADER_SIZE;
|
|
+ uint8_t *fdata = dp + outheaderoff;
|
|
+ uint8_t *old_framedata = dp + oldframeoff;
|
|
+
|
|
+ memmove(fdata + VP9_HEADER_SIZE, old_framedata, framesize);
|
|
+
|
|
+ fdata[0] = (framesize_header >> 24) & 0xff;
|
|
+ fdata[1] = (framesize_header >> 16) & 0xff;
|
|
+ fdata[2] = (framesize_header >> 8) & 0xff;
|
|
+ fdata[3] = (framesize_header >> 0) & 0xff;
|
|
+ fdata[4] = ((framesize_header >> 24) & 0xff) ^0xff;
|
|
+ fdata[5] = ((framesize_header >> 16) & 0xff) ^0xff;
|
|
+ fdata[6] = ((framesize_header >> 8) & 0xff) ^0xff;
|
|
+ fdata[7] = ((framesize_header >> 0) & 0xff) ^0xff;
|
|
+ fdata[8] = 0;
|
|
+ fdata[9] = 0;
|
|
+ fdata[10] = 0;
|
|
+ fdata[11] = 1;
|
|
+ fdata[12] = 'A';
|
|
+ fdata[13] = 'M';
|
|
+ fdata[14] = 'L';
|
|
+ fdata[15] = 'V';
|
|
+
|
|
+ if (!old_header) {
|
|
+ /* nothing */
|
|
+ } else if (old_header > fdata + 16 + framesize) {
|
|
+ printk("data has gaps, setting to 0\n");
|
|
+ memset(fdata + 16 + framesize, 0, (old_header - fdata + 16 + framesize));
|
|
+ } else if (old_header < fdata + 16 + framesize) {
|
|
+ printk("data overwritten\n");
|
|
+ }
|
|
+ old_header = fdata;
|
|
+ }
|
|
+
|
|
+ return new_frame_size;
|
|
+}
|
|
+
|
|
/* Pad the packet to at least 4KiB bytes otherwise the VDEC unit won't trigger
|
|
* ISRs.
|
|
* Also append a start code 000001ff at the end to trigger
|
|
* the ESPARSER interrupt.
|
|
*/
|
|
-static u32 esparser_pad_start_code(struct vb2_buffer *vb)
|
|
+static u32 esparser_pad_start_code(struct vb2_buffer *vb, u32 payload_size)
|
|
{
|
|
- u32 payload_size = vb2_get_plane_payload(vb, 0);
|
|
u32 pad_size = 0;
|
|
u8 *vaddr = vb2_plane_vaddr(vb, 0) + payload_size;
|
|
|
|
@@ -190,7 +280,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
|
|
if (codec_ops->num_pending_bufs)
|
|
num_dst_bufs = codec_ops->num_pending_bufs(sess);
|
|
|
|
- num_dst_bufs += v4l2_m2m_num_dst_bufs_ready(sess->m2m_ctx);
|
|
+ num_dst_bufs += v4l2_m2m_num_dst_bufs_ready(sess->m2m_ctx) - 1;
|
|
|
|
if (esparser_vififo_get_free_space(sess) < payload_size ||
|
|
atomic_read(&sess->esparser_queued_bufs) >= num_dst_bufs)
|
|
@@ -204,7 +294,10 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
|
|
dev_dbg(core->dev, "esparser: ts = %llu pld_size = %u offset = %08X\n",
|
|
vb->timestamp, payload_size, offset);
|
|
|
|
- pad_size = esparser_pad_start_code(vb);
|
|
+ if (sess->fmt_out->pixfmt == V4L2_PIX_FMT_VP9)
|
|
+ payload_size = vp9_update_header(vb);
|
|
+
|
|
+ pad_size = esparser_pad_start_code(vb, payload_size);
|
|
ret = esparser_write_data(core, phy, payload_size + pad_size);
|
|
|
|
if (ret <= 0) {
|
|
--
|
|
2.20.1
|
|
|