virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/tinterlace: Properly preserve CEA-708 closed captions

Browse Source 
Because the interlacing filter halves the effective framerate, we
need to ensure that no CEA-708 data is lost as frames are merged.

Make use of the new ccfifo mechanism to ensure that caption data
is properly preserved as frames pass through the filter.

Thanks to Thomas Mundt for review and noticing a couple of
missed codepaths for injection on output.  Thanks to Lance Wang
for pointing out a memory leak.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Devin Heitmueller
2023-05-05 15:09:05 -04:00
committed by Limin Wang
parent cecf35ae3e
commit f304c3a729
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/tinterlace.h
View File

@@ -32,6 +32,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "drawutils.h" #include "drawutils.h"
#include "avfilter.h" #include "avfilter.h"
#include "ccfifo.h"
#define TINTERLACE_FLAG_VLPF 01 #define TINTERLACE_FLAG_VLPF 01
#define TINTERLACE_FLAG_CVLPF 2 #define TINTERLACE_FLAG_CVLPF 2
@@ -77,6 +78,7 @@ typedef struct TInterlaceContext {
const AVPixFmtDescriptor *csp; const AVPixFmtDescriptor *csp;
void (*lowpass_line)(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp, void (*lowpass_line)(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp,
ptrdiff_t mref, ptrdiff_t pref, int clip_max); ptrdiff_t mref, ptrdiff_t pref, int clip_max);
AVCCFifo *cc_fifo;
} TInterlaceContext; } TInterlaceContext;
void ff_tinterlace_init_x86(TInterlaceContext *interlace); void ff_tinterlace_init_x86(TInterlaceContext *interlace);

11
libavfilter/vf_tinterlace.c
View File

@@ -203,6 +203,7 @@ static av_cold void uninit(AVFilterContext *ctx)
av_frame_free(&tinterlace->next); av_frame_free(&tinterlace->next);
av_freep(&tinterlace->black_data[0][0]); av_freep(&tinterlace->black_data[0][0]);
av_freep(&tinterlace->black_data[1][0]); av_freep(&tinterlace->black_data[1][0]);
ff_ccfifo_freep(&tinterlace->cc_fifo);
} }
static int config_out_props(AVFilterLink *outlink) static int config_out_props(AVFilterLink *outlink)
@@ -291,6 +292,11 @@ static int config_out_props(AVFilterLink *outlink)
#endif #endif
} }
if (!(tinterlace->cc_fifo = ff_ccfifo_alloc(outlink->frame_rate, ctx))) {
av_log(ctx, AV_LOG_ERROR, "Failure to setup CC FIFO queue\n");
return AVERROR(ENOMEM);
}
av_log(ctx, AV_LOG_VERBOSE, "mode:%d filter:%s h:%d -> h:%d\n", tinterlace->mode, av_log(ctx, AV_LOG_VERBOSE, "mode:%d filter:%s h:%d -> h:%d\n", tinterlace->mode,
(tinterlace->flags & TINTERLACE_FLAG_CVLPF) ? "complex" : (tinterlace->flags & TINTERLACE_FLAG_CVLPF) ? "complex" :
(tinterlace->flags & TINTERLACE_FLAG_VLPF) ? "linear" : "off", (tinterlace->flags & TINTERLACE_FLAG_VLPF) ? "linear" : "off",
@@ -375,6 +381,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
tinterlace->cur = tinterlace->next; tinterlace->cur = tinterlace->next;
tinterlace->next = picref; tinterlace->next = picref;
ff_ccfifo_extract(tinterlace->cc_fifo, picref);
cur = tinterlace->cur; cur = tinterlace->cur;
next = tinterlace->next; next = tinterlace->next;
/* we need at least two frames */ /* we need at least two frames */
@@ -456,6 +464,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (!out) if (!out)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
out->pts /= 2; // adjust pts to new framerate out->pts /= 2; // adjust pts to new framerate
ff_ccfifo_inject(tinterlace->cc_fifo, out);
ret = ff_filter_frame(outlink, out); ret = ff_filter_frame(outlink, out);
return ret; return ret;
} }
@@ -505,6 +514,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
out->pts = cur->pts*2; out->pts = cur->pts*2;
out->pts = av_rescale_q(out->pts, tinterlace->preout_time_base, outlink->time_base); out->pts = av_rescale_q(out->pts, tinterlace->preout_time_base, outlink->time_base);
ff_ccfifo_inject(tinterlace->cc_fifo, out);
if ((ret = ff_filter_frame(outlink, out)) < 0) if ((ret = ff_filter_frame(outlink, out)) < 0)
return ret; return ret;
@@ -549,6 +559,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
out->pts = av_rescale_q(out->pts, tinterlace->preout_time_base, outlink->time_base); out->pts = av_rescale_q(out->pts, tinterlace->preout_time_base, outlink->time_base);
out->duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base); out->duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base);
ff_ccfifo_inject(tinterlace->cc_fifo, out);
ret = ff_filter_frame(outlink, out); ret = ff_filter_frame(outlink, out);
return ret; return ret;