Hi Hans, Em Fri, 13 May 2022 10:46:56 +0200 Hans Verkuil <hverkuil@xxxxxxxxx> escreveu: > This PR contains this Nicolas' v4 patch series: > > https://patchwork.linuxtv.org/project/linux-media/patch/20220426125751.108293-2-nicolas.dufresne@xxxxxxxxxxxxx/ > > except for patch 03/24 ("media: videobuf2-v4l2: Warn on holding buffers without support") > which needs more work. It's independent of the other patches though, so that can be > done later. > > Regards, > > Hans > > Changes since v1: > > - patch "Use v4l2_h264_reference for reflist" failed to compile: the tegra-vde change used > a field that was only added 3 patches later ("Store all fields into the unordered list"). > Keep the old field and only update it in the later patch. > > > The following changes since commit 02970914dbc7152d6de615127261e778ef425a09: > > media: amphion: ensure the buffer count is not less than min_buffer (2022-05-13 10:05:09 +0200) > > are available in the Git repository at: > > git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.19f > > for you to fetch changes up to 57ee62e3da43e55fe7a83115bc941e9c84b2cd1f: > > media: hantro: Enable HOLD_CAPTURE_BUF for H.264 (2022-05-13 10:42:24 +0200) > > ---------------------------------------------------------------- > Tag branch > > ---------------------------------------------------------------- > Jonas Karlman (5): > media: rkvdec: h264: Fix bit depth wrap in pps packet > media: rkvdec: h264: Validate and use pic width and height in mbs > media: rkvdec: h264: Fix reference frame_num wrap for second field > media: rkvdec: Ensure decoded resolution fit coded resolution > media: hantro: h264: Make dpb entry management more robust > > Nicolas Dufresne (18): > media: doc: Document dual use of H.264 pic_num/frame_num > media: v4l2-mem2mem: Trace on implicit un-hold > media: h264: Avoid wrapping long_term_frame_idx > media: h264: Use v4l2_h264_reference for reflist This one has a non-trivial conflict. Basically, part of the code it modifies are not there at the header file. I suspect it could be due to some conflict with this patch: commit 024b1f4fedc87db2aeea77dbfb1b32bbac096304 Author: Yunfei Dong <yunfei.dong@xxxxxxxxxxxx> AuthorDate: Thu May 12 04:19:46 2022 +0200 Commit: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> CommitDate: Fri May 13 14:48:31 2022 +0200 media: mediatek: vcodec: Extract H264 common code Mt8192 can use some of common code with mt8183. Moves them to a new file in order to reuse. [hverkuil: replaced memcpy_toio by memcpy, was left over from a prev version] Signed-off-by: Yunfei Dong <yunfei.dong@xxxxxxxxxxxx> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx> Tested-by: Nícolas F. R. A. Prado <nfraprado@xxxxxxxxxxxxx> Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> That was merged from another branch. I'll apply only the 3 patches that came before this one, e. g.: 4a18d21649f4 media: h264: Avoid wrapping long_term_frame_idx 86ef61ad686c media: v4l2-mem2mem: Trace on implicit un-hold 804e192a8114 media: doc: Document dual use of H.264 pic_num/frame_num Regards, Mauro Thanks, Mauro
