summaryrefslogtreecommitdiff
path: root/libavcodec/error_resilience.c
diff options
context:
space:
mode:
authorJ. Dekker <jdek@itanimul.li>2023-03-02 12:13:25 +0100
committerJ. Dekker <jdek@itanimul.li>2023-03-27 08:46:07 +0200
commitf7abe92bd7939b6aeeb2393fe141033e733305d4 (patch)
treeabedec19bbede2313b05fb2dc8bc3369461432d8 /libavcodec/error_resilience.c
parent4f555682172d838ba994df0482485973d45c6fdf (diff)
downloadffmpeg-f7abe92bd7939b6aeeb2393fe141033e733305d4.tar.gz
avcodec/er: remove check for fields
This change on its own is almost certainly not correct; however, in testing, many samples show notable improvement. Signed-off-by: J. Dekker <jdek@itanimul.li>
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r--libavcodec/error_resilience.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 2aa6f1d864..bd7050062c 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -805,8 +805,7 @@ void ff_er_frame_start(ERContext *s)
static int er_supported(ERContext *s)
{
if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice ||
- !s->cur_pic.f ||
- s->cur_pic.field_picture
+ !s->cur_pic.f
)
return 0;
return 1;
@@ -908,6 +907,12 @@ void ff_er_frame_end(ERContext *s)
(s->avctx->skip_top + s->avctx->skip_bottom)) {
return;
}
+
+ if (!s->warned_fields && (s->cur_pic.field_picture || s->cur_pic.f->interlaced_frame)) {
+ av_log(s->avctx, AV_LOG_WARNING, "Error concealment is not fully implemented for field pictures.\n");
+ s->warned_fields = 1;
+ }
+
linesize = s->cur_pic.f->linesize;
if ( s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO