Skip to content
Snippets Groups Projects
Commit c0842750 authored by Francois Buergisser's avatar Francois Buergisser Committed by Nicolas Dufresne
Browse files

media: hantro: Fix picture order count table enable


The picture order count table only makes sense for profiles
higher than Baseline. This is confirmed by the H.264 specification
(See 8.2.1 Decoding process for picture order count), which
clarifies how POC are used for features not present in Baseline.

"""
Picture order counts are used to determine initial picture orderings
for reference pictures in the decoding of B slices, to represent picture
order differences between frames or fields for motion vector derivation
in temporal direct mode, for implicit mode weighted prediction in B slices,
and for decoder conformance checking.
"""

As a side note, this change matches various vendors downstream codebases,
including ChromiumOS and IMX VPU libraries.

Fixes: dea0a82f ("media: hantro: Add support for H264 decoding on G1")
Signed-off-by: default avatarFrancois Buergisser <fbuergisser@chromium.org>
Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
parent 1f615d65
No related branches found
No related tags found
No related merge requests found
......@@ -34,9 +34,9 @@ static void set_params(struct hantro_ctx *ctx)
reg = G1_REG_DEC_CTRL0_DEC_AXI_WR_ID(0x0);
if (sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD)
reg |= G1_REG_DEC_CTRL0_SEQ_MBAFF_E;
reg |= G1_REG_DEC_CTRL0_PICORD_COUNT_E;
if (sps->profile_idc > 66)
reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E;
reg = G1_REG_DEC_CTRL0_PICORD_COUNT_E |
G1_REG_DEC_CTRL0_WRITE_MVS_E;
if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY) &&
(sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment