X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdvbsub.c;h=aed7d1d45319b9853b10da2e49b6f8ce7e47617f;hb=7c032a369aea3754213d7b79e28ff0c2496b2cf4;hp=9b52848d9840626f21cac0a4e94bfbb40796263e;hpb=240c1657dcd45adc0e63ef947b920919071ec1f7;p=ffmpeg diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index 9b52848d984..aed7d1d4531 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -2,21 +2,25 @@ * DVB subtitle encoding for ffmpeg * Copyright (c) 2005 Fabrice Bellard. * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" +#include "bytestream.h" +#include "colorspace.h" typedef struct DVBSubtitleContext { int hide_state; @@ -44,12 +48,12 @@ static void dvb_encode_rle2(uint8_t **pq, int x, y, len, x1, v, color; q = *pq; - + for(y = 0; y < h; y++) { *q++ = 0x10; bitbuf = 0; bitcnt = 6; - + x = 0; while (x < w) { x1 = x; @@ -132,12 +136,12 @@ static void dvb_encode_rle4(uint8_t **pq, int x, y, len, x1, v, color; q = *pq; - + for(y = 0; y < h; y++) { *q++ = 0x11; bitbuf = 0; bitcnt = 4; - + x = 0; while (x < w) { x1 = x; @@ -190,32 +194,7 @@ static void dvb_encode_rle4(uint8_t **pq, *pq = q; } -#define SCALEBITS 10 -#define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1<> SCALEBITS) - -#define RGB_TO_U_CCIR(r1, g1, b1, shift)\ -(((- FIX(0.16874*224.0/255.0) * r1 - FIX(0.33126*224.0/255.0) * g1 + \ - FIX(0.50000*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) - -#define RGB_TO_V_CCIR(r1, g1, b1, shift)\ -(((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ - FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) - -static inline void putbe16(uint8_t **pq, uint16_t v) -{ - uint8_t *q; - q = *pq; - *q++ = v >> 8; - *q++ = v; - *pq = q; -} - -static int encode_dvb_subtitles(DVBSubtitleContext *s, +static int encode_dvb_subtitles(DVBSubtitleContext *s, uint8_t *outbuf, AVSubtitle *h) { uint8_t *q, *pseg_len; @@ -225,18 +204,9 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, q = outbuf; page_id = 1; - region_id = 0; - clut_id = 0; - object_id = 0; - if (h->nb_colors <= 4) { - /* 2 bpp, some decoders do not support it correctly */ - bpp_index = 0; - } else if (h->nb_colors <= 16) { - /* 4 bpp, standard encoding */ - bpp_index = 1; - } else { + + if (h->num_rects == 0 || h->rects == NULL) return -1; - } *q++ = 0x00; /* subtitle_stream_id */ @@ -244,7 +214,7 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, *q++ = 0x0f; /* sync_byte */ *q++ = 0x10; /* segment_type */ - putbe16(&q, page_id); + bytestream_put_be16(&q, page_id); pseg_len = q; q += 2; /* segment length */ *q++ = 30; /* page_timeout (seconds) */ @@ -253,120 +223,165 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, else page_state = 2; /* mode change */ /* page_version = 0 + page_state */ - *q++ = s->object_version | (page_state << 2) | 3; - *q++ = region_id; - *q++ = 0xff; /* reserved */ - putbe16(&q, 0); /* left pos */ - putbe16(&q, 0); /* top pos */ + *q++ = s->object_version | (page_state << 2) | 3; - putbe16(&pseg_len, q - pseg_len - 2); + for (region_id = 0; region_id < h->num_rects; region_id++) { + *q++ = region_id; + *q++ = 0xff; /* reserved */ + bytestream_put_be16(&q, h->rects[region_id].x); /* left pos */ + bytestream_put_be16(&q, h->rects[region_id].y); /* top pos */ + } + + bytestream_put_be16(&pseg_len, q - pseg_len - 2); if (!s->hide_state) { - /* CLUT segment */ - - *q++ = 0x0f; /* sync byte */ - *q++ = 0x12; /* CLUT definition segment */ - putbe16(&q, page_id); + for (clut_id = 0; clut_id < h->num_rects; clut_id++) { + + /* CLUT segment */ + + if (h->rects[clut_id].nb_colors <= 4) { + /* 2 bpp, some decoders do not support it correctly */ + bpp_index = 0; + } else if (h->rects[clut_id].nb_colors <= 16) { + /* 4 bpp, standard encoding */ + bpp_index = 1; + } else { + return -1; + } + + *q++ = 0x0f; /* sync byte */ + *q++ = 0x12; /* CLUT definition segment */ + bytestream_put_be16(&q, page_id); + pseg_len = q; + q += 2; /* segment length */ + *q++ = clut_id; + *q++ = (0 << 4) | 0xf; /* version = 0 */ + + for(i = 0; i < h->rects[clut_id].nb_colors; i++) { + *q++ = i; /* clut_entry_id */ + *q++ = (1 << (7 - bpp_index)) | (0xf << 1) | 1; /* 2 bits/pixel full range */ + { + int a, r, g, b; + a = (h->rects[clut_id].rgba_palette[i] >> 24) & 0xff; + r = (h->rects[clut_id].rgba_palette[i] >> 16) & 0xff; + g = (h->rects[clut_id].rgba_palette[i] >> 8) & 0xff; + b = (h->rects[clut_id].rgba_palette[i] >> 0) & 0xff; + + *q++ = RGB_TO_Y_CCIR(r, g, b); + *q++ = RGB_TO_V_CCIR(r, g, b, 0); + *q++ = RGB_TO_U_CCIR(r, g, b, 0); + *q++ = 255 - a; + } + } + + bytestream_put_be16(&pseg_len, q - pseg_len - 2); + } + } + + for (region_id = 0; region_id < h->num_rects; region_id++) { + + /* region composition segment */ + + if (h->rects[region_id].nb_colors <= 4) { + /* 2 bpp, some decoders do not support it correctly */ + bpp_index = 0; + } else if (h->rects[region_id].nb_colors <= 16) { + /* 4 bpp, standard encoding */ + bpp_index = 1; + } else { + return -1; + } + + *q++ = 0x0f; /* sync_byte */ + *q++ = 0x11; /* segment_type */ + bytestream_put_be16(&q, page_id); pseg_len = q; q += 2; /* segment length */ - *q++ = clut_id; - *q++ = (0 << 4) | 0xf; /* version = 0 */ - - for(i = 0; i < h->nb_colors; i++) { - *q++ = i; /* clut_entry_id */ - *q++ = (1 << (7 - bpp_index)) | (0xf << 1) | 1; /* 2 bits/pixel full range */ - { - int a, r, g, b; - a = (h->rgba_palette[i] >> 24) & 0xff; - r = (h->rgba_palette[i] >> 16) & 0xff; - g = (h->rgba_palette[i] >> 8) & 0xff; - b = (h->rgba_palette[i] >> 0) & 0xff; - - *q++ = RGB_TO_Y_CCIR(r, g, b); - *q++ = RGB_TO_V_CCIR(r, g, b, 0); - *q++ = RGB_TO_U_CCIR(r, g, b, 0); - *q++ = 255 - a; - } + *q++ = region_id; + *q++ = (s->object_version << 4) | (0 << 3) | 0x07; /* version , no fill */ + bytestream_put_be16(&q, h->rects[region_id].w); /* region width */ + bytestream_put_be16(&q, h->rects[region_id].h); /* region height */ + *q++ = ((1 + bpp_index) << 5) | ((1 + bpp_index) << 2) | 0x03; + *q++ = region_id; /* clut_id == region_id */ + *q++ = 0; /* 8 bit fill colors */ + *q++ = 0x03; /* 4 bit and 2 bit fill colors */ + + if (!s->hide_state) { + bytestream_put_be16(&q, region_id); /* object_id == region_id */ + *q++ = (0 << 6) | (0 << 4); + *q++ = 0; + *q++ = 0xf0; + *q++ = 0; } - putbe16(&pseg_len, q - pseg_len - 2); + bytestream_put_be16(&pseg_len, q - pseg_len - 2); } - /* region composition segment */ - *q++ = 0x0f; /* sync_byte */ - *q++ = 0x11; /* segment_type */ - putbe16(&q, page_id); - pseg_len = q; - q += 2; /* segment length */ - *q++ = region_id; - *q++ = (s->object_version << 4) | (0 << 3) | 0x07; /* version , no fill */ - putbe16(&q, 720); /* region width */ - putbe16(&q, 576); /* region height */ - *q++ = ((1 + bpp_index) << 5) | ((1 + bpp_index) << 2) | 0x03; - *q++ = clut_id; - *q++ = 0; /* 8 bit fill colors */ - *q++ = 0x03; /* 4 bit and 2 bit fill colors */ - if (!s->hide_state) { - putbe16(&q, object_id); - *q++ = (0 << 6) | (0 << 4) | ((h->x >> 8) & 0xf); - *q++ = h->x; - *q++ = 0xf0 | ((h->y >> 8) & 0xf); - *q++ = h->y; - } - - putbe16(&pseg_len, q - pseg_len - 2); - if (!s->hide_state) { - - /* Object Data segment */ + for (object_id = 0; object_id < h->num_rects; object_id++) { + /* Object Data segment */ - *q++ = 0x0f; /* sync byte */ - *q++ = 0x13; - putbe16(&q, page_id); - pseg_len = q; - q += 2; /* segment length */ - - putbe16(&q, object_id); - *q++ = (s->object_version << 4) | (0 << 2) | (0 << 1) | 1; /* version = 0, - onject_coding_method, - non_modifying_color_flag */ - { - uint8_t *ptop_field_len, *pbottom_field_len, *top_ptr, *bottom_ptr; - void (*dvb_encode_rle)(uint8_t **pq, - const uint8_t *bitmap, int linesize, - int w, int h); - ptop_field_len = q; - q += 2; - pbottom_field_len = q; - q += 2; - - if (bpp_index == 0) - dvb_encode_rle = dvb_encode_rle2; - else - dvb_encode_rle = dvb_encode_rle4; - - top_ptr = q; - dvb_encode_rle(&q, h->bitmap, h->w * 2, h->w, h->h >> 1); - bottom_ptr = q; - dvb_encode_rle(&q, h->bitmap + h->w, h->w * 2, h->w, h->h >> 1); - - putbe16(&ptop_field_len, bottom_ptr - top_ptr); - putbe16(&pbottom_field_len, q - bottom_ptr); - } + if (h->rects[object_id].nb_colors <= 4) { + /* 2 bpp, some decoders do not support it correctly */ + bpp_index = 0; + } else if (h->rects[object_id].nb_colors <= 16) { + /* 4 bpp, standard encoding */ + bpp_index = 1; + } else { + return -1; + } + + *q++ = 0x0f; /* sync byte */ + *q++ = 0x13; + bytestream_put_be16(&q, page_id); + pseg_len = q; + q += 2; /* segment length */ + + bytestream_put_be16(&q, object_id); + *q++ = (s->object_version << 4) | (0 << 2) | (0 << 1) | 1; /* version = 0, + onject_coding_method, + non_modifying_color_flag */ + { + uint8_t *ptop_field_len, *pbottom_field_len, *top_ptr, *bottom_ptr; + void (*dvb_encode_rle)(uint8_t **pq, + const uint8_t *bitmap, int linesize, + int w, int h); + ptop_field_len = q; + q += 2; + pbottom_field_len = q; + q += 2; + + if (bpp_index == 0) + dvb_encode_rle = dvb_encode_rle2; + else + dvb_encode_rle = dvb_encode_rle4; + + top_ptr = q; + dvb_encode_rle(&q, h->rects[object_id].bitmap, h->rects[object_id].w * 2, + h->rects[object_id].w, h->rects[object_id].h >> 1); + bottom_ptr = q; + dvb_encode_rle(&q, h->rects[object_id].bitmap + h->rects[object_id].w, + h->rects[object_id].w * 2, h->rects[object_id].w, + h->rects[object_id].h >> 1); + + bytestream_put_be16(&ptop_field_len, bottom_ptr - top_ptr); + bytestream_put_be16(&pbottom_field_len, q - bottom_ptr); + } - putbe16(&pseg_len, q - pseg_len - 2); + bytestream_put_be16(&pseg_len, q - pseg_len - 2); + } } /* end of display set segment */ *q++ = 0x0f; /* sync_byte */ *q++ = 0x80; /* segment_type */ - putbe16(&q, page_id); + bytestream_put_be16(&q, page_id); pseg_len = q; q += 2; /* segment length */ - putbe16(&pseg_len, q - pseg_len - 2); + bytestream_put_be16(&pseg_len, q - pseg_len - 2); *q++ = 0xff; /* end of PES data */