X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdvdsubdec.c;h=a309e74346b42a6a3856a5f3a9bad10f46527afb;hb=94bb1ce882a12b6d7a1fa32715a68121b39ee838;hp=87eb53baaa2b1a681dfa76b1dfc7e0581780f8e9;hpb=2912e87a6c9264d556734e2bf94a99c64cf9b102;p=ffmpeg diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 87eb53baaa2..a309e74346b 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -1,5 +1,5 @@ /* - * DVD subtitle decoding for ffmpeg + * DVD subtitle decoding * Copyright (c) 2005 Fabrice Bellard * * This file is part of Libav. @@ -18,24 +18,32 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" +#include "internal.h" + +#include "libavutil/attributes.h" #include "libavutil/colorspace.h" +#include "libavutil/imgutils.h" +#include "libavutil/avstring.h" -//#define DEBUG +typedef struct DVDSubContext { + uint32_t palette[16]; + int has_palette; +} DVDSubContext; static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; uint8_t r, g, b; int i, y, cb, cr; int r_add, g_add, b_add; for (i = num_values; i > 0; i--) { y = *ycbcr++; - cb = *ycbcr++; cr = *ycbcr++; + cb = *ycbcr++; YUV_TO_RGB1_CCIR(cb, cr); YUV_TO_RGB2_CCIR(r, g, b, y); *rgba++ = (*alpha++ << 24) | (r << 16) | (g << 8) | b; @@ -115,18 +123,25 @@ static int decode_rle(uint8_t *bitmap, int linesize, int w, int h, return 0; } -static void guess_palette(uint32_t *rgba_palette, +static void guess_palette(DVDSubContext* ctx, + uint32_t *rgba_palette, uint8_t *colormap, uint8_t *alpha, uint32_t subtitle_color) { - uint8_t color_used[16]; + uint8_t color_used[16] = { 0 }; int nb_opaque_colors, i, level, j, r, g, b; + if (ctx->has_palette) { + for (i = 0; i < 4; i++) + rgba_palette[i] = (ctx->palette[colormap[i]] & 0x00ffffff) + | ((alpha[i] * 17) << 24); + return; + } + for(i = 0; i < 4; i++) rgba_palette[i] = 0; - memset(color_used, 0, 16); nb_opaque_colors = 0; for(i = 0; i < 4; i++) { if (alpha[i] != 0 && !color_used[colormap[i]]) { @@ -160,13 +175,13 @@ static void guess_palette(uint32_t *rgba_palette, #define READ_OFFSET(a) (big_offsets ? AV_RB32(a) : AV_RB16(a)) -static int decode_dvd_subtitles(AVSubtitle *sub_header, +static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, const uint8_t *buf, int buf_size) { int cmd_pos, pos, cmd, x1, y1, x2, y2, offset1, offset2, next_cmd_pos; int big_offsets, offset_size, is_8bit = 0; const uint8_t *yuv_palette = 0; - uint8_t colormap[4], alpha[256]; + uint8_t colormap[4] = { 0 }, alpha[256] = { 0 }; int date; int i; int is_menu = 0; @@ -190,7 +205,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, while (cmd_pos > 0 && cmd_pos < buf_size - 2 - offset_size) { date = AV_RB16(buf + cmd_pos); next_cmd_pos = READ_OFFSET(buf + cmd_pos + 2); - av_dlog(NULL, "cmd_pos=0x%04x next=0x%04x date=%d\n", + ff_dlog(NULL, "cmd_pos=0x%04x next=0x%04x date=%d\n", cmd_pos, next_cmd_pos, date); pos = cmd_pos + 2 + offset_size; offset1 = -1; @@ -198,7 +213,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, x1 = y1 = x2 = y2 = 0; while (pos < buf_size) { cmd = buf[pos++]; - av_dlog(NULL, "cmd=%02x\n", cmd); + ff_dlog(NULL, "cmd=%02x\n", cmd); switch(cmd) { case 0x00: /* menu subpicture */ @@ -231,7 +246,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, alpha[1] = buf[pos + 1] >> 4; alpha[0] = buf[pos + 1] & 0x0f; pos += 2; - av_dlog(NULL, "alpha=%x%x%x%x\n", alpha[0],alpha[1],alpha[2],alpha[3]); + ff_dlog(NULL, "alpha=%x%x%x%x\n", alpha[0],alpha[1],alpha[2],alpha[3]); break; case 0x05: case 0x85: @@ -243,7 +258,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, y2 = ((buf[pos + 4] & 0x0f) << 8) | buf[pos + 5]; if (cmd & 0x80) is_8bit = 1; - av_dlog(NULL, "x1=%d x2=%d y1=%d y2=%d\n", x1, x2, y1, y2); + ff_dlog(NULL, "x1=%d x2=%d y1=%d y2=%d\n", x1, x2, y1, y2); pos += 6; break; case 0x06: @@ -251,7 +266,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, goto fail; offset1 = AV_RB16(buf + pos); offset2 = AV_RB16(buf + pos + 2); - av_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); + ff_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); pos += 4; break; case 0x86: @@ -259,7 +274,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, goto fail; offset1 = AV_RB32(buf + pos); offset2 = AV_RB32(buf + pos + 4); - av_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); + ff_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); pos += 8; break; @@ -282,7 +297,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, case 0xff: goto the_end; default: - av_dlog(NULL, "unrecognised subpicture command 0x%x\n", cmd); + ff_dlog(NULL, "unrecognised subpicture command 0x%x\n", cmd); goto the_end; } } @@ -299,7 +314,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, if (h < 0) h = 0; if (w > 0 && h > 0) { - if (sub_header->rects != NULL) { + if (sub_header->rects) { for (i = 0; i < sub_header->num_rects; i++) { av_freep(&sub_header->rects[i]->pict.data[0]); av_freep(&sub_header->rects[i]->pict.data[1]); @@ -309,16 +324,23 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, sub_header->num_rects = 0; } - bitmap = av_malloc(w * h); sub_header->rects = av_mallocz(sizeof(*sub_header->rects)); + if (!sub_header->rects) + goto fail; sub_header->rects[0] = av_mallocz(sizeof(AVSubtitleRect)); + if (!sub_header->rects[0]) + goto fail; sub_header->num_rects = 1; - sub_header->rects[0]->pict.data[0] = bitmap; + bitmap = sub_header->rects[0]->pict.data[0] = av_malloc(w * h); + if (!bitmap) + goto fail; decode_rle(bitmap, w * 2, w, (h + 1) / 2, buf, offset1, buf_size, is_8bit); decode_rle(bitmap + w, w * 2, w, h / 2, buf, offset2, buf_size, is_8bit); sub_header->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE); + if (!sub_header->rects[0]->pict.data[1]) + goto fail; if (is_8bit) { if (yuv_palette == 0) goto fail; @@ -326,7 +348,8 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, yuv_a_to_rgba(yuv_palette, alpha, (uint32_t*)sub_header->rects[0]->pict.data[1], 256); } else { sub_header->rects[0]->nb_colors = 4; - guess_palette((uint32_t*)sub_header->rects[0]->pict.data[1], + guess_palette(ctx, + (uint32_t*)sub_header->rects[0]->pict.data[1], colormap, alpha, 0xffff00); } sub_header->rects[0]->x = x1; @@ -344,7 +367,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, if (sub_header->num_rects > 0) return is_menu; fail: - if (sub_header->rects != NULL) { + if (!sub_header->rects) { for (i = 0; i < sub_header->num_rects; i++) { av_freep(&sub_header->rects[i]->pict.data[0]); av_freep(&sub_header->rects[i]->pict.data[1]); @@ -371,14 +394,13 @@ static int is_transp(const uint8_t *buf, int pitch, int n, /* return 0 if empty rectangle, 1 if non empty */ static int find_smallest_bounding_rectangle(AVSubtitle *s) { - uint8_t transp_color[256]; + uint8_t transp_color[256] = { 0 }; int y1, y2, x1, x2, y, w, h, i; uint8_t *bitmap; - if (s->num_rects == 0 || s->rects == NULL || s->rects[0]->w <= 0 || s->rects[0]->h <= 0) + if (s->num_rects == 0 || !s->rects || s->rects[0]->w <= 0 || s->rects[0]->h <= 0) return 0; - memset(transp_color, 0, 256); for(i = 0; i < s->rects[0]->nb_colors; i++) { if ((((uint32_t*)s->rects[0]->pict.data[1])[i] >> 24) == 0) transp_color[i] = 1; @@ -424,9 +446,6 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s) } #ifdef DEBUG -#undef fprintf -#undef perror -#undef exit static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h, uint32_t *rgba_palette) { @@ -458,12 +477,13 @@ static int dvdsub_decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + DVDSubContext *ctx = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; AVSubtitle *sub = data; int is_menu; - is_menu = decode_dvd_subtitles(sub, buf, buf_size); + is_menu = decode_dvd_subtitles(ctx, sub, buf, buf_size); if (is_menu < 0) { no_subtitle: @@ -475,7 +495,7 @@ static int dvdsub_decode(AVCodecContext *avctx, goto no_subtitle; #if defined(DEBUG) - av_dlog(NULL, "start=%d ms end =%d ms\n", + ff_dlog(NULL, "start=%d ms end =%d ms\n", sub->start_display_time, sub->end_display_time); ppm_save("/tmp/a.ppm", sub->rects[0]->pict.data[0], @@ -486,14 +506,55 @@ static int dvdsub_decode(AVCodecContext *avctx, return buf_size; } +static av_cold int dvdsub_init(AVCodecContext *avctx) +{ + DVDSubContext *ctx = avctx->priv_data; + char *data, *cur; + int ret = 0; + + if (!avctx->extradata || !avctx->extradata_size) + return 0; + + data = av_malloc(avctx->extradata_size + 1); + if (!data) + return AVERROR(ENOMEM); + memcpy(data, avctx->extradata, avctx->extradata_size); + data[avctx->extradata_size] = '\0'; + cur = data; + + while (*cur) { + if (strncmp("palette:", cur, 8) == 0) { + int i; + char *p = cur + 8; + ctx->has_palette = 1; + for (i = 0; i < 16; i++) { + ctx->palette[i] = strtoul(p, &p, 16); + while (*p == ',' || av_isspace(*p)) + p++; + } + } else if (!strncmp("size:", cur, 5)) { + int w, h; + if (sscanf(cur + 5, "%dx%d", &w, &h) == 2) { + ret = ff_set_dimensions(avctx, w, h); + if (ret < 0) + goto fail; + } + } + cur += strcspn(cur, "\n\r"); + cur += strspn(cur, "\n\r"); + } + +fail: + av_free(data); + return ret; +} + AVCodec ff_dvdsub_decoder = { - "dvdsub", - AVMEDIA_TYPE_SUBTITLE, - CODEC_ID_DVD_SUBTITLE, - 0, - NULL, - NULL, - NULL, - dvdsub_decode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + .name = "dvdsub", + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + .type = AVMEDIA_TYPE_SUBTITLE, + .id = AV_CODEC_ID_DVD_SUBTITLE, + .priv_data_size = sizeof(DVDSubContext), + .init = dvdsub_init, + .decode = dvdsub_decode, };