har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cus/stable'

Browse Source 
* cus/stable:
  libzvbi-teletextdec: propagate errors generated in page handler
  libzvbi-teletextdec: dont ignore memory allocation error silently
  libzvbi-teletextdec: output ass subtitles instead of plain text
  ass: move text_event_to_ass from textdec.c to ass.c and export it
  ass: fix error handling in ff_ass_add_subrect
  ass: factor out ff_ass_bprint_dialog
  libzvbi-teletextdec: use AVBPrint for whitespace cleanup
  libzvbi-teletextdec: use option constants instead of strings
  libzvbi-teletextdec: fix indentation after last commit
  libzvbi-teletextdec: support multiple teletext pages in a single packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-11 22:29:45 +01:00
commit 355cea8ddc
4 changed files with 284 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
libavcodec/ass.c
View File

@ -77,14 +77,11 @@ static void insert_ts(AVBPrint *buf, int ts)
} }
} }
int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, int ff_ass_bprint_dialog(AVBPrint *buf, const char *dialog,
int ts_start, int duration, int raw) int ts_start, int duration, int raw)
{ {
AVBPrint buf; int dlen;
int ret, dlen;
AVSubtitleRect **rects;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
if (!raw || raw == 2) { if (!raw || raw == 2) {
long int layer = 0; long int layer = 0;
@ -101,32 +98,92 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
dialog++; dialog++;
} }
av_bprintf(&buf, "Dialogue: %ld,", layer); av_bprintf(buf, "Dialogue: %ld,", layer);
insert_ts(&buf, ts_start); insert_ts(buf, ts_start);
insert_ts(&buf, duration == -1 ? -1 : ts_start + duration); insert_ts(buf, duration == -1 ? -1 : ts_start + duration);
if (raw != 2) if (raw != 2)
av_bprintf(&buf, "Default,"); av_bprintf(buf, "Default,");
} }
dlen = strcspn(dialog, "\n"); dlen = strcspn(dialog, "\n");
dlen += dialog[dlen] == '\n'; dlen += dialog[dlen] == '\n';
av_bprintf(&buf, "%.*s", dlen, dialog); av_bprintf(buf, "%.*s", dlen, dialog);
if (raw == 2) if (raw == 2)
av_bprintf(&buf, "\r\n"); av_bprintf(buf, "\r\n");
return dlen;
}
int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
int ts_start, int duration, int raw)
{
AVBPrint buf;
int ret, dlen;
AVSubtitleRect **rects;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
if ((ret = ff_ass_bprint_dialog(&buf, dialog, ts_start, duration, raw)) < 0)
goto err;
dlen = ret;
if (!av_bprint_is_complete(&buf)) if (!av_bprint_is_complete(&buf))
return AVERROR(ENOMEM); goto errnomem;
rects = av_realloc(sub->rects, (sub->num_rects+1) * sizeof(*sub->rects)); rects = av_realloc(sub->rects, (sub->num_rects+1) * sizeof(*sub->rects));
if (!rects) if (!rects)
return AVERROR(ENOMEM); goto errnomem;
sub->rects = rects; sub->rects = rects;
sub->end_display_time = FFMAX(sub->end_display_time, 10 * duration); sub->end_display_time = FFMAX(sub->end_display_time, 10 * duration);
rects[sub->num_rects] = av_mallocz(sizeof(*rects[0])); rects[sub->num_rects] = av_mallocz(sizeof(*rects[0]));
rects[sub->num_rects]->type = SUBTITLE_ASS; rects[sub->num_rects]->type = SUBTITLE_ASS;
ret = av_bprint_finalize(&buf, &rects[sub->num_rects]->ass); ret = av_bprint_finalize(&buf, &rects[sub->num_rects]->ass);
if (ret < 0) if (ret < 0)
return ret; goto err;
sub->num_rects++; sub->num_rects++;
return dlen; return dlen;
errnomem:
ret = AVERROR(ENOMEM);
err:
av_bprint_finalize(&buf, NULL);
return ret;
}
void ff_ass_bprint_text_event(AVBPrint *buf, const char *p, int size,
const char *linebreaks, int keep_ass_markup)
{
const char *p_end = p + size;
for (; p < p_end && *p; p++) {
/* forced custom line breaks, not accounted as "normal" EOL */
if (linebreaks && strchr(linebreaks, *p)) {
av_bprintf(buf, "\\N");
/* standard ASS escaping so random characters don't get mis-interpreted
* as ASS */
} else if (!keep_ass_markup && strchr("{}\\", *p)) {
av_bprintf(buf, "\\%c", *p);
/* some packets might end abruptly (no \0 at the end, like for example
* in some cases of demuxing from a classic video container), some
* might be terminated with \n or \r\n which we have to remove (for
* consistency with those who haven't), and we also have to deal with
* evil cases such as \r at the end of the buffer (and no \0 terminated
* character) */
} else if (p[0] == '\n') {
/* some stuff left so we can insert a line break */
if (p < p_end - 1)
av_bprintf(buf, "\\N");
} else if (p[0] == '\r' && p < p_end - 1 && p[1] == '\n') {
/* \r followed by a \n, we can skip it. We don't insert the \N yet
* because we don't know if it is followed by more text */
continue;
/* finally, a sane character */
} else {
av_bprint_chars(buf, *p, 1);
}
}
av_bprintf(buf, "\r\n");
} }

35
libavcodec/ass.h
View File

@ -23,6 +23,7 @@
#define AVCODEC_ASS_H #define AVCODEC_ASS_H
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/bprint.h"
/** /**
* @name Default values for ASS style * @name Default values for ASS style
@ -90,4 +91,38 @@ int ff_ass_subtitle_header_default(AVCodecContext *avctx);
int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
int ts_start, int duration, int raw); int ts_start, int duration, int raw);
/**
* Add an ASS dialog line to an AVBPrint buffer.
*
* @param buf pointer to an initialized AVBPrint buffer
* @param dialog ASS dialog to add to sub
* @param ts_start start timestamp for this dialog (in 1/100 second unit)
* @param duration duration for this dialog (in 1/100 second unit), can be -1
* to last until the end of the presentation
* @param raw when set to 2, it indicates that dialog contains an ASS
* dialog line as muxed in Matroska
* when set to 1, it indicates that dialog contains a whole SSA
* dialog line which should be copied as is.
* when set to 0, it indicates that dialog contains only the Text
* part of the ASS dialog line, the rest of the line
* will be generated.
* @return number of characters read from dialog. It can be less than the whole
* length of dialog, if dialog contains several lines of text.
* A negative value indicates an error.
*/
int ff_ass_bprint_dialog(AVBPrint *buf, const char *dialog,
int ts_start, int duration, int raw);
/**
* Escape a text subtitle using ASS syntax into an AVBPrint buffer.
* Newline characters will be escaped to \N.
*
* @param buf pointer to an initialized AVBPrint buffer
* @param p source text
* @param size size of the source text
* @param linebreaks additional newline chars, which will be escaped to \N
* @param keep_ass_markup braces and backslash will not be escaped if set
*/
void ff_ass_bprint_text_event(AVBPrint *buf, const char *p, int size,
const char *linebreaks, int keep_ass_markup);
#endif /* AVCODEC_ASS_H */ #endif /* AVCODEC_ASS_H */

255
libavcodec/libzvbi-teletextdec.c
View File

@ -19,7 +19,9 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "libavcodec/ass.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/bprint.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include <libzvbi.h> #include <libzvbi.h>
@ -31,6 +33,15 @@
#define VBI_G(rgba) (((rgba) >> 8) & 0xFF) #define VBI_G(rgba) (((rgba) >> 8) & 0xFF)
#define VBI_B(rgba) (((rgba) >> 16) & 0xFF) #define VBI_B(rgba) (((rgba) >> 16) & 0xFF)
#define VBI_A(rgba) (((rgba) >> 24) & 0xFF) #define VBI_A(rgba) (((rgba) >> 24) & 0xFF)
#define MAX_BUFFERED_PAGES 25
typedef struct TeletextPage
{
AVSubtitleRect *sub_rect;
int pgno;
int subno;
int64_t pts;
} TeletextPage;
/* main data structure */ /* main data structure */
typedef struct TeletextContext typedef struct TeletextContext
@ -39,15 +50,17 @@ typedef struct TeletextContext
char *pgno; char *pgno;
int x_offset; int x_offset;
int y_offset; int y_offset;
char *format; int format_id; /* 0 = bitmap, 1 = text/ass */
int format_id; /* 0 = bitmap, 1 = text */
int chop_top; int chop_top;
int sub_duration; /* in msec */ int sub_duration; /* in msec */
int transparent_bg; int transparent_bg;
int chop_spaces; int chop_spaces;
int lines_processed; int lines_processed;
AVSubtitleRect *sub_rect; TeletextPage *pages;
int nb_pages;
int64_t pts;
int handler_ret;
vbi_decoder * vbi; vbi_decoder * vbi;
vbi_dvb_demux * dx; vbi_dvb_demux * dx;
@ -72,14 +85,54 @@ chop_spaces_utf8(const unsigned char* t, int len)
return len; return len;
} }
static void
subtitle_rect_free(AVSubtitleRect **sub_rect)
{
av_freep(&(*sub_rect)->pict.data[0]);
av_freep(&(*sub_rect)->pict.data[1]);
av_freep(&(*sub_rect)->ass);
av_freep(sub_rect);
}
static int
create_ass_text(TeletextContext *ctx, const char *text, char **ass)
{
int ret;
AVBPrint buf, buf2;
const int ts_start = av_rescale_q(ctx->pts, AV_TIME_BASE_Q, (AVRational){1, 100});
const int ts_duration = av_rescale_q(ctx->sub_duration, (AVRational){1, 1000}, (AVRational){1, 100});
/* First we escape the plain text into buf. */
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
ff_ass_bprint_text_event(&buf, text, strlen(text), "", 0);
if (!av_bprint_is_complete(&buf)) {
av_bprint_finalize(&buf, NULL);
return AVERROR(ENOMEM);
}
/* Then we create the ass dialog line in buf2 from the escaped text in buf. */
av_bprint_init(&buf2, 0, AV_BPRINT_SIZE_UNLIMITED);
ff_ass_bprint_dialog(&buf2, buf.str, ts_start, ts_duration, 0);
av_bprint_finalize(&buf, NULL);
if (!av_bprint_is_complete(&buf2)) {
av_bprint_finalize(&buf2, NULL);
return AVERROR(ENOMEM);
}
if ((ret = av_bprint_finalize(&buf2, ass)) < 0)
return ret;
return 0;
}
// draw a page as text // draw a page as text
static int static int
gen_sub_text(TeletextContext *ctx, vbi_page *page, int chop_top) gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top)
{ {
AVSubtitleRect *sub_rect = ctx->sub_rect;
char *text;
const char *in; const char *in;
char *out; AVBPrint buf;
char *vbi_text = av_malloc(TEXT_MAXSZ); char *vbi_text = av_malloc(TEXT_MAXSZ);
int sz; int sz;
@ -97,11 +150,8 @@ gen_sub_text(TeletextContext *ctx, vbi_page *page, int chop_top)
} }
vbi_text[sz] = '\0'; vbi_text[sz] = '\0';
in = vbi_text; in = vbi_text;
out = text = av_malloc(TEXT_MAXSZ); av_bprint_init(&buf, 0, TEXT_MAXSZ);
if (!text) {
av_free(vbi_text);
return AVERROR(ENOMEM);
}
if (ctx->chop_spaces) { if (ctx->chop_spaces) {
for (;;) { for (;;) {
int nl, sz; int nl, sz;
@ -116,33 +166,38 @@ gen_sub_text(TeletextContext *ctx, vbi_page *page, int chop_top)
break; break;
// skip trailing spaces // skip trailing spaces
sz = chop_spaces_utf8(in, nl); sz = chop_spaces_utf8(in, nl);
memcpy(out, in, sz); av_bprint_append_data(&buf, in, sz);
out += sz; av_bprintf(&buf, "\n");
*out++ = '\n';
in += nl; in += nl;
} }
} else { } else {
strcpy(text, vbi_text); av_bprintf(&buf, "%s\n", vbi_text);
out += sz;
*out++ = '\n';
} }
av_free(vbi_text); av_free(vbi_text);
*out = '\0';
if (out > text) { if (!av_bprint_is_complete(&buf)) {
sub_rect->type = SUBTITLE_TEXT; av_bprint_finalize(&buf, NULL);
sub_rect->text = text; return AVERROR(ENOMEM);
av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", text); }
if (buf.len) {
int ret;
sub_rect->type = SUBTITLE_ASS;
if ((ret = create_ass_text(ctx, buf.str, &sub_rect->ass)) < 0) {
av_bprint_finalize(&buf, NULL);
return ret;
}
av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", sub_rect->ass);
} else { } else {
sub_rect->type = SUBTITLE_NONE; sub_rect->type = SUBTITLE_NONE;
av_free(text);
} }
av_bprint_finalize(&buf, NULL);
return 0; return 0;
} }
static void static void
fix_transparency(TeletextContext *ctx, vbi_page *page, int chop_top, uint8_t transparent_color, int resx, int resy) fix_transparency(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top, uint8_t transparent_color, int resx, int resy)
{ {
AVSubtitleRect *sub_rect = ctx->sub_rect;
int iy; int iy;
// Hack for transparency, inspired by VLC code... // Hack for transparency, inspired by VLC code...
@ -173,9 +228,8 @@ fix_transparency(TeletextContext *ctx, vbi_page *page, int chop_top, uint8_t tra
// draw a page as bitmap // draw a page as bitmap
static int static int
gen_sub_bitmap(TeletextContext *ctx, vbi_page *page, int chop_top) gen_sub_bitmap(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top)
{ {
AVSubtitleRect *sub_rect = ctx->sub_rect;
int resx = page->columns * 12; int resx = page->columns * 12;
int resy = (page->rows - chop_top) * 10; int resy = (page->rows - chop_top) * 10;
uint8_t ci, cmax = 0; uint8_t ci, cmax = 0;
@ -206,7 +260,7 @@ gen_sub_bitmap(TeletextContext *ctx, vbi_page *page, int chop_top)
0, chop_top, page->columns, page->rows - chop_top, 0, chop_top, page->columns, page->rows - chop_top,
/*reveal*/ 1, /*flash*/ 1); /*reveal*/ 1, /*flash*/ 1);
fix_transparency(ctx, page, chop_top, cmax, resx, resy); fix_transparency(ctx, sub_rect, page, chop_top, cmax, resx, resy);
sub_rect->x = ctx->x_offset; sub_rect->x = ctx->x_offset;
sub_rect->y = ctx->y_offset; sub_rect->y = ctx->y_offset;
sub_rect->w = resx; sub_rect->w = resx;
@ -239,6 +293,7 @@ static void
handler(vbi_event *ev, void *user_data) handler(vbi_event *ev, void *user_data)
{ {
TeletextContext *ctx = user_data; TeletextContext *ctx = user_data;
TeletextPage *new_pages;
vbi_page page; vbi_page page;
int res; int res;
char pgno_str[12]; char pgno_str[12];
@ -253,6 +308,8 @@ handler(vbi_event *ev, void *user_data)
if (strcmp(ctx->pgno, "*") && !strstr(ctx->pgno, pgno_str)) if (strcmp(ctx->pgno, "*") && !strstr(ctx->pgno, pgno_str))
return; return;
if (ctx->handler_ret < 0)
return;
/* Fetch the page. */ /* Fetch the page. */
res = vbi_fetch_vt_page(ctx->vbi, &page, res = vbi_fetch_vt_page(ctx->vbi, &page,
@ -279,18 +336,34 @@ handler(vbi_event *ev, void *user_data)
av_log(ctx, AV_LOG_DEBUG, "%d x %d page chop:%d\n", av_log(ctx, AV_LOG_DEBUG, "%d x %d page chop:%d\n",
page.columns, page.rows, chop_top); page.columns, page.rows, chop_top);
if (!ctx->sub_rect) { if (ctx->nb_pages < MAX_BUFFERED_PAGES) {
ctx->sub_rect = av_mallocz(sizeof(*ctx->sub_rect)); if ((new_pages = av_realloc_array(ctx->pages, ctx->nb_pages + 1, sizeof(TeletextPage)))) {
if (ctx->sub_rect) { TeletextPage *cur_page = new_pages + ctx->nb_pages;
res = (ctx->format_id == 0) ? ctx->pages = new_pages;
gen_sub_bitmap(ctx, &page, chop_top) : cur_page->sub_rect = av_mallocz(sizeof(*cur_page->sub_rect));
gen_sub_text (ctx, &page, chop_top); cur_page->pts = ctx->pts;
if (res) cur_page->pgno = ev->ev.ttx_page.pgno;
av_freep(&ctx->sub_rect); cur_page->subno = ev->ev.ttx_page.subno;
if (cur_page->sub_rect) {
res = (ctx->format_id == 0) ?
gen_sub_bitmap(ctx, cur_page->sub_rect, &page, chop_top) :
gen_sub_text (ctx, cur_page->sub_rect, &page, chop_top);
if (res < 0) {
av_freep(&cur_page->sub_rect);
ctx->handler_ret = res;
} else {
ctx->pages[ctx->nb_pages++] = *cur_page;
}
} else {
ctx->handler_ret = AVERROR(ENOMEM);
}
} else {
ctx->handler_ret = AVERROR(ENOMEM);
} }
} else { } else {
// FIXME: Multiple teletext pages in a single packet, some kind of buffering should be done instead of dropping the page... //TODO: If multiple packets contain more than one page, pages may got queued up, and this may happen...
av_log(ctx, AV_LOG_WARNING, "Missed page %s.%02x.\n", pgno_str, ev->ev.ttx_page.subno & 0xFF); av_log(ctx, AV_LOG_ERROR, "Buffered too many pages, dropping page %s.\n", pgno_str);
ctx->handler_ret = AVERROR(ENOSYS);
} }
vbi_unref_page(&page); vbi_unref_page(&page);
@ -304,10 +377,11 @@ teletext_decode_frame(AVCodecContext *avctx,
TeletextContext *ctx = avctx->priv_data; TeletextContext *ctx = avctx->priv_data;
AVSubtitle *sub = data; AVSubtitle *sub = data;
const uint8_t *buf = pkt->data; const uint8_t *buf = pkt->data;
unsigned int left = pkt->size; int left = pkt->size;
uint8_t pesheader[45] = {0x00, 0x00, 0x01, 0xbd, 0x00, 0x00, 0x85, 0x80, 0x24, 0x21, 0x00, 0x01, 0x00, 0x01}; uint8_t pesheader[45] = {0x00, 0x00, 0x01, 0xbd, 0x00, 0x00, 0x85, 0x80, 0x24, 0x21, 0x00, 0x01, 0x00, 0x01};
int pesheader_size = sizeof(pesheader); int pesheader_size = sizeof(pesheader);
const uint8_t *pesheader_buf = pesheader; const uint8_t *pesheader_buf = pesheader;
int ret = 0;
if (!ctx->vbi) { if (!ctx->vbi) {
if (!(ctx->vbi = vbi_decoder_new())) if (!(ctx->vbi = vbi_decoder_new()))
@ -321,64 +395,84 @@ teletext_decode_frame(AVCodecContext *avctx,
if (!ctx->dx && (!(ctx->dx = vbi_dvb_pes_demux_new (/* callback */ NULL, NULL)))) if (!ctx->dx && (!(ctx->dx = vbi_dvb_pes_demux_new (/* callback */ NULL, NULL))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
// We allow unreasonably big packets, even if the standard only allows a max size of 1472 if (avctx->pkt_timebase.den && pkt->pts != AV_NOPTS_VALUE)
if ((pesheader_size + left) < 184 || (pesheader_size + left) > 65504 || (pesheader_size + left) % 184 != 0) ctx->pts = av_rescale_q(pkt->pts, avctx->pkt_timebase, AV_TIME_BASE_Q);
return AVERROR_INVALIDDATA;
memset(pesheader + 14, 0xff, pesheader_size - 14); if (left) {
AV_WB16(pesheader + 4, left + pesheader_size - 6); // We allow unreasonably big packets, even if the standard only allows a max size of 1472
if ((pesheader_size + left) < 184 || (pesheader_size + left) > 65504 || (pesheader_size + left) % 184 != 0)
return AVERROR_INVALIDDATA;
/* PTS is deliberately left as 0 in the PES header, otherwise libzvbi uses memset(pesheader + 14, 0xff, pesheader_size - 14);
* it to detect dropped frames. Unforunatey the guessed packet PTS values AV_WB16(pesheader + 4, left + pesheader_size - 6);
* (see mpegts demuxer) are not accurate enough to pass that test. */
vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, NULL, &pesheader_buf, &pesheader_size);
while (left > 0) { /* PTS is deliberately left as 0 in the PES header, otherwise libzvbi uses
int64_t pts = 0; * it to detect dropped frames. Unforunatey the guessed packet PTS values
unsigned int lines = vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, &pts, &buf, &left); * (see mpegts demuxer) are not accurate enough to pass that test. */
vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, NULL, &pesheader_buf, &pesheader_size);
ctx->handler_ret = pkt->size;
while (left > 0) {
int64_t pts = 0;
unsigned int lines = vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, &pts, &buf, &left);
#ifdef DEBUG #ifdef DEBUG
av_log(avctx, AV_LOG_DEBUG, av_log(avctx, AV_LOG_DEBUG,
"ctx=%p buf_size=%d left=%u lines=%u pts=%f pkt_pts=%f\n", "ctx=%p buf_size=%d left=%u lines=%u pts=%f pkt_pts=%f\n",
ctx, pkt->size, left, lines, (double)pts/90000.0, (double)pkt->pts/90000.0); ctx, pkt->size, left, lines, (double)pts/90000.0, (double)pkt->pts/90000.0);
#endif #endif
if (lines > 0) { if (lines > 0) {
#ifdef DEBUGx #ifdef DEBUGx
int i; int i;
for(i=0; i<lines; ++i) for(i=0; i<lines; ++i)
av_log(avctx, AV_LOG_DEBUG, av_log(avctx, AV_LOG_DEBUG,
"lines=%d id=%x\n", i, ctx->sliced[i].id); "lines=%d id=%x\n", i, ctx->sliced[i].id);
#endif #endif
vbi_decode(ctx->vbi, ctx->sliced, lines, (double)pts/90000.0); vbi_decode(ctx->vbi, ctx->sliced, lines, (double)pts/90000.0);
ctx->lines_processed += lines; ctx->lines_processed += lines;
}
} }
ctx->pts = AV_NOPTS_VALUE;
ret = ctx->handler_ret;
} }
if (ret < 0)
return ret;
// is there a subtitle to pass? // is there a subtitle to pass?
if (ctx->sub_rect) { if (ctx->nb_pages) {
sub->format = (ctx->sub_rect->type == SUBTITLE_TEXT ? 1: 0); int i;
sub->format = ctx->format_id;
sub->start_display_time = 0; sub->start_display_time = 0;
sub->end_display_time = ctx->sub_duration; sub->end_display_time = ctx->sub_duration;
sub->num_rects = 0; sub->num_rects = 0;
sub->pts = ctx->pages->pts;
if (ctx->sub_rect->type != SUBTITLE_NONE) { if (ctx->pages->sub_rect->type != SUBTITLE_NONE) {
sub->rects = av_malloc(sizeof(*sub->rects) * 1); sub->rects = av_malloc(sizeof(*sub->rects) * 1);
if (sub->rects) { if (sub->rects) {
sub->num_rects = 1; sub->num_rects = 1;
sub->rects[0] = ctx->sub_rect; sub->rects[0] = ctx->pages->sub_rect;
} else {
ret = AVERROR(ENOMEM);
} }
} else { } else {
av_log(avctx, AV_LOG_DEBUG, "sending empty sub\n"); av_log(avctx, AV_LOG_DEBUG, "sending empty sub\n");
sub->rects = NULL; sub->rects = NULL;
} }
if (!sub->rects) // no rect was passed if (!sub->rects) // no rect was passed
av_free(ctx->sub_rect); subtitle_rect_free(&ctx->pages->sub_rect);
ctx->sub_rect = NULL;
*data_size = 1; for (i = 0; i < ctx->nb_pages - 1; i++)
ctx->pages[i] = ctx->pages[i + 1];
ctx->nb_pages--;
if (ret >= 0)
*data_size = 1;
} else } else
*data_size = 0; *data_size = 0;
return pkt->size; return ret;
} }
static int teletext_init_decoder(AVCodecContext *avctx) static int teletext_init_decoder(AVCodecContext *avctx)
@ -394,15 +488,7 @@ static int teletext_init_decoder(AVCodecContext *avctx)
ctx->dx = NULL; ctx->dx = NULL;
ctx->vbi = NULL; ctx->vbi = NULL;
ctx->sub_rect = NULL; ctx->pts = AV_NOPTS_VALUE;
if (!strcmp(ctx->format, "bitmap")) {
ctx->format_id = 0;
} else if (!strcmp(ctx->format, "text")) {
ctx->format_id = 1;
} else {
av_log(avctx, AV_LOG_ERROR, "unkown format %s\n", ctx->format);
return AVERROR_OPTION_NOT_FOUND;
}
#ifdef DEBUG #ifdef DEBUG
{ {
@ -411,7 +497,7 @@ static int teletext_init_decoder(AVCodecContext *avctx)
} }
#endif #endif
av_log(avctx, AV_LOG_VERBOSE, "page filter: %s\n", ctx->pgno); av_log(avctx, AV_LOG_VERBOSE, "page filter: %s\n", ctx->pgno);
return 0; return (ctx->format_id == 1) ? ff_ass_subtitle_header_default(avctx) : 0;
} }
static int teletext_close_decoder(AVCodecContext *avctx) static int teletext_close_decoder(AVCodecContext *avctx)
@ -421,11 +507,15 @@ static int teletext_close_decoder(AVCodecContext *avctx)
#ifdef DEBUG #ifdef DEBUG
av_log(avctx, AV_LOG_DEBUG, "lines_total=%u\n", ctx->lines_processed); av_log(avctx, AV_LOG_DEBUG, "lines_total=%u\n", ctx->lines_processed);
#endif #endif
while (ctx->nb_pages)
subtitle_rect_free(&ctx->pages[--ctx->nb_pages].sub_rect);
av_freep(&ctx->pages);
vbi_dvb_demux_delete(ctx->dx); vbi_dvb_demux_delete(ctx->dx);
vbi_decoder_delete(ctx->vbi); vbi_decoder_delete(ctx->vbi);
ctx->dx = NULL; ctx->dx = NULL;
ctx->vbi = NULL; ctx->vbi = NULL;
ctx->pts = AV_NOPTS_VALUE;
return 0; return 0;
} }
@ -439,7 +529,9 @@ static void teletext_flush(AVCodecContext *avctx)
static const AVOption options[] = { static const AVOption options[] = {
{"txt_page", "list of teletext page numbers to decode, * is all", OFFSET(pgno), AV_OPT_TYPE_STRING, {.str = "*"}, 0, 0, SD}, {"txt_page", "list of teletext page numbers to decode, * is all", OFFSET(pgno), AV_OPT_TYPE_STRING, {.str = "*"}, 0, 0, SD},
{"txt_chop_top", "discards the top teletext line", OFFSET(chop_top), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, {"txt_chop_top", "discards the top teletext line", OFFSET(chop_top), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD},
{"txt_format", "format of the subtitles (bitmap or text)", OFFSET(format), AV_OPT_TYPE_STRING, {.str = "bitmap"}, 0, 0, SD}, {"txt_format", "format of the subtitles (bitmap or text)", OFFSET(format_id), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, SD, "txt_format"},
{"bitmap", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, SD, "txt_format"},
{"text", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, SD, "txt_format"},
{"txt_left", "x offset of generated bitmaps", OFFSET(x_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_left", "x offset of generated bitmaps", OFFSET(x_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD},
{"txt_top", "y offset of generated bitmaps", OFFSET(y_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_top", "y offset of generated bitmaps", OFFSET(y_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD},
{"txt_chop_spaces", "chops leading and trailing spaces from text", OFFSET(chop_spaces), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, {"txt_chop_spaces", "chops leading and trailing spaces from text", OFFSET(chop_spaces), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD},
@ -464,6 +556,7 @@ AVCodec ff_libzvbi_teletext_decoder = {
.init = teletext_init_decoder, .init = teletext_init_decoder,
.close = teletext_close_decoder, .close = teletext_close_decoder,
.decode = teletext_decode_frame, .decode = teletext_decode_frame,
.capabilities = CODEC_CAP_DELAY,
.flush = teletext_flush, .flush = teletext_flush,
.priv_class= &teletext_class, .priv_class= &teletext_class,
}; };

45
libavcodec/textdec.c
View File

@ -41,59 +41,20 @@ static const AVOption options[] = {
{ NULL } { NULL }
}; };
static int text_event_to_ass(const AVCodecContext *avctx, AVBPrint *buf,
const char *p, const char *p_end)
{
const TextContext *text = avctx->priv_data;
for (; p < p_end && *p; p++) {
/* forced custom line breaks, not accounted as "normal" EOL */
if (text->linebreaks && strchr(text->linebreaks, *p)) {
av_bprintf(buf, "\\N");
/* standard ASS escaping so random characters don't get mis-interpreted
* as ASS */
} else if (!text->keep_ass_markup && strchr("{}\\", *p)) {
av_bprintf(buf, "\\%c", *p);
/* some packets might end abruptly (no \0 at the end, like for example
* in some cases of demuxing from a classic video container), some
* might be terminated with \n or \r\n which we have to remove (for
* consistency with those who haven't), and we also have to deal with
* evil cases such as \r at the end of the buffer (and no \0 terminated
* character) */
} else if (p[0] == '\n') {
/* some stuff left so we can insert a line break */
if (p < p_end - 1)
av_bprintf(buf, "\\N");
} else if (p[0] == '\r' && p < p_end - 1 && p[1] == '\n') {
/* \r followed by a \n, we can skip it. We don't insert the \N yet
* because we don't know if it is followed by more text */
continue;
/* finally, a sane character */
} else {
av_bprint_chars(buf, *p, 1);
}
}
av_bprintf(buf, "\r\n");
return 0;
}
static int text_decode_frame(AVCodecContext *avctx, void *data, static int text_decode_frame(AVCodecContext *avctx, void *data,
int *got_sub_ptr, AVPacket *avpkt) int *got_sub_ptr, AVPacket *avpkt)
{ {
AVBPrint buf; AVBPrint buf;
AVSubtitle *sub = data; AVSubtitle *sub = data;
const char *ptr = avpkt->data; const char *ptr = avpkt->data;
const TextContext *text = avctx->priv_data;
const int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100}); const int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100});
const int ts_duration = avpkt->duration != -1 ? const int ts_duration = avpkt->duration != -1 ?
av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1; av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
if (ptr && avpkt->size > 0 && *ptr && if (ptr && avpkt->size > 0 && *ptr) {
!text_event_to_ass(avctx, &buf, ptr, ptr + avpkt->size)) { ff_ass_bprint_text_event(&buf, ptr, avpkt->size, text->linebreaks, text->keep_ass_markup);
if (!av_bprint_is_complete(&buf)) { if (!av_bprint_is_complete(&buf)) {
av_bprint_finalize(&buf, NULL); av_bprint_finalize(&buf, NULL);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);