Signed-off-by: softworkz <softwo...@hotmail.com>
---
v2 Update:
- Implemented Andreas' suggestions
- overlay_subs filter:
- removed duplicated code
- implemented direct (no pre-conversion) blending of graphical
subtitle rects
- Supported input formats:
- all packed RGB formats (with and without alpha)
- yuv420p, yuv422p, yuv444p
libavfilter/avfilter.c | 8 +++++---
libavfilter/avfiltergraph.c | 5 +++++
libavfilter/formats.c | 11 +++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index ea22b247de..5505c34678 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -56,7 +56,8 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end)
ref->linesize[0], ref->linesize[1], ref->linesize[2],
ref->linesize[3],
ref->pts, ref->pkt_pos);
- if (ref->width) {
+ switch(ref->type) {
+ case AVMEDIA_TYPE_VIDEO:
ff_tlog(ctx, " a:%d/%d s:%dx%d i:%c iskey:%d type:%c",
ref->sample_aspect_ratio.num, ref->sample_aspect_ratio.den,
ref->width, ref->height,
@@ -64,12 +65,13 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end)
ref->top_field_first ? 'T' : 'B', /* Top / Bottom */
ref->key_frame,
av_get_picture_type_char(ref->pict_type));
- }
- if (ref->nb_samples) {
+ break;
+ case AVMEDIA_TYPE_AUDIO:
ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d",
ref->channel_layout,
ref->nb_samples,
ref->sample_rate);
+ break;
}
ff_tlog(ctx, "]%s", end ? "\n" : "");
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 41a91a9bda..4f581bc7a6 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -328,6 +328,8 @@ static int filter_link_check_formats(void *log,
AVFilterLink *link, AVFilterForm
return ret;
break;
+ case AVMEDIA_TYPE_SUBTITLE:
+ return 0;
default:
av_assert0(!"reached");
}
@@ -463,6 +465,9 @@ static int query_formats(AVFilterGraph *graph, AVClass
*log_ctx)
if (!link)
continue;
+ if (link->type == AVMEDIA_TYPE_SUBTITLE)
+ continue;
+
neg = ff_filter_get_negotiation(link);
av_assert0(neg);
for (neg_step = 1; neg_step < neg->nb; neg_step++) {
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 9e39d65a3c..26d8e45263 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/avcodec.h"
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
@@ -430,6 +431,12 @@ int ff_add_channel_layout(AVFilterChannelLayouts **l,
uint64_t channel_layout)
return 0;
}
+static int ff_add_subtitle_type(AVFilterFormats **avff, int64_t fmt)
+{
+ ADD_FORMAT(avff, fmt, ff_formats_unref, int, formats, nb_formats);
+ return 0;
+}
+
AVFilterFormats *ff_all_formats(enum AVMediaType type)
{
AVFilterFormats *ret = NULL;
@@ -447,6 +454,10 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type)
return NULL;
fmt++;
}
+ } else if (type == AVMEDIA_TYPE_SUBTITLE) {
+ ff_add_subtitle_type(&ret, SUBTITLE_BITMAP);
+ ff_add_subtitle_type(&ret, SUBTITLE_ASS);
+ ff_add_subtitle_type(&ret, SUBTITLE_TEXT);
}
return ret;
--
2.30.2.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
