X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdvdsubdec.c;h=eadde3234f69e88b6cda88424b34f0793f506939;hb=95d52464542f532061290192518d5fe1c1930e8d;hp=9691e384f43dd706e863cd25cd94fb2bac6e14c5;hpb=37a43cfb3921a0b80157ea658d408bd08ab68306;p=ffmpeg diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 9691e384f43..eadde3234f6 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -1,41 +1,47 @@ /* - * DVD subtitle decoding for ffmpeg + * DVD subtitle decoding * Copyright (c) 2005 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * 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 "bitstream.h" -#include "colorspace.h" +#include "get_bits.h" #include "dsputil.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_cropTbl + 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 +121,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,24 +173,20 @@ 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; if (buf_size < 10) return -1; - sub_header->rects = NULL; - sub_header->num_rects = 0; - sub_header->format = 0; - sub_header->start_display_time = 0; - sub_header->end_display_time = 0; + memset(sub_header, 0, sizeof(*sub_header)); if (AV_RB16(buf) == 0) { /* HD subpicture with 4-byte offsets */ big_offsets = 1; @@ -191,22 +200,18 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, cmd_pos = READ_OFFSET(buf + cmd_pos); - while ((cmd_pos + 2 + offset_size) < buf_size) { + 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); -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "cmd_pos=0x%04x next=0x%04x date=%d\n", - cmd_pos, next_cmd_pos, date); -#endif + av_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; offset2 = -1; x1 = y1 = x2 = y2 = 0; while (pos < buf_size) { cmd = buf[pos++]; -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "cmd=%02x\n", cmd); -#endif + av_dlog(NULL, "cmd=%02x\n", cmd); switch(cmd) { case 0x00: /* menu subpicture */ @@ -239,9 +244,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, alpha[1] = buf[pos + 1] >> 4; alpha[0] = buf[pos + 1] & 0x0f; pos += 2; -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "alpha=%x%x%x%x\n", alpha[0],alpha[1],alpha[2],alpha[3]); -#endif + av_dlog(NULL, "alpha=%x%x%x%x\n", alpha[0],alpha[1],alpha[2],alpha[3]); break; case 0x05: case 0x85: @@ -253,10 +256,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, y2 = ((buf[pos + 4] & 0x0f) << 8) | buf[pos + 5]; if (cmd & 0x80) is_8bit = 1; -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "x1=%d x2=%d y1=%d y2=%d\n", - x1, x2, y1, y2); -#endif + av_dlog(NULL, "x1=%d x2=%d y1=%d y2=%d\n", x1, x2, y1, y2); pos += 6; break; case 0x06: @@ -264,9 +264,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, goto fail; offset1 = AV_RB16(buf + pos); offset2 = AV_RB16(buf + pos + 2); -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); -#endif + av_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); pos += 4; break; case 0x86: @@ -274,9 +272,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, goto fail; offset1 = AV_RB32(buf + pos); offset2 = AV_RB32(buf + pos + 4); -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); -#endif + av_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); pos += 8; break; @@ -299,9 +295,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, case 0xff: goto the_end; default: -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, "unrecognised subpicture command 0x%x\n", cmd); -#endif + av_dlog(NULL, "unrecognised subpicture command 0x%x\n", cmd); goto the_end; } } @@ -337,22 +331,23 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, 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 (is_8bit) { if (yuv_palette == 0) goto fail; - sub_header->rects[0]->pict.data[1] = av_malloc(256 * 4); sub_header->rects[0]->nb_colors = 256; yuv_a_to_rgba(yuv_palette, alpha, (uint32_t*)sub_header->rects[0]->pict.data[1], 256); } else { - sub_header->rects[0]->pict.data[1] = av_malloc(4 * 4); 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; sub_header->rects[0]->y = y1; sub_header->rects[0]->w = w; sub_header->rects[0]->h = h; + sub_header->rects[0]->type = SUBTITLE_BITMAP; sub_header->rects[0]->pict.linesize[0] = w; } } @@ -390,14 +385,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) 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; @@ -475,12 +469,15 @@ static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h, static int dvdsub_decode(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { - AVSubtitle *sub = (void *)data; + 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: @@ -492,9 +489,9 @@ static int dvdsub_decode(AVCodecContext *avctx, goto no_subtitle; #if defined(DEBUG) - av_log(NULL, AV_LOG_INFO, "start=%d ms end =%d ms\n", - sub->start_display_time, - sub->end_display_time); + av_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], sub->rects[0]->w, sub->rects[0]->h, sub->rects[0]->pict.data[1]); #endif @@ -503,14 +500,50 @@ static int dvdsub_decode(AVCodecContext *avctx, return buf_size; } -AVCodec dvdsub_decoder = { - "dvdsub", - CODEC_TYPE_SUBTITLE, - CODEC_ID_DVD_SUBTITLE, - 0, - NULL, - NULL, - NULL, - dvdsub_decode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), +static av_cold int dvdsub_init(AVCodecContext *avctx) +{ + DVDSubContext *ctx = avctx->priv_data; + char *data, *cur; + + 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 && + av_image_check_size(w, h, 0, avctx) >= 0) + avcodec_set_dimensions(avctx, w, h); + } + cur += strcspn(cur, "\n\r"); + cur += strspn(cur, "\n\r"); + } + av_free(data); + return 0; +} + +AVCodec ff_dvdsub_decoder = { + .name = "dvdsub", + .type = AVMEDIA_TYPE_SUBTITLE, + .id = AV_CODEC_ID_DVD_SUBTITLE, + .priv_data_size = sizeof(DVDSubContext), + .init = dvdsub_init, + .decode = dvdsub_decode, + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), };