@@ -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;
@@ -86,8 +86,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;
@@ -126,7 +126,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",
@@ -143,7 +143,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;
}
@@ -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 */
@@ -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;
}
Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/hevc_parse.c | 12 ++++++------ libavcodec/hevc_parse.h | 4 ++-- libavcodec/mediacodecdec.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)