RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 13:32:10 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/er: remove check for fields

Browse Source 
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>
This commit is contained in:
J. Dekker 2023-03-02 12:13:25 +01:00
parent 4f55568217
commit f7abe92bd7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/error_resilience.c
View File

@ -805,8 +805,7 @@ void ff_er_frame_start(ERContext *s)
static int er_supported(ERContext *s) static int er_supported(ERContext *s)
{ {
if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice ||
!s->cur_pic.f || !s->cur_pic.f
s->cur_pic.field_picture
) )
return 0; return 0;
return 1; return 1;
@ -908,6 +907,12 @@ void ff_er_frame_end(ERContext *s)
(s->avctx->skip_top + s->avctx->skip_bottom)) { (s->avctx->skip_top + s->avctx->skip_bottom)) {
return; 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; linesize = s->cur_pic.f->linesize;
if ( s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO if ( s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO

1
libavcodec/error_resilience.h
View File

@ -87,6 +87,7 @@ typedef struct ERContext {
int (*mv)[2][4][2], int (*mv)[2][4][2],
int mb_x, int mb_y, int mb_intra, int mb_skipped); int mb_x, int mb_y, int mb_intra, int mb_skipped);
void *opaque; void *opaque;
int warned_fields;
} ERContext; } ERContext;
void ff_er_frame_start(ERContext *s); void ff_er_frame_start(ERContext *s);