RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/hevc_parse: allow setting apply_defdispwin when decoding SPS NAL units 

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-02 00:16:02 -03:00
parent 159ab4625b
commit f1533979a2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/hevc_parse.c
View File

@ -23,7 +23,7 @@
static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps,
int is_nalff, int nal_length_size, int err_recognition,
void *logctx)
int apply_defdispwin, void *logctx)
{
int i;
int ret = 0;
@ -45,7 +45,7 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets
goto done;
break;
case HEVC_NAL_SPS:
ret = ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, 1);
ret = ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, apply_defdispwin);
if (ret < 0)
goto done;
break;
@ -69,8 +69,8 @@ done:
}
int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
int *is_nalff, int *nal_length_size,
int err_recognition, void *logctx)
int *is_nalff, int *nal_length_size, int err_recognition,
int apply_defdispwin, void *logctx)
{
int ret = 0;
GetByteContext gb;
@ -109,7 +109,7 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
}
ret = hevc_decode_nal_units(gb.buffer, nalsize, ps, *is_nalff, *nal_length_size,
err_recognition, logctx);
err_recognition, apply_defdispwin, logctx);
if (ret < 0) {
av_log(logctx, AV_LOG_ERROR,
"Decoding nal unit %d %d from hvcC failed\n",
@ -126,7 +126,7 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
} else {
*is_nalff = 0;
ret = hevc_decode_nal_units(data, size, ps, *is_nalff, *nal_length_size,
err_recognition, logctx);
err_recognition, apply_defdispwin, logctx);
if (ret < 0)
return ret;
}

4
libavcodec/hevc_parse.h
View File

@ -27,7 +27,7 @@
#include "hevcdec.h"
int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
int *is_nalff, int *nal_length_size,
int err_recognition, void *logctx);
int *is_nalff, int *nal_length_size, int err_recognition,
int apply_defdispwin, void *logctx);
#endif /* AVCODEC_HEVC_PARSE_H */

2
libavcodec/mediacodecdec.c
View File

@ -202,7 +202,7 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
memset(&ps, 0, sizeof(ps));
ret = ff_hevc_decode_extradata(avctx->extradata, avctx->extradata_size,
&ps, &is_nalff, &nal_length_size, 0, avctx);
&ps, &is_nalff, &nal_length_size, 0, 1, avctx);
if (ret < 0) {
goto done;
}