diff options
| author | Marton Balint <cus@passwd.hu> | 2013-12-07 17:14:15 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2013-12-14 15:57:44 +0100 |
| commit | 249a435989d064833efac7f5bb319bb4cc4c58aa (patch) | |
| tree | 92d7ece671f92b7d677d0e9fbc83825d106c31e3 /libavcodec/libzvbi-teletextdec.c | |
| parent | b50968169df4c44d37cb46bce6d68fd3ae51c8fb (diff) | |
| download | ffmpeg-streaming-249a435989d064833efac7f5bb319bb4cc4c58aa.zip ffmpeg-streaming-249a435989d064833efac7f5bb319bb4cc4c58aa.tar.gz | |
libzvbi-teletextdec: use defined constants for bitmap char width and height
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec/libzvbi-teletextdec.c')
| -rw-r--r-- | libavcodec/libzvbi-teletextdec.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index e02bc05..1bdd5fa 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -34,6 +34,8 @@ #define VBI_B(rgba) (((rgba) >> 16) & 0xFF) #define VBI_A(rgba) (((rgba) >> 24) & 0xFF) #define MAX_BUFFERED_PAGES 25 +#define BITMAP_CHAR_WIDTH 12 +#define BITMAP_CHAR_HEIGHT 10 typedef struct TeletextPage { @@ -195,13 +197,13 @@ static void fix_transparency(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi // Hack for transparency, inspired by VLC code... for (iy = 0; iy < resy; iy++) { uint8_t *pixel = sub_rect->pict.data[0] + iy * sub_rect->pict.linesize[0]; - vbi_char *vc = page->text + (iy / 10 + chop_top) * page->columns; + vbi_char *vc = page->text + (iy / BITMAP_CHAR_HEIGHT + chop_top) * page->columns; vbi_char *vcnext = vc + page->columns; for (; vc < vcnext; vc++) { - uint8_t *pixelnext = pixel + 12; + uint8_t *pixelnext = pixel + BITMAP_CHAR_WIDTH; switch (vc->opacity) { case VBI_TRANSPARENT_SPACE: - memset(pixel, transparent_color, 12); + memset(pixel, transparent_color, BITMAP_CHAR_WIDTH); break; case VBI_OPAQUE: case VBI_SEMI_TRANSPARENT: @@ -221,8 +223,8 @@ static void fix_transparency(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi /* Draw a page as bitmap */ static int gen_sub_bitmap(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top) { - int resx = page->columns * 12; - int resy = (page->rows - chop_top) * 10; + int resx = page->columns * BITMAP_CHAR_WIDTH; + int resy = (page->rows - chop_top) * BITMAP_CHAR_HEIGHT; uint8_t ci, cmax = 0; int ret; vbi_char *vc = page->text + (chop_top * page->columns); |
