]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/mpeg12dec: remove inter block calls in IPU decoder
authorPaul B Mahol <onemda@gmail.com>
Fri, 25 Sep 2020 21:32:34 +0000 (23:32 +0200)
committerPaul B Mahol <onemda@gmail.com>
Fri, 25 Sep 2020 21:34:52 +0000 (23:34 +0200)
This is intra only codec.

libavcodec/mpeg12dec.c

index a771add4dcbd2ec8b75122f13a8e8c74757dde25..2494226aa3147b134b3ef5574a4a3801b4243e59 100644 (file)
@@ -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)