Patch "media: amphion: drop repeated codec data for vc1g format" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    media: amphion: drop repeated codec data for vc1g format

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     media-amphion-drop-repeated-codec-data-for-vc1g-form.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7dbcc48120a128dda97cbc5c8a990389093bee78
Author: Ming Qian <ming.qian@xxxxxxx>
Date:   Fri Apr 14 09:55:43 2023 +0800

    media: amphion: drop repeated codec data for vc1g format
    
    [ Upstream commit e1d2ccc2cdd6333584aa3d5386dc667d0837c48f ]
    
    For format V4L2_PIX_FMT_VC1_ANNEX_G,
    the separate codec data is required only once.
    The repeated codec data may introduce some decoding error.
    so drop the repeated codec data.
    
    It's amphion vpu's limitation
    
    Fixes: e670f5d672ef ("media: amphion: only insert the first sequence startcode for vc1l format")
    Signed-off-by: Ming Qian <ming.qian@xxxxxxx>
    Tested-by: xiahong.bao <xiahong.bao@xxxxxxx>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/amphion/vpu_malone.c
index 36e563d29621f..c2f4fb12c3b64 100644
--- a/drivers/media/platform/amphion/vpu_malone.c
+++ b/drivers/media/platform/amphion/vpu_malone.c
@@ -1286,6 +1286,15 @@ static int vpu_malone_insert_scode_pic(struct malone_scode_t *scode, u32 codec_i
 	return sizeof(hdr);
 }
 
+static int vpu_malone_insert_scode_vc1_g_seq(struct malone_scode_t *scode)
+{
+	if (!scode->inst->total_input_count)
+		return 0;
+	if (vpu_vb_is_codecconfig(to_vb2_v4l2_buffer(scode->vb)))
+		scode->need_data = 0;
+	return 0;
+}
+
 static int vpu_malone_insert_scode_vc1_g_pic(struct malone_scode_t *scode)
 {
 	struct vb2_v4l2_buffer *vbuf;
@@ -1423,6 +1432,7 @@ static const struct malone_scode_handler scode_handlers[] = {
 	},
 	{
 		.pixelformat = V4L2_PIX_FMT_VC1_ANNEX_G,
+		.insert_scode_seq = vpu_malone_insert_scode_vc1_g_seq,
 		.insert_scode_pic = vpu_malone_insert_scode_vc1_g_pic,
 	},
 	{



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux