[FFmpeg-cvslog] avcodec/mpeg12dec: remove inter block calls in IPU decoder
Paul B Mahol
git at videolan.org
Sat Sep 26 00:35:39 EEST 2020
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Sep 25 23:32:34 2020 +0200| [f8f23a7af7dd5ec7a3ca0c9fc9c302847ef8a21b] | committer: Paul B Mahol
avcodec/mpeg12dec: remove inter block calls in IPU decoder
This is intra only codec.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8f23a7af7dd5ec7a3ca0c9fc9c302847ef8a21b
---
libavcodec/mpeg12dec.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index a771add4dc..2494226aa3 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -3052,21 +3052,15 @@ static int ipu_decode_frame(AVCodecContext *avctx, void *data,
for (int n = 0; n < 6; n++) {
if (s->flags & 0x80) {
- if (s->flags & 0x20)
- ret = mpeg1_decode_block_inter(m, s->block[n], n);
- else
- ret = ff_mpeg1_decode_block_intra(&m->gb,
- m->intra_matrix,
- m->intra_scantable.permutated,
- m->last_dc, s->block[n],
- n, m->qscale);
+ ret = ff_mpeg1_decode_block_intra(&m->gb,
+ m->intra_matrix,
+ m->intra_scantable.permutated,
+ m->last_dc, s->block[n],
+ n, m->qscale);
if (ret >= 0)
m->block_last_index[n] = ret;
} else {
- if (s->flags & 0x20)
- ret = mpeg2_decode_block_intra(m, s->block[n], n);
- else
- ret = mpeg2_decode_block_non_intra(m, s->block[n], n);
+ ret = mpeg2_decode_block_intra(m, s->block[n], n);
}
if (ret < 0)
More information about the ffmpeg-cvslog
mailing list