History

add libaribb24 ARIB STD-B24 caption decoder

* Outputs ASS lines with basic coloring and font scaling for each given region. * Sets the default style to the resolution of the subtitle plane (for example, 960x540 / 36pt font for profile A). * Has options to: * Disable ruby text (which is coded as regions which have half-height text in libaribb24). Enabled by default as without positioning ruby text only confuses as it is usually coded in the beginning of the decoded subtitle line. * Set the working directory, in which libaribb24 will read configuration as well as into which it may save broadcast extra symbols as PNG. Unset by default. The unconventional library check can be explained by the library's current master branch being licensed as LGPLv3, but at the time of writing the latest official release is still licensed under GPLv3. Thus, one either has to wait for the following release, or enable GPLv3.

Jan Ekström committed 7 years ago

Commit 100bfac1 parent 5c515b511 files · +438 −2Browse files

Unified · Split

11 files
  1. Changelog +1 −0
  2. configure +6 −0
  3. doc/decoders.texi +25 −0
  4. libavcodec/Makefile +1 −0
  5. libavcodec/allcodecs.c +1 −0
  6. libavcodec/avcodec.h +4 −0
  7. libavcodec/codec_desc.c +8 −1
  8. libavcodec/libaribb24.c +384 −0
  9. libavcodec/profiles.c +6 −0
  10. libavcodec/profiles.h +1 −0
  11. libavcodec/version.h +1 −1
