Skip to content

F
ffmpeg.wasm-core
Commit b13fc1e3 authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

h264: do not pass H264Context to h264_slice_header_parse() 

This should make it more clear that this function does not need any
decoder-global state other than the parameter sets.
parent 996f1341
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
libavcodec/h264_refs.c
View file @ b13fc1e3
...@@ -367,7 +367,7 @@ int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) ...@@ -367,7 +367,7 @@ int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl)
return 0; return 0;
} }
int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) int ff_h264_decode_ref_pic_list_reordering(H264SliceContext *sl, void *logctx)
{ {
int list, index; int list, index;
...@@ -385,10 +385,10 @@ int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContex ...@@ -385,10 +385,10 @@ int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContex
break; break;
if (index >= sl->ref_count[list]) { if (index >= sl->ref_count[list]) {
av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); av_log(logctx, AV_LOG_ERROR, "reference count overflow\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (op > 2) { } else if (op > 2) {
av_log(h->avctx, AV_LOG_ERROR, av_log(logctx, AV_LOG_ERROR,
"illegal modification_of_pic_nums_idc %u\n", "illegal modification_of_pic_nums_idc %u\n",
op); op);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -728,14 +728,14 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) ...@@ -728,14 +728,14 @@ int ff_h264_execute_ref_pic_marking(H264Context *h)
return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0; return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;
} }
int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl, int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb,
GetBitContext *gb) const H2645NAL *nal, void *logctx)
{ {
int i; int i;
MMCO *mmco = sl->mmco; MMCO *mmco = sl->mmco;
int nb_mmco = 0; int nb_mmco = 0;
if (h->nal_unit_type == H264_NAL_IDR_SLICE) { // FIXME fields if (nal->type == H264_NAL_IDR_SLICE) { // FIXME fields
skip_bits1(gb); // broken_link skip_bits1(gb); // broken_link
if (get_bits1(gb)) { if (get_bits1(gb)) {
mmco[0].opcode = MMCO_LONG; mmco[0].opcode = MMCO_LONG;
...@@ -770,8 +770,8 @@ int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl, ...@@ -770,8 +770,8 @@ int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl,
if (long_arg >= 32 || if (long_arg >= 32 ||
(long_arg >= 16 && !(opcode == MMCO_SET_MAX_LONG && (long_arg >= 16 && !(opcode == MMCO_SET_MAX_LONG &&
long_arg == 16) && long_arg == 16) &&
!(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE(h)))) { !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE(sl)))) {
av_log(h->avctx, AV_LOG_ERROR, av_log(logctx, AV_LOG_ERROR,
"illegal long ref in memory management control " "illegal long ref in memory management control "
"operation %d\n", opcode); "operation %d\n", opcode);
return -1; return -1;
...@@ -780,7 +780,7 @@ int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl, ...@@ -780,7 +780,7 @@ int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl,
} }
if (opcode > (unsigned) MMCO_LONG) { if (opcode > (unsigned) MMCO_LONG) {
av_log(h->avctx, AV_LOG_ERROR, av_log(logctx, AV_LOG_ERROR,
"illegal memory management control operation %d\n", "illegal memory management control operation %d\n",
opcode); opcode);
return -1; return -1;
......
libavcodec/h264_slice.c
View file @ b13fc1e3
...@@ -1345,8 +1345,8 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, ...@@ -1345,8 +1345,8 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl,
return 0; return 0;
} }
static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, static int h264_slice_header_parse(H264SliceContext *sl, const H2645NAL *nal,
const H2645NAL *nal) const H264ParamSets *ps, AVCodecContext *avctx)
{ {
const SPS *sps; const SPS *sps;
const PPS *pps; const PPS *pps;
...@@ -1359,7 +1359,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1359,7 +1359,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
slice_type = get_ue_golomb_31(&sl->gb); slice_type = get_ue_golomb_31(&sl->gb);
if (slice_type > 9) { if (slice_type > 9) {
av_log(h->avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"slice type %d too large at %d\n", "slice type %d too large at %d\n",
slice_type, sl->first_mb_addr); slice_type, sl->first_mb_addr);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -1376,29 +1376,29 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1376,29 +1376,29 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
if (nal->type == H264_NAL_IDR_SLICE && if (nal->type == H264_NAL_IDR_SLICE &&
sl->slice_type_nos != AV_PICTURE_TYPE_I) { sl->slice_type_nos != AV_PICTURE_TYPE_I) {
av_log(h->avctx, AV_LOG_ERROR, "A non-intra slice in an IDR NAL unit.\n"); av_log(avctx, AV_LOG_ERROR, "A non-intra slice in an IDR NAL unit.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
sl->pps_id = get_ue_golomb(&sl->gb); sl->pps_id = get_ue_golomb(&sl->gb);
if (sl->pps_id >= MAX_PPS_COUNT) { if (sl->pps_id >= MAX_PPS_COUNT) {
av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", sl->pps_id); av_log(avctx, AV_LOG_ERROR, "pps_id %u out of range\n", sl->pps_id);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (!h->ps.pps_list[sl->pps_id]) { if (!ps->pps_list[sl->pps_id]) {
av_log(h->avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"non-existing PPS %u referenced\n", "non-existing PPS %u referenced\n",
sl->pps_id); sl->pps_id);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
pps = (const PPS*)h->ps.pps_list[sl->pps_id]->data; pps = (const PPS*)ps->pps_list[sl->pps_id]->data;
if (!h->ps.sps_list[pps->sps_id]) { if (!ps->sps_list[pps->sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"non-existing SPS %u referenced\n", pps->sps_id); "non-existing SPS %u referenced\n", pps->sps_id);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
sps = (const SPS*)h->ps.sps_list[pps->sps_id]->data; sps = (const SPS*)ps->sps_list[pps->sps_id]->data;
sl->frame_num = get_bits(&sl->gb, sps->log2_max_frame_num); sl->frame_num = get_bits(&sl->gb, sps->log2_max_frame_num);
...@@ -1457,7 +1457,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1457,7 +1457,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
return ret; return ret;
if (sl->slice_type_nos != AV_PICTURE_TYPE_I) { if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
ret = ff_h264_decode_ref_pic_list_reordering(h, sl); ret = ff_h264_decode_ref_pic_list_reordering(sl, avctx);
if (ret < 0) { if (ret < 0) {
sl->ref_count[1] = sl->ref_count[0] = 0; sl->ref_count[1] = sl->ref_count[0] = 0;
return ret; return ret;
...@@ -1477,15 +1477,15 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1477,15 +1477,15 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
sl->explicit_ref_marking = 0; sl->explicit_ref_marking = 0;
if (nal->ref_idc) { if (nal->ref_idc) {
ret = ff_h264_decode_ref_pic_marking(h, sl, &sl->gb); ret = ff_h264_decode_ref_pic_marking(sl, &sl->gb, nal, avctx);
if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) {
tmp = get_ue_golomb_31(&sl->gb); tmp = get_ue_golomb_31(&sl->gb);
if (tmp > 2) { if (tmp > 2) {
av_log(h->avctx, AV_LOG_ERROR, "cabac_init_idc %u overflow\n", tmp); av_log(avctx, AV_LOG_ERROR, "cabac_init_idc %u overflow\n", tmp);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
sl->cabac_init_idc = tmp; sl->cabac_init_idc = tmp;
...@@ -1494,7 +1494,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1494,7 +1494,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
sl->last_qscale_diff = 0; sl->last_qscale_diff = 0;
tmp = pps->init_qp + get_se_golomb(&sl->gb); tmp = pps->init_qp + get_se_golomb(&sl->gb);
if (tmp > 51 + 6 * (sps->bit_depth_luma - 8)) { if (tmp > 51 + 6 * (sps->bit_depth_luma - 8)) {
av_log(h->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp); av_log(avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
sl->qscale = tmp; sl->qscale = tmp;
...@@ -1513,7 +1513,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1513,7 +1513,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
if (pps->deblocking_filter_parameters_present) { if (pps->deblocking_filter_parameters_present) {
tmp = get_ue_golomb_31(&sl->gb); tmp = get_ue_golomb_31(&sl->gb);
if (tmp > 2) { if (tmp > 2) {
av_log(h->avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"deblocking_filter_idc %u out of range\n", tmp); "deblocking_filter_idc %u out of range\n", tmp);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -1528,7 +1528,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, ...@@ -1528,7 +1528,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
sl->slice_alpha_c0_offset < -12 || sl->slice_alpha_c0_offset < -12 ||
sl->slice_beta_offset > 12 || sl->slice_beta_offset > 12 ||
sl->slice_beta_offset < -12) { sl->slice_beta_offset < -12) {
av_log(h->avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"deblocking filter parameters %d %d out of range\n", "deblocking filter parameters %d %d out of range\n",
sl->slice_alpha_c0_offset, sl->slice_beta_offset); sl->slice_alpha_c0_offset, sl->slice_beta_offset);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -1552,7 +1552,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, ...@@ -1552,7 +1552,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
{ {
int i, j, ret = 0; int i, j, ret = 0;
ret = h264_slice_header_parse(h, sl, nal); ret = h264_slice_header_parse(sl, nal, &h->ps, h->avctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
libavcodec/h264dec.h
View file @ b13fc1e3
...@@ -528,7 +528,7 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); ...@@ -528,7 +528,7 @@ int ff_h264_get_slice_type(const H264SliceContext *sl);
*/ */
int ff_h264_alloc_tables(H264Context *h); int ff_h264_alloc_tables(H264Context *h);
int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); int ff_h264_decode_ref_pic_list_reordering(H264SliceContext *sl, void *logctx);
int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl); int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl);
void ff_h264_remove_all_refs(H264Context *h); void ff_h264_remove_all_refs(H264Context *h);
...@@ -537,8 +537,8 @@ void ff_h264_remove_all_refs(H264Context *h); ...@@ -537,8 +537,8 @@ void ff_h264_remove_all_refs(H264Context *h);
*/ */
int ff_h264_execute_ref_pic_marking(H264Context *h); int ff_h264_execute_ref_pic_marking(H264Context *h);
int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl, int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb,
GetBitContext *gb); const H2645NAL *nal, void *logctx);
void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl); void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl);
int ff_h264_decode_init(AVCodecContext *avctx); int ff_h264_decode_init(AVCodecContext *avctx);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment