mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 09:31:06 +02:00
lavc/h264: add a logging ctx to ff_h264_pred_weight_table()
This commit is contained in:
parent
432891a96e
commit
4fdea02d68
@ -24,7 +24,7 @@
|
||||
|
||||
int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
|
||||
const int *ref_count, int slice_type_nos,
|
||||
H264PredWeightTable *pwt)
|
||||
H264PredWeightTable *pwt, void *logctx)
|
||||
{
|
||||
int list, i;
|
||||
int luma_def, chroma_def;
|
||||
@ -36,11 +36,11 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
|
||||
pwt->chroma_log2_weight_denom = get_ue_golomb(gb);
|
||||
|
||||
if (pwt->luma_log2_weight_denom > 7U) {
|
||||
av_log(NULL, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", pwt->luma_log2_weight_denom);
|
||||
av_log(logctx, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", pwt->luma_log2_weight_denom);
|
||||
pwt->luma_log2_weight_denom = 0;
|
||||
}
|
||||
if (pwt->chroma_log2_weight_denom > 7U) {
|
||||
av_log(NULL, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", pwt->chroma_log2_weight_denom);
|
||||
av_log(logctx, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", pwt->chroma_log2_weight_denom);
|
||||
pwt->chroma_log2_weight_denom = 0;
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,7 @@ struct H264ParamSets;
|
||||
|
||||
int ff_h264_pred_weight_table(GetBitContext *gb, const struct SPS *sps,
|
||||
const int *ref_count, int slice_type_nos,
|
||||
H264PredWeightTable *pwt);
|
||||
H264PredWeightTable *pwt, void *logctx);
|
||||
|
||||
/**
|
||||
* Check if the top & left blocks are available if needed & change the
|
||||
|
@ -198,7 +198,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb,
|
||||
if ((p->ps.pps->weighted_pred && slice_type_nos == AV_PICTURE_TYPE_P) ||
|
||||
(p->ps.pps->weighted_bipred_idc == 1 && slice_type_nos == AV_PICTURE_TYPE_B))
|
||||
ff_h264_pred_weight_table(gb, p->ps.sps, ref_count, slice_type_nos,
|
||||
&pwt);
|
||||
&pwt, avctx);
|
||||
|
||||
if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag
|
||||
int i;
|
||||
|
@ -1654,7 +1654,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
|
||||
(pps->weighted_bipred_idc == 1 &&
|
||||
sl->slice_type_nos == AV_PICTURE_TYPE_B))
|
||||
ff_h264_pred_weight_table(&sl->gb, sps, sl->ref_count,
|
||||
sl->slice_type_nos, &sl->pwt);
|
||||
sl->slice_type_nos, &sl->pwt, h->avctx);
|
||||
else if (pps->weighted_bipred_idc == 2 &&
|
||||
sl->slice_type_nos == AV_PICTURE_TYPE_B) {
|
||||
implicit_weight_table(h, sl, -1);
|
||||
|
Loading…
Reference in New Issue
Block a user