From patchwork Sat Jan 25 02:01:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 17540 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CE7FC447C63 for ; Sat, 25 Jan 2020 04:10:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B63036880C8; Sat, 25 Jan 2020 04:10:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C257E68809B for ; Sat, 25 Jan 2020 04:10:48 +0200 (EET) Received: by mail-yb1-f177.google.com with SMTP id n7so1959396ybm.5 for ; Fri, 24 Jan 2020 18:10:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CLReXsPPQ+SJWNei8v8A3rw+7A/3yxPDPx3ZGu2BQGU=; b=LuaBShAbRus36nc6W28xUa5SgeDYjALWhJggLjZDlYit0vv7BU0fiHIf2eEeudtpi2 QKr8bQceTMVee4qXWuRZSHqYVbEXpUbkfXk3Cz8lYBU4c5DNJ5C1GLUo9N6ZLzQkv5mp nUyVb+0YukwOfpe07PXoGX+bEk1RJrH3jxwYaWajxWyHujhU2eZQBoVyuOtGVGoWYlXo TOfWA2nkVSI+eZlH0XLqUPxZd6RwDNGRaCeij+/v5uk8woe3GM+Mz1HiKBj5KV1tI0Nr urvVrcj9OxAsv78oUQlluYZehCYwuIMiApOMIEpI2Qy86+b8f8HmGauKaa522M9N+NAy 6IIQ== X-Gm-Message-State: APjAAAX0rnVYxLNjpCoZvsqwT8UI7Co3j6svvl22LcZ+zGGrg4W5ja3U IzSv8wIXwBVw9/DKpNflM+dBLqgN9pU= X-Google-Smtp-Source: APXvYqxYI3dBcELg1bb+ZCFRsuJ+0UkgF9C5Z8YlOB/7UxfW3YmH4udoVIgPJK/c0m3rXQOIi8a2CQ== X-Received: by 2002:a05:6902:4c8:: with SMTP id v8mr4851364ybs.451.1579917763371; Fri, 24 Jan 2020 18:02:43 -0800 (PST) Received: from MacBook-Pro.localdomain ([24.14.135.13]) by smtp.gmail.com with ESMTPSA id h184sm3181072ywa.70.2020.01.24.18.02.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2020 18:02:42 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 20:01:55 -0600 Message-Id: <20200125020200.2049-8-rcombs@rcombs.me> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200125020200.2049-1-rcombs@rcombs.me> References: <20200125020200.2049-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] lavc/samidec: add support for configuring default style via AVOptions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/textdec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index 964da72ad5..72eb7c4795 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -30,15 +30,17 @@ typedef struct { AVClass *class; + int readorder; + FFASSHeaderOptions common; const char *linebreaks; int keep_ass_markup; - int readorder; } TextContext; #define OFFSET(x) offsetof(TextContext, x) #define SD AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "keep_ass_markup", "Set if ASS tags must be escaped", OFFSET(keep_ass_markup), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, .flags=SD }, + ASS_HEADER_AVOPTIONS(TextContext, common) { NULL } }; @@ -88,7 +90,7 @@ AVCodec ff_text_decoder = { .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_TEXT, .decode = text_decode_frame, - .init = ff_ass_subtitle_header_default, + .init = ff_ass_subtitle_header_options, .priv_class = &text_decoder_class, .flush = text_flush, }; @@ -100,7 +102,7 @@ static int linebreak_init(AVCodecContext *avctx) { TextContext *text = avctx->priv_data; text->linebreaks = "|"; - return ff_ass_subtitle_header_default(avctx); + return ff_ass_subtitle_header_from_opts(avctx, &text->common); } #if CONFIG_VPLAYER_DECODER