[FFmpeg-devel] [PATCH] avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged

* [FFmpeg-devel] [PATCH] avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged
@ 2022-01-10 10:47 Andreas Rheinhardt
  2022-01-10 17:51 ` [FFmpeg-devel] [PATCH 2/6] avcodec/svq3: Remove dead topright_samples_available variable, code Andreas Rheinhardt
                   ` (8 more replies)
  0 siblings, 9 replies; 11+ messages in thread
From: Andreas Rheinhardt @ 2022-01-10 10:47 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Andreas Rheinhardt

Always zero since 4d2858deac5213eaddfdc06f98379b6325d7b953.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/h263dec.c       | 7 -------
 libavcodec/mpegvideo.h     | 1 -
 libavcodec/mpegvideo_dec.c | 1 -
 libavcodec/svq3.c          | 8 --------
 libavcodec/vc1dec.c        | 7 -------
 5 files changed, 24 deletions(-)

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 11e80cb9e9..9cc2665cac 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -603,13 +603,6 @@ retry:
         avctx->skip_frame >= AVDISCARD_ALL)
         return get_consumed_bytes(s, buf_size);
 
-    if (s->next_p_frame_damaged) {
-        if (s->pict_type == AV_PICTURE_TYPE_B)
-            return get_consumed_bytes(s, buf_size);
-        else
-            s->next_p_frame_damaged = 0;
-    }
-
     if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
         s->me.qpel_put = s->qdsp.put_qpel_pixels_tab;
         s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab;
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 1c14f5b0f0..448fe2cedc 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -342,7 +342,6 @@ typedef struct MpegEncContext {
     int resync_mb_y;                 ///< y position of last resync marker
     GetBitContext last_resync_gb;    ///< used to search for the next resync marker
     int mb_num_left;                 ///< number of MBs left in this video packet (for partitioned Slices only)
-    int next_p_frame_damaged;        ///< set if the next p frame is damaged, to avoid showing trashed B-frames
 
 #if FF_API_FLAG_TRUNCATED
     ParseContext parse_context;
diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c
index 8b625d2835..1e238bd1e1 100644
--- a/libavcodec/mpegvideo_dec.c
+++ b/libavcodec/mpegvideo_dec.c
@@ -132,7 +132,6 @@ do {\
     s->next_picture_ptr    = REBASE_PICTURE(s1->next_picture_ptr,    s, s1);
 
     // Error/bug resilience
-    s->next_p_frame_damaged = s1->next_p_frame_damaged;
     s->workaround_bugs      = s1->workaround_bugs;
     s->padding_bug_score    = s1->padding_bug_score;
 
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index e329578af0..6f3ade8ace 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -98,7 +98,6 @@ typedef struct SVQ3Context {
     int has_watermark;
     uint32_t watermark_key;
     int adaptive_quant;
-    int next_p_frame_damaged;
     int h_edge_pos;
     int v_edge_pos;
     int last_frame_output;
@@ -1470,13 +1469,6 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
         avctx->skip_frame >= AVDISCARD_ALL)
         return 0;
 
-    if (s->next_p_frame_damaged) {
-        if (s->pict_type == AV_PICTURE_TYPE_B)
-            return 0;
-        else
-            s->next_p_frame_damaged = 0;
-    }
-
     if (s->pict_type == AV_PICTURE_TYPE_B) {
         s->frame_num_offset = s->slice_num - s->prev_frame_num;
 
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 267d72d15b..7ed5133cfa 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -872,13 +872,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
         goto end;
     }
 
-    if (s->next_p_frame_damaged) {
-        if (s->pict_type == AV_PICTURE_TYPE_B)
-            goto end;
-        else
-            s->next_p_frame_damaged = 0;
-    }
-
     if ((ret = ff_mpv_frame_start(s, avctx)) < 0) {
         goto err;
     }
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 11+ messages in thread