Changelog+1−0
@@ -17,6 +17,7 @@ version <next>: · 16 unmodified lines
1717 - maskfun filter
1818 - hcom demuxer and decoder
1919 - ARBC decoder
20+- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
2021
2122
2223 version 4.1:
configure+6−0
@@ -218,6 +218,7 @@ External library support: · 217 unmodified lines
218218 --enable-jni enable JNI support [no]
219219 --enable-ladspa enable LADSPA audio filtering [no]
220220 --enable-libaom enable AV1 video encoding/decoding via libaom [no]
221+ --enable-libaribb24 enable ARIB text and caption decoding via libaribb24 [no]
221222 --enable-libass enable libass subtitles rendering,
222223 needed for subtitles and ass filter [no]
223224 --enable-libbluray enable BluRay reading using libbluray [no]
@@ -1683,6 +1684,7 @@ EXTERNAL_LIBRARY_NONFREE_LIST=" · 1459 unmodified lines
16831684
16841685 EXTERNAL_LIBRARY_VERSION3_LIST="
16851686 gmp
1687+ libaribb24
16861688 liblensfun
16871689 libopencore_amrnb
16881690 libopencore_amrwb
@@ -3094,6 +3096,7 @@ hevc_videotoolbox_encoder_select="videotoolbox_encoder" · 1405 unmodified lines
30943096 libaom_av1_decoder_deps="libaom"
30953097 libaom_av1_encoder_deps="libaom"
30963098 libaom_av1_encoder_select="extract_extradata_bsf"
3099+libaribb24_decoder_deps="libaribb24"
30973100 libcelt_decoder_deps="libcelt"
30983101 libcodec2_decoder_deps="libcodec2"
30993102 libcodec2_encoder_deps="libcodec2"
@@ -6080,6 +6083,9 @@ enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gn · 2980 unmodified lines
60806083 enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
60816084 enabled ladspa && require_headers "ladspa.h dlfcn.h"
60826085 enabled libaom && require_pkg_config libaom "aom >= 1.0.0" aom/aom_codec.h aom_codec_version
6086+enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new ||
6087+ { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } ||
6088+ die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; }
60836089 enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new
60846090 enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
60856091 enabled libass && require_pkg_config libass libass ass/ass.h ass_library_init
doc/decoders.texi+25−0
@@ -194,6 +194,31 @@ without this library. · 193 unmodified lines
194194 @chapter Subtitles Decoders
195195 @c man begin SUBTILES DECODERS
196196
197+@section libaribb24
198+
199+ARIB STD-B24 caption decoder.
200+
201+Implements profiles A and C of the ARIB STD-B24 standard.
202+
203+@subsection libaribb24 Decoder Options
204+
205+@table @option
206+
207+@item -aribb24-base-path @var{path}
208+Sets the base path for the libaribb24 library. This is utilized for reading of
209+configuration files (for custom unicode conversions), and for dumping of
210+non-text symbols as images under that location.
211+
212+Unset by default.
213+
214+@item -aribb24-skip-ruby-text @var{boolean}
215+Tells the decoder wrapper to skip text blocks that contain half-height ruby
216+text.
217+
218+Enabled by default.
219+
220+@end table
221+
197222 @section dvbsub
198223
199224 @subsection Options
libavcodec/Makefile+1−0
@@ -957,6 +957,7 @@ OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER) += audiotoolboxenc.o · 956 unmodified lines
957957 OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER) += audiotoolboxenc.o
958958 OBJS-$(CONFIG_LIBAOM_AV1_DECODER) += libaomdec.o
959959 OBJS-$(CONFIG_LIBAOM_AV1_ENCODER) += libaomenc.o
960+OBJS-$(CONFIG_LIBARIBB24_DECODER) += libaribb24.o ass.o
960961 OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o
961962 OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o codec2utils.o
962963 OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o codec2utils.o
libavcodec/allcodecs.c+1−0
@@ -677,6 +677,7 @@ extern AVCodec ff_qdmc_at_decoder; · 676 unmodified lines
677677 extern AVCodec ff_qdm2_at_decoder;
678678 extern AVCodec ff_libaom_av1_decoder;
679679 extern AVCodec ff_libaom_av1_encoder;
680+extern AVCodec ff_libaribb24_decoder;
680681 extern AVCodec ff_libcelt_decoder;
681682 extern AVCodec ff_libcodec2_encoder;
682683 extern AVCodec ff_libcodec2_decoder;
libavcodec/avcodec.h+4−0
@@ -677,6 +677,7 @@ enum AVCodecID { · 676 unmodified lines
677677 AV_CODEC_ID_ASS,
678678 AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
679679 AV_CODEC_ID_TTML,
680+ AV_CODEC_ID_ARIB_CAPTION,
680681
681682 /* other specific kind of codecs (generally used for attachments) */
682683 AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
@@ -2993,6 +2994,9 @@ typedef struct AVCodecContext { · 2310 unmodified lines
29932994 #define FF_PROFILE_PRORES_4444 4
29942995 #define FF_PROFILE_PRORES_XQ 5
29952996
2997+#define FF_PROFILE_ARIB_PROFILE_A 0
2998+#define FF_PROFILE_ARIB_PROFILE_C 1
2999+
29963000 /**
29973001 * level
29983002 * - encoding: Set by user.
libavcodec/codec_desc.c+8−1
@@ -3133,7 +3133,14 @@ static const AVCodecDescriptor codec_descriptors[] = { · 3132 unmodified lines
31333133 .long_name = NULL_IF_CONFIG_SMALL("Timed Text Markup Language"),
31343134 .props = AV_CODEC_PROP_TEXT_SUB,
31353135 },
3136−
3136+ {
3137+ .id = AV_CODEC_ID_ARIB_CAPTION,
3138+ .type = AVMEDIA_TYPE_SUBTITLE,
3139+ .name = "arib_caption",
3140+ .long_name = NULL_IF_CONFIG_SMALL("ARIB STD-B24 caption"),
3141+ .props = AV_CODEC_PROP_TEXT_SUB,
3142+ .profiles = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles),
3143+ },
31373144
31383145 /* other kind of codecs and pseudo-codecs */
31393146 {
libavcodec/libaribb24.c+384−0
@@ -0,0 +1,384 @@
1+/*
2+ * ARIB STD-B24 caption decoder using the libaribb24 library
3+ * Copyright (c) 2019 Jan Ekström
4+ *
5+ * This file is part of FFmpeg.
6+ *
7+ * FFmpeg is free software; you can redistribute it and/or
8+ * modify it under the terms of the GNU Lesser General Public
9+ * License as published by the Free Software Foundation; either
10+ * version 2.1 of the License, or (at your option) any later version.
11+ *
12+ * FFmpeg is distributed in the hope that it will be useful,
13+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+ * Lesser General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU Lesser General Public
18+ * License along with FFmpeg; if not, write to the Free Software
19+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+ */
21+
22+#include "avcodec.h"
23+#include "libavcodec/ass.h"
24+#include "libavutil/log.h"
25+#include "libavutil/opt.h"
26+
27+#include <aribb24/aribb24.h>
28+#include <aribb24/parser.h>
29+#include <aribb24/decoder.h>
30+
31+typedef struct Libaribb24Context {
32+ AVClass *class;
33+
34+ arib_instance_t *lib_instance;
35+ arib_parser_t *parser;
36+ arib_decoder_t *decoder;
37+
38+ int read_order;
39+
40+ char *aribb24_base_path;
41+ unsigned int aribb24_skip_ruby;
42+} Libaribb24Context;
43+
44+static unsigned int get_profile_font_size(int profile)
45+{
46+ switch (profile) {
47+ case FF_PROFILE_ARIB_PROFILE_A:
48+ return 36;
49+ case FF_PROFILE_ARIB_PROFILE_C:
50+ return 18;
51+ default:
52+ return 0;
53+ }
54+}
55+
56+static void libaribb24_log(void *p, const char *msg)
57+{
58+ av_log((AVCodecContext *)p, AV_LOG_INFO, "%s\n", msg);
59+}
60+
61+static int libaribb24_generate_ass_header(AVCodecContext *avctx)
62+{
63+ unsigned int plane_width = 0;
64+ unsigned int plane_height = 0;
65+ unsigned int font_size = 0;
66+
67+ switch (avctx->profile) {
68+ case FF_PROFILE_ARIB_PROFILE_A:
69+ plane_width = 960;
70+ plane_height = 540;
71+ font_size = get_profile_font_size(avctx->profile);
72+ break;
73+ case FF_PROFILE_ARIB_PROFILE_C:
74+ plane_width = 320;
75+ plane_height = 180;
76+ font_size = get_profile_font_size(avctx->profile);
77+ break;
78+ default:
79+ av_log(avctx, AV_LOG_ERROR, "Unknown or unsupported profile set!\n");
80+ return AVERROR(EINVAL);
81+ }
82+
83+ avctx->subtitle_header = av_asprintf(
84+ "[Script Info]\r\n"
85+ "; Script generated by FFmpeg/Lavc%s\r\n"
86+ "ScriptType: v4.00+\r\n"
87+ "PlayResX: %d\r\n"
88+ "PlayResY: %d\r\n"
89+ "\r\n"
90+ "[V4+ Styles]\r\n"
91+
92+ /* ASSv4 header */
93+ "Format: Name, "
94+ "Fontname, Fontsize, "
95+ "PrimaryColour, SecondaryColour, OutlineColour, BackColour, "
96+ "Bold, Italic, Underline, StrikeOut, "
97+ "ScaleX, ScaleY, "
98+ "Spacing, Angle, "
99+ "BorderStyle, Outline, Shadow, "
100+ "Alignment, MarginL, MarginR, MarginV, "
101+ "Encoding\r\n"
102+
103+ "Style: "
104+ "Default," /* Name */
105+ "%s,%d," /* Font{name,size} */
106+ "&H%x,&H%x,&H%x,&H%x," /* {Primary,Secondary,Outline,Back}Colour */
107+ "%d,%d,%d,0," /* Bold, Italic, Underline, StrikeOut */
108+ "100,100," /* Scale{X,Y} */
109+ "0,0," /* Spacing, Angle */
110+ "%d,1,0," /* BorderStyle, Outline, Shadow */
111+ "%d,10,10,10," /* Alignment, Margin[LRV] */
112+ "0\r\n" /* Encoding */
113+
114+ "\r\n"
115+ "[Events]\r\n"
116+ "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n",
117+ !(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "",
118+ plane_width, plane_height,
119+ ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR,
120+ ASS_DEFAULT_COLOR, ASS_DEFAULT_BACK_COLOR, ASS_DEFAULT_BACK_COLOR,
121+ -ASS_DEFAULT_BOLD, -ASS_DEFAULT_ITALIC, -ASS_DEFAULT_UNDERLINE,
122+ ASS_DEFAULT_BORDERSTYLE, ASS_DEFAULT_ALIGNMENT);
123+
124+ if (!avctx->subtitle_header)
125+ return AVERROR(ENOMEM);
126+
127+ avctx->subtitle_header_size = strlen(avctx->subtitle_header);
128+
129+ return 0;
130+}
131+
132+static int libaribb24_init(AVCodecContext *avctx)
133+{
134+ Libaribb24Context *b24 = avctx->priv_data;
135+ void(* arib_dec_init)(arib_decoder_t* decoder) = NULL;
136+ int ret_code = AVERROR_EXTERNAL;
137+
138+ if (!(b24->lib_instance = arib_instance_new(avctx))) {
139+ av_log(avctx, AV_LOG_ERROR, "Failed to initialize libaribb24!\n");
140+ goto init_fail;
141+ }
142+
143+ if (b24->aribb24_base_path) {
144+ av_log(avctx, AV_LOG_INFO, "Setting the libaribb24 base path to '%s'\n",
145+ b24->aribb24_base_path);
146+ arib_set_base_path(b24->lib_instance, b24->aribb24_base_path);
147+ }
148+
149+ arib_register_messages_callback(b24->lib_instance, libaribb24_log);
150+
151+ if (!(b24->parser = arib_get_parser(b24->lib_instance))) {
152+ av_log(avctx, AV_LOG_ERROR, "Failed to initialize libaribb24 PES parser!\n");
153+ goto init_fail;
154+ }
155+ if (!(b24->decoder = arib_get_decoder(b24->lib_instance))) {
156+ av_log(avctx, AV_LOG_ERROR, "Failed to initialize libaribb24 decoder!\n");
157+ goto init_fail;
158+ }
159+
160+ switch (avctx->profile) {
161+ case FF_PROFILE_ARIB_PROFILE_A:
162+ arib_dec_init = arib_initialize_decoder_a_profile;
163+ break;
164+ case FF_PROFILE_ARIB_PROFILE_C:
165+ arib_dec_init = arib_initialize_decoder_c_profile;
166+ break;
167+ default:
168+ av_log(avctx, AV_LOG_ERROR, "Unknown or unsupported profile set!\n");
169+ ret_code = AVERROR(EINVAL);
170+ goto init_fail;
171+ }
172+
173+ arib_dec_init(b24->decoder);
174+
175+ if (libaribb24_generate_ass_header(avctx) < 0) {
176+ ret_code = AVERROR(ENOMEM);
177+ goto init_fail;
178+ }
179+
180+ return 0;
181+
182+init_fail:
183+ if (b24->decoder)
184+ arib_finalize_decoder(b24->decoder);
185+
186+ if (b24->lib_instance)
187+ arib_instance_destroy(b24->lib_instance);
188+
189+ return ret_code;
190+}
191+
192+static int libaribb24_close(AVCodecContext *avctx)
193+{
194+ Libaribb24Context *b24 = avctx->priv_data;
195+
196+ if (b24->decoder)
197+ arib_finalize_decoder(b24->decoder);
198+
199+ if (b24->lib_instance)
200+ arib_instance_destroy(b24->lib_instance);
201+
202+ return 0;
203+}
204+
205+#define RGB_TO_BGR(c) ((c & 0xff) << 16 | (c & 0xff00) | ((c >> 16) & 0xff))
206+
207+static void libaribb24_handle_regions(AVCodecContext *avctx, AVSubtitle *sub)
208+{
209+ Libaribb24Context *b24 = avctx->priv_data;
210+ const arib_buf_region_t *region = arib_decoder_get_regions(b24->decoder);
211+ unsigned int profile_font_size = get_profile_font_size(avctx->profile);
212+ AVBPrint buf = { 0 };
213+
214+ av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
215+
216+ while (region) {
217+ ptrdiff_t region_length = region->p_end - region->p_start;
218+ unsigned int ruby_region =
219+ region->i_fontheight == (profile_font_size / 2);
220+
221+ // ASS requires us to make the colors BGR, so we convert here
222+ int foreground_bgr_color = RGB_TO_BGR(region->i_foreground_color);
223+ int background_bgr_color = RGB_TO_BGR(region->i_background_color);
224+
225+ if (region_length < 0) {
226+ av_log(avctx, AV_LOG_ERROR, "Invalid negative region length!\n");
227+ break;
228+ }
229+
230+ if (region_length == 0 || (ruby_region && b24->aribb24_skip_ruby)) {
231+ goto next_region;
232+ }
233+
234+ // color and alpha
235+ if (foreground_bgr_color != ASS_DEFAULT_COLOR)
236+ av_bprintf(&buf, "{\\1c&H%06x&}", foreground_bgr_color);
237+
238+ if (region->i_foreground_alpha != 0)
239+ av_bprintf(&buf, "{\\1a&H%02x&}", region->i_foreground_alpha);
240+
241+ if (background_bgr_color != ASS_DEFAULT_BACK_COLOR)
242+ av_bprintf(&buf, "{\\3c&H%06x&}", background_bgr_color);
243+
244+ if (region->i_background_alpha != 0)
245+ av_bprintf(&buf, "{\\3a&H%02x&}", region->i_background_alpha);
246+
247+ // font size
248+ if (region->i_fontwidth != profile_font_size ||
249+ region->i_fontheight != profile_font_size) {
250+ av_bprintf(&buf, "{\\fscx%d\\fscy%d}",
251+ (int)round(((double)region->i_fontwidth /
252+ (double)profile_font_size) * 100),
253+ (int)round(((double)region->i_fontheight /
254+ (double)profile_font_size) * 100));
255+ }
256+
257+ // TODO: positioning
258+
259+ av_bprint_append_data(&buf, region->p_start, region_length);
260+
261+ av_bprintf(&buf, "{\\r}");
262+
263+next_region:
264+ region = region->p_next;
265+ }
266+
267+ av_log(avctx, AV_LOG_DEBUG, "Styled ASS line: %s\n",
268+ buf.str);
269+ ff_ass_add_rect(sub, buf.str, b24->read_order++,
270+ 0, NULL, NULL);
271+
272+ av_bprint_finalize(&buf, NULL);
273+}
274+
275+static int libaribb24_decode(AVCodecContext *avctx, void *data, int *got_sub_ptr, AVPacket *pkt)
276+{
277+ Libaribb24Context *b24 = avctx->priv_data;
278+ AVSubtitle *sub = data;
279+ size_t parsed_data_size = 0;
280+ size_t decoded_subtitle_size = 0;
281+ const unsigned char *parsed_data = NULL;
282+ char *decoded_subtitle = NULL;
283+ time_t subtitle_duration = 0;
284+
285+ if (pkt->size <= 0)
286+ return pkt->size;
287+
288+ arib_parse_pes(b24->parser, pkt->data, pkt->size);
289+
290+ parsed_data = arib_parser_get_data(b24->parser,
291+ &parsed_data_size);
292+ if (!parsed_data || !parsed_data_size) {
293+ av_log(avctx, AV_LOG_DEBUG, "No decode'able data was received from "
294+ "packet (dts: %"PRId64", pts: %"PRId64").\n",
295+ pkt->dts, pkt->pts);
296+ return pkt->size;
297+ }
298+
299+ decoded_subtitle_size = parsed_data_size * 4;
300+ if (!(decoded_subtitle = av_mallocz(decoded_subtitle_size + 1))) {
301+ av_log(avctx, AV_LOG_ERROR,
302+ "Failed to allocate buffer for decoded subtitle!\n");
303+ return AVERROR(ENOMEM);
304+ }
305+
306+ decoded_subtitle_size = arib_decode_buffer(b24->decoder,
307+ parsed_data,
308+ parsed_data_size,
309+ decoded_subtitle,
310+ decoded_subtitle_size);
311+
312+ subtitle_duration = arib_decoder_get_time(b24->decoder);
313+
314+ if (avctx->pkt_timebase.num && pkt->pts != AV_NOPTS_VALUE)
315+ sub->pts = av_rescale_q(pkt->pts,
316+ avctx->pkt_timebase, AV_TIME_BASE_Q);
317+
318+ sub->end_display_time = subtitle_duration ?
319+ av_rescale_q(subtitle_duration,
320+ AV_TIME_BASE_Q,
321+ (AVRational){1, 1000}) :
322+ UINT32_MAX;
323+
324+ av_log(avctx, AV_LOG_DEBUG,
325+ "Result: '%s' (size: %zu, pkt_pts: %"PRId64", sub_pts: %"PRId64" "
326+ "duration: %"PRIu32", pkt_timebase: %d/%d, time_base: %d/%d')\n",
327+ decoded_subtitle ? decoded_subtitle : "<no subtitle>",
328+ decoded_subtitle_size,
329+ pkt->pts, sub->pts,
330+ sub->end_display_time,
331+ avctx->pkt_timebase.num, avctx->pkt_timebase.den,
332+ avctx->time_base.num, avctx->time_base.den);
333+
334+ if (decoded_subtitle)
335+ libaribb24_handle_regions(avctx, sub);
336+
337+ *got_sub_ptr = sub->num_rects > 0;
338+
339+ av_free(decoded_subtitle);
340+
341+ // flush the region buffers, otherwise the linked list keeps getting
342+ // longer and longer...
343+ arib_finalize_decoder(b24->decoder);
344+
345+ return pkt->size;
346+}
347+
348+static void libaribb24_flush(AVCodecContext *avctx)
349+{
350+ Libaribb24Context *b24 = avctx->priv_data;
351+ if (!(avctx->flags2 & AV_CODEC_FLAG2_RO_FLUSH_NOOP))
352+ b24->read_order = 0;
353+}
354+
355+#define OFFSET(x) offsetof(Libaribb24Context, x)
356+#define SD AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM
357+static const AVOption options[] = {
358+ { "aribb24-base-path", "set the base path for the libaribb24 library",
359+ OFFSET(aribb24_base_path), AV_OPT_TYPE_STRING, { 0 }, 0, 0, SD },
360+ { "aribb24-skip-ruby-text", "skip ruby text blocks during decoding",
361+ OFFSET(aribb24_skip_ruby), AV_OPT_TYPE_BOOL, { 1 }, 0, 1, SD },
362+ { NULL }
363+};
364+
365+static const AVClass aribb24_class = {
366+ .class_name = "libaribb24 decoder",
367+ .item_name = av_default_item_name,
368+ .option = options,
369+ .version = LIBAVUTIL_VERSION_INT,
370+};
371+
372+AVCodec ff_libaribb24_decoder = {
373+ .name = "libaribb24",
374+ .long_name = NULL_IF_CONFIG_SMALL("libaribb24 ARIB STD-B24 caption decoder"),
375+ .type = AVMEDIA_TYPE_SUBTITLE,
376+ .id = AV_CODEC_ID_ARIB_CAPTION,
377+ .priv_data_size = sizeof(Libaribb24Context),
378+ .init = libaribb24_init,
379+ .close = libaribb24_close,
380+ .decode = libaribb24_decode,
381+ .flush = libaribb24_flush,
382+ .priv_class= &aribb24_class,
383+ .wrapper_name = "libaribb24",
384+};
libavcodec/profiles.c+6−0
@@ -170,4 +170,10 @@ const AVProfile ff_mjpeg_profiles[] = { · 169 unmodified lines
170170 { FF_PROFILE_UNKNOWN }
171171 };
172172
173+const AVProfile ff_arib_caption_profiles[] = {
174+ { FF_PROFILE_ARIB_PROFILE_A, "Profile A" },
175+ { FF_PROFILE_ARIB_PROFILE_C, "Profile C" },
176+ { FF_PROFILE_UNKNOWN }
177+};
178+
173179 #endif /* !CONFIG_SMALL */
libavcodec/profiles.h+1−0
@@ -35,5 +35,6 @@ extern const AVProfile ff_av1_profiles[]; · 34 unmodified lines
3535 extern const AVProfile ff_sbc_profiles[];
3636 extern const AVProfile ff_prores_profiles[];
3737 extern const AVProfile ff_mjpeg_profiles[];
38+extern const AVProfile ff_arib_caption_profiles[];
3839
3940 #endif /* AVCODEC_PROFILES_H */
libavcodec/version.h+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/version.h"
2929
3030 #define LIBAVCODEC_VERSION_MAJOR 58
31−#define LIBAVCODEC_VERSION_MINOR 46
31+#define LIBAVCODEC_VERSION_MINOR 47
3232 #define LIBAVCODEC_VERSION_MICRO 100
3333
3434 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t