generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libzvbi-teletextdec: propagate errors generated in page handler

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2013-10-25 21:12:23 +02:00
parent 4947b0624b
commit c0479f0f06
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/libzvbi-teletextdec.c
View File

@@ -60,6 +60,7 @@ typedef struct TeletextContext
TeletextPage *pages; TeletextPage *pages;
int nb_pages; int nb_pages;
int64_t pts; int64_t pts;
int handler_ret;
vbi_decoder * vbi; vbi_decoder * vbi;
vbi_dvb_demux * dx; vbi_dvb_demux * dx;
@@ -307,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,
@@ -345,17 +348,22 @@ handler(vbi_event *ev, void *user_data)
res = (ctx->format_id == 0) ? res = (ctx->format_id == 0) ?
gen_sub_bitmap(ctx, cur_page->sub_rect, &page, chop_top) : gen_sub_bitmap(ctx, cur_page->sub_rect, &page, chop_top) :
gen_sub_text (ctx, cur_page->sub_rect, &page, chop_top); gen_sub_text (ctx, cur_page->sub_rect, &page, chop_top);
if (res) if (res < 0) {
av_freep(&cur_page->sub_rect); av_freep(&cur_page->sub_rect);
else ctx->handler_ret = res;
} else {
ctx->pages[ctx->nb_pages++] = *cur_page; ctx->pages[ctx->nb_pages++] = *cur_page;
}
} else {
ctx->handler_ret = AVERROR(ENOMEM);
} }
} else { } else {
av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory to to buffer pages\n"); ctx->handler_ret = AVERROR(ENOMEM);
} }
} else { } else {
//TODO: If multiple packets contain more than one page, pages may got queued up, and this may happen... //TODO: If multiple packets contain more than one page, pages may got queued up, and this may happen...
av_log(ctx, AV_LOG_ERROR, "Buffered too many pages, dropping page %s.\n", pgno_str); 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);
@@ -403,6 +411,8 @@ teletext_decode_frame(AVCodecContext *avctx,
* (see mpegts demuxer) are not accurate enough to pass that test. */ * (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); vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, NULL, &pesheader_buf, &pesheader_size);
ctx->handler_ret = pkt->size;
while (left > 0) { while (left > 0) {
int64_t pts = 0; int64_t pts = 0;
unsigned int lines = vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, &pts, &buf, &left); unsigned int lines = vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, &pts, &buf, &left);
@@ -423,9 +433,12 @@ teletext_decode_frame(AVCodecContext *avctx,
} }
} }
ctx->pts = AV_NOPTS_VALUE; ctx->pts = AV_NOPTS_VALUE;
ret = pkt->size; ret = ctx->handler_ret;
} }
if (ret < 0)
return ret;
// is there a subtitle to pass? // is there a subtitle to pass?
if (ctx->nb_pages) { if (ctx->nb_pages) {
int i; int i;