Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'

Browse Source 
* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
  h264: do not pass H264Context to h264_slice_header_parse()

Conflicts:
	libavcodec/h264dec.h

Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.

Merged-by: Timothy Gu <timothygu99@gmail.com>
pull/228/head
Timothy Gu 8 years ago
parent 4be8ab70a6 b13fc1e344
commit bca30ed2b6
3 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      libavcodec/h264_refs.c
  2. 4
      libavcodec/h264_slice.c
  3. 6
      libavcodec/h264dec.h

18
libavcodec/h264_refs.c
Unescape View File

@ -418,7 +418,7 @@ int ff_h264_build_ref_list(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;
@ -436,10 +436,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;
@ -821,14 +821,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;
@ -863,8 +863,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;
@ -873,7 +873,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;

4
libavcodec/h264_slice.c
Unescape View File

@ -1635,7 +1635,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, h->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;
@ -1655,7 +1655,7 @@ 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, h->avctx);
if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

6
libavcodec/h264dec.h
Unescape View File

@ -574,7 +574,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(H264Context *h, H264SliceContext *sl); int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl);
void ff_h264_remove_all_refs(H264Context *h); void ff_h264_remove_all_refs(H264Context *h);
@ -583,8 +583,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);

Write Preview
Loading…
Cancel
Save