#define STYL_BOX (1<<0)
#define HLIT_BOX (1<<1)
#define HCLR_BOX (1<<2)
+#define TWRP_BOX (1<<3)
+
+#define BOTTOM_LEFT 1
+#define BOTTOM_CENTER 2
+#define BOTTOM_RIGHT 3
+#define MIDDLE_LEFT 4
+#define MIDDLE_CENTER 5
+#define MIDDLE_RIGHT 6
+#define TOP_LEFT 7
+#define TOP_CENTER 8
+#define TOP_RIGHT 9
+
+typedef struct {
+ char *font;
+ int fontsize;
+ int color;
+ int back_color;
+ int bold;
+ int italic;
+ int underline;
+ int alignment;
+} MovTextDefault;
typedef struct {
uint16_t fontID;
uint8_t hlit_color[4];
} HilightcolorBox;
+typedef struct {
+ uint8_t wrap_flag;
+} TextWrapBox;
+
typedef struct {
StyleBox **s;
StyleBox *s_temp;
HilightcolorBox c;
FontRecord **ftab;
FontRecord *ftab_temp;
+ TextWrapBox w;
+ MovTextDefault d;
uint8_t box_flags;
uint16_t style_entries, ftab_entries;
uint64_t tracksize;
static void mov_text_cleanup_ftab(MovTextContext *m)
{
int i;
+ if (m->ftab_temp)
+ av_freep(&m->ftab_temp->font);
+ av_freep(&m->ftab_temp);
if (m->ftab) {
for(i = 0; i < m->count_f; i++) {
av_freep(&m->ftab[i]->font);
static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m)
{
- char *tx3g_ptr = avctx->extradata;
+ uint8_t *tx3g_ptr = avctx->extradata;
int i, box_size, font_length;
+ int8_t v_align, h_align;
+ int style_fontID;
+ StyleBox s_default;
m->count_f = 0;
m->ftab_entries = 0;
// Display Flags
tx3g_ptr += 4;
// Alignment
- tx3g_ptr += 2;
+ h_align = *tx3g_ptr++;
+ v_align = *tx3g_ptr++;
+ if (h_align == 0) {
+ if (v_align == 0)
+ m->d.alignment = TOP_LEFT;
+ if (v_align == 1)
+ m->d.alignment = MIDDLE_LEFT;
+ if (v_align == -1)
+ m->d.alignment = BOTTOM_LEFT;
+ }
+ if (h_align == 1) {
+ if (v_align == 0)
+ m->d.alignment = TOP_CENTER;
+ if (v_align == 1)
+ m->d.alignment = MIDDLE_CENTER;
+ if (v_align == -1)
+ m->d.alignment = BOTTOM_CENTER;
+ }
+ if (h_align == -1) {
+ if (v_align == 0)
+ m->d.alignment = TOP_RIGHT;
+ if (v_align == 1)
+ m->d.alignment = MIDDLE_RIGHT;
+ if (v_align == -1)
+ m->d.alignment = BOTTOM_RIGHT;
+ }
// Background Color
+ m->d.back_color = AV_RB24(tx3g_ptr);
tx3g_ptr += 4;
// BoxRecord
tx3g_ptr += 8;
// StyleRecord
- tx3g_ptr += 12;
+ tx3g_ptr += 4;
+ // fontID
+ style_fontID = AV_RB16(tx3g_ptr);
+ tx3g_ptr += 2;
+ // face-style-flags
+ s_default.style_flag = *tx3g_ptr++;
+ m->d.bold = s_default.style_flag & STYLE_FLAG_BOLD;
+ m->d.italic = s_default.style_flag & STYLE_FLAG_ITALIC;
+ m->d.underline = s_default.style_flag & STYLE_FLAG_UNDERLINE;
+ // fontsize
+ m->d.fontsize = *tx3g_ptr++;
+ // Primary color
+ m->d.color = AV_RB24(tx3g_ptr);
+ tx3g_ptr += 4;
// FontRecord
// FontRecord Size
tx3g_ptr += 4;
m->ftab_entries = 0;
return -1;
}
- m->ftab_temp = av_malloc(sizeof(*m->ftab_temp));
+ m->ftab_temp = av_mallocz(sizeof(*m->ftab_temp));
if (!m->ftab_temp) {
mov_text_cleanup_ftab(m);
return AVERROR(ENOMEM);
mov_text_cleanup_ftab(m);
return AVERROR(ENOMEM);
}
+ m->ftab_temp = NULL;
tx3g_ptr = tx3g_ptr + font_length;
}
+ for (i = 0; i < m->ftab_entries; i++) {
+ if (style_fontID == m->ftab[i]->fontID)
+ m->d.font = m->ftab[i]->font;
+ }
+ return 0;
+}
+
+static int decode_twrp(const uint8_t *tsmb, MovTextContext *m, AVPacket *avpkt)
+{
+ m->box_flags |= TWRP_BOX;
+ m->w.wrap_flag = *tsmb++;
return 0;
}
static const Box box_types[] = {
{ MKBETAG('s','t','y','l'), 2, decode_styl },
{ MKBETAG('h','l','i','t'), 4, decode_hlit },
- { MKBETAG('h','c','l','r'), 4, decode_hclr }
+ { MKBETAG('h','c','l','r'), 4, decode_hclr },
+ { MKBETAG('t','w','r','p'), 1, decode_twrp }
};
const static size_t box_count = FF_ARRAY_ELEMS(box_types);
int i = 0;
int j = 0;
int text_pos = 0;
+
+ if (text < text_end && m->box_flags & TWRP_BOX) {
+ if (m->w.wrap_flag == 1) {
+ av_bprintf(buf, "{\\q1}"); /* End of line wrap */
+ } else {
+ av_bprintf(buf, "{\\q2}"); /* No wrap */
+ }
+ }
+
while (text < text_end) {
if (m->box_flags & STYL_BOX) {
for (i = 0; i < m->style_entries; i++) {
* it's very common to find files where the default style is broken
* and respecting it results in a worse experience than ignoring it.
*/
+ int ret;
MovTextContext *m = avctx->priv_data;
- mov_text_tx3g(avctx, m);
- return ff_ass_subtitle_header_default(avctx);
+ ret = mov_text_tx3g(avctx, m);
+ if (ret == 0) {
+ return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize, m->d.color,
+ m->d.back_color, m->d.bold, m->d.italic,
+ m->d.underline, m->d.alignment);
+ } else
+ return ff_ass_subtitle_header_default(avctx);
}
static int mov_text_decode_frame(AVCodecContext *avctx,