RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-04 14:22:12 +00:00
Code Issues Projects Releases Wiki Activity

libzvbi-teletextdec: use AVBPrint for whitespace cleanup

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2013-10-23 23:15:54 +02:00
parent b689b1f6ee
commit 65fb59abd2
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/libzvbi-teletextdec.c
View File

@ -20,6 +20,7 @@
#include "avcodec.h" #include "avcodec.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>
@ -95,9 +96,8 @@ subtitle_rect_free(AVSubtitleRect **sub_rect)
static int static int
gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top) gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top)
{ {
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;
@ -115,11 +115,8 @@ gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int
} }
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;
@ -134,25 +131,29 @@ gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int
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)) {
av_bprint_finalize(&buf, NULL);
return AVERROR(ENOMEM);
}
if (buf.len) {
int ret;
sub_rect->type = SUBTITLE_TEXT; sub_rect->type = SUBTITLE_TEXT;
sub_rect->text = text; if ((ret = av_bprint_finalize(&buf, &sub_rect->text)) < 0)
av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", text); return ret;
av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", sub_rect->text);
} else { } else {
sub_rect->type = SUBTITLE_NONE; sub_rect->type = SUBTITLE_NONE;
av_free(text); av_bprint_finalize(&buf, NULL);
} }
return 0; return 0;
} }