X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_ass.c;h=ade1b37374c519b98c3ffee0fc1a2f4a5ed76fef;hb=fe508f807abd218b0edd272c49f736149ea21279;hp=dab4f688688e21f97a25234c639a4319a9563333;hpb=577b39aea221ddc9606f3b5ca698516155cdfd43;p=ffmpeg diff --git a/libavfilter/vf_ass.c b/libavfilter/vf_ass.c index dab4f688688..ade1b37374c 100644 --- a/libavfilter/vf_ass.c +++ b/libavfilter/vf_ass.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2011 Baptiste Coudurier * Copyright (c) 2011 Stefano Sabatini + * Copyright (c) 2012 Clément Bœsch * * This file is part of FFmpeg. * @@ -28,6 +29,11 @@ #include +#include "config.h" +#if CONFIG_SUBTITLES_FILTER +# include "libavcodec/avcodec.h" +# include "libavformat/avformat.h" +#endif #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" @@ -53,15 +59,13 @@ typedef struct { #define OFFSET(x) offsetof(AssContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM -static const AVOption ass_options[] = { - {"filename", "set the filename of the ASS file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, - {"f", "set the filename of the ASS file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, +static const AVOption options[] = { + {"filename", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, + {"f", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, {"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_w), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, {NULL}, }; -AVFILTER_DEFINE_CLASS(ass); - /* libass supports a log level ranging from 0 to 7 */ static const int ass_libavfilter_log_level_map[] = { AV_LOG_QUIET, /* 0 */ @@ -82,13 +86,13 @@ static void ass_log(int ass_level, const char *fmt, va_list args, void *ctx) av_log(ctx, level, "\n"); } -static av_cold int init(AVFilterContext *ctx, const char *args) +static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class) { AssContext *ass = ctx->priv; static const char *shorthand[] = { "filename", NULL }; int ret; - ass->class = &ass_class; + ass->class = class; av_opt_set_defaults(ass); if ((ret = av_opt_set_from_string(ass, args, shorthand, "=", ":")) < 0) @@ -112,14 +116,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) return AVERROR(EINVAL); } - ass->track = ass_read_file(ass->library, ass->filename, NULL); - if (!ass->track) { - av_log(ctx, AV_LOG_ERROR, - "Could not create a libass track when reading file '%s'\n", - ass->filename); - return AVERROR(EINVAL); - } - ass_set_fonts(ass->renderer, NULL, NULL, 1, NULL, 1); return 0; } @@ -157,8 +153,6 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { return 0; } - /* libass stores an RGBA color in the format RRGGBBTT, where TT is the transparency level */ #define AR(c) ( (c)>>24) #define AG(c) (((c)>>16)&0xFF) @@ -180,12 +174,11 @@ static void overlay_ass_image(AssContext *ass, AVFilterBufferRef *picref, } } -static int end_frame(AVFilterLink *inlink) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; AssContext *ass = ctx->priv; - AVFilterBufferRef *picref = inlink->cur_buf; int detect_change = 0; double time_ms = picref->pts * av_q2d(inlink->time_base) * 1000; ASS_Image *image = ass_render_frame(ass->renderer, ass->track, @@ -196,33 +189,165 @@ static int end_frame(AVFilterLink *inlink) overlay_ass_image(ass, picref, image); - ff_draw_slice(outlink, 0, picref->video->h, 1); - return ff_end_frame(outlink); + return ff_filter_frame(outlink, picref); +} + +static const AVFilterPad ass_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + .config_props = config_input, + .min_perms = AV_PERM_READ | AV_PERM_WRITE, + }, + { NULL } +}; + +static const AVFilterPad ass_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +#if CONFIG_ASS_FILTER + +#define ass_options options +AVFILTER_DEFINE_CLASS(ass); + +static av_cold int init_ass(AVFilterContext *ctx, const char *args) +{ + AssContext *ass = ctx->priv; + int ret = init(ctx, args, &ass_class); + + if (ret < 0) + return ret; + + ass->track = ass_read_file(ass->library, ass->filename, NULL); + if (!ass->track) { + av_log(ctx, AV_LOG_ERROR, + "Could not create a libass track when reading file '%s'\n", + ass->filename); + return AVERROR(EINVAL); + } + return 0; } AVFilter avfilter_vf_ass = { .name = "ass", .description = NULL_IF_CONFIG_SMALL("Render subtitles onto input video using the libass library."), .priv_size = sizeof(AssContext), - .init = init, + .init = init_ass, .uninit = uninit, .query_formats = query_formats, + .inputs = ass_inputs, + .outputs = ass_outputs, + .priv_class = &ass_class, +}; +#endif - .inputs = (const AVFilterPad[]) { - { .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame, - .draw_slice = null_draw_slice, - .end_frame = end_frame, - .config_props = config_input, - .min_perms = AV_PERM_WRITE | AV_PERM_READ }, - { .name = NULL} - }, - .outputs = (const AVFilterPad[]) { - { .name = "default", - .type = AVMEDIA_TYPE_VIDEO, }, - { .name = NULL} - }, - .priv_class = &ass_class, +#if CONFIG_SUBTITLES_FILTER + +#define subtitles_options options +AVFILTER_DEFINE_CLASS(subtitles); + +static av_cold int init_subtitles(AVFilterContext *ctx, const char *args) +{ + int ret, sid; + AVFormatContext *fmt = NULL; + AVCodecContext *dec_ctx = NULL; + AVCodec *dec = NULL; + AVStream *st; + AVPacket pkt; + AssContext *ass = ctx->priv; + + /* Init libass */ + ret = init(ctx, args, &subtitles_class); + if (ret < 0) + return ret; + ass->track = ass_new_track(ass->library); + if (!ass->track) { + av_log(ctx, AV_LOG_ERROR, "Could not create a libass track\n"); + return AVERROR(EINVAL); + } + + /* Open subtitles file */ + ret = avformat_open_input(&fmt, ass->filename, NULL, NULL); + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Unable to open %s\n", ass->filename); + goto end; + } + ret = avformat_find_stream_info(fmt, NULL); + if (ret < 0) + goto end; + + /* Locate subtitles stream */ + ret = av_find_best_stream(fmt, AVMEDIA_TYPE_SUBTITLE, -1, -1, NULL, 0); + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Unable to locate subtitle stream in %s\n", + ass->filename); + goto end; + } + sid = ret; + st = fmt->streams[sid]; + + /* Open decoder */ + dec_ctx = st->codec; + dec = avcodec_find_decoder(dec_ctx->codec_id); + if (!dec) { + av_log(ctx, AV_LOG_ERROR, "Failed to find subtitle codec %s\n", + avcodec_get_name(dec_ctx->codec_id)); + return AVERROR(EINVAL); + } + ret = avcodec_open2(dec_ctx, dec, NULL); + if (ret < 0) + goto end; + + /* Decode subtitles and push them into the renderer (libass) */ + if (dec_ctx->subtitle_header) + ass_process_codec_private(ass->track, + dec_ctx->subtitle_header, + dec_ctx->subtitle_header_size); + av_init_packet(&pkt); + pkt.data = NULL; + pkt.size = 0; + while (av_read_frame(fmt, &pkt) >= 0) { + int i, got_subtitle; + AVSubtitle sub; + + if (pkt.stream_index == sid) { + ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt); + if (ret < 0 || !got_subtitle) + break; + for (i = 0; i < sub.num_rects; i++) { + char *ass_line = sub.rects[i]->ass; + if (!ass_line) + break; + ass_process_data(ass->track, ass_line, strlen(ass_line)); + } + } + av_free_packet(&pkt); + avsubtitle_free(&sub); + } + +end: + if (dec_ctx) + avcodec_close(dec_ctx); + if (fmt) + avformat_close_input(&fmt); + return ret; +} + +AVFilter avfilter_vf_subtitles = { + .name = "subtitles", + .description = NULL_IF_CONFIG_SMALL("Render subtitles onto input video using the libass library."), + .priv_size = sizeof(AssContext), + .init = init_subtitles, + .uninit = uninit, + .query_formats = query_formats, + .inputs = ass_inputs, + .outputs = ass_outputs, + .priv_class = &subtitles_class, }; +#endif