X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdvbsubdec.c;h=a0d0eb976d978296c540fa48d51aaf4499a7ec7e;hb=32b3ab9b60f05c1c1e82022e9f57a21a0e3e1ec4;hp=ba67ad1617dc1e5c852254d95ad433e6cf056367;hpb=b78e7197a81e193827cf2408fe25bc1f14843a72;p=ffmpeg diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index ba67ad1617d..a0d0eb976d9 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1,6 +1,6 @@ /* * DVB subtitle decoding for ffmpeg - * Copyright (c) 2005 Ian Caulfield. + * Copyright (c) 2005 Ian Caulfield * * This file is part of FFmpeg. * @@ -20,7 +20,8 @@ */ #include "avcodec.h" #include "dsputil.h" -#include "bitstream.h" +#include "get_bits.h" +#include "colorspace.h" //#define DEBUG //#define DEBUG_PACKET_CONTENTS @@ -32,7 +33,7 @@ #define DVBSUB_OBJECT_SEGMENT 0x13 #define DVBSUB_DISPLAY_SEGMENT 0x80 -static unsigned char *cm; +#define cm (ff_cropTbl + MAX_NEG_CROP) #ifdef DEBUG_SAVE_IMAGES #undef fprintf @@ -101,7 +102,7 @@ static void png_save2(const char *filename, uint32_t *bitmap, int w, int h) char fname[40], fname2[40]; char command[1024]; - snprintf(fname, 40, "%s.ppm", filename); + snprintf(fname, sizeof(fname), "%s.ppm", filename); f = fopen(fname, "w"); if (!f) { @@ -123,7 +124,7 @@ static void png_save2(const char *filename, uint32_t *bitmap, int w, int h) fclose(f); - snprintf(fname2, 40, "%s-a.pgm", filename); + snprintf(fname2, sizeof(fname2), "%s-a.pgm", filename); f = fopen(fname2, "w"); if (!f) { @@ -142,10 +143,10 @@ static void png_save2(const char *filename, uint32_t *bitmap, int w, int h) } fclose(f); - snprintf(command, 1024, "pnmtopng -alpha %s %s > %s.png 2> /dev/null", fname2, fname, filename); + snprintf(command, sizeof(command), "pnmtopng -alpha %s %s > %s.png 2> /dev/null", fname2, fname, filename); system(command); - snprintf(command, 1024, "rm %s %s", fname, fname2); + snprintf(command, sizeof(command), "rm %s %s", fname, fname2); system(command); } #endif @@ -171,8 +172,8 @@ typedef struct DVBSubObjectDisplay { int x_pos; int y_pos; - int fgcolour; - int bgcolour; + int fgcolor; + int bgcolor; struct DVBSubObjectDisplay *region_list_next; struct DVBSubObjectDisplay *object_list_next; @@ -205,7 +206,7 @@ typedef struct DVBSubRegion { int depth; int clut; - int bgcolour; + int bgcolor; uint8_t *pbuf; int buf_size; @@ -233,7 +234,7 @@ static DVBSubObject* get_object(DVBSubContext *ctx, int object_id) { DVBSubObject *ptr = ctx->object_list; - while (ptr != NULL && ptr->id != object_id) { + while (ptr && ptr->id != object_id) { ptr = ptr->next; } @@ -244,7 +245,7 @@ static DVBSubCLUT* get_clut(DVBSubContext *ctx, int clut_id) { DVBSubCLUT *ptr = ctx->clut_list; - while (ptr != NULL && ptr->id != clut_id) { + while (ptr && ptr->id != clut_id) { ptr = ptr->next; } @@ -255,7 +256,7 @@ static DVBSubRegion* get_region(DVBSubContext *ctx, int region_id) { DVBSubRegion *ptr = ctx->region_list; - while (ptr != NULL && ptr->id != region_id) { + while (ptr && ptr->id != region_id) { ptr = ptr->next; } @@ -267,30 +268,31 @@ static void delete_region_display_list(DVBSubContext *ctx, DVBSubRegion *region) DVBSubObject *object, *obj2, **obj2_ptr; DVBSubObjectDisplay *display, *obj_disp, **obj_disp_ptr; - while (region->display_list != NULL) { + while (region->display_list) { display = region->display_list; object = get_object(ctx, display->object_id); - if (object != NULL) { - obj_disp = object->display_list; + if (object) { obj_disp_ptr = &object->display_list; + obj_disp = *obj_disp_ptr; - while (obj_disp != NULL && obj_disp != display) { + while (obj_disp && obj_disp != display) { obj_disp_ptr = &obj_disp->object_list_next; - obj_disp = obj_disp->object_list_next; + obj_disp = *obj_disp_ptr; } if (obj_disp) { *obj_disp_ptr = obj_disp->object_list_next; - if (object->display_list == NULL) { - obj2 = ctx->object_list; + if (!object->display_list) { obj2_ptr = &ctx->object_list; + obj2 = *obj2_ptr; - while (obj2 != NULL && obj2 != object) { + while (obj2 != object) { + assert(obj2); obj2_ptr = &obj2->next; - obj2 = obj2->next; + obj2 = *obj2_ptr; } *obj2_ptr = obj2->next; @@ -312,21 +314,19 @@ static void delete_state(DVBSubContext *ctx) DVBSubRegion *region; DVBSubCLUT *clut; - while (ctx->region_list != NULL) - { + while (ctx->region_list) { region = ctx->region_list; ctx->region_list = region->next; delete_region_display_list(ctx, region); - if (region->pbuf != NULL) + if (region->pbuf) av_free(region->pbuf); av_free(region); } - while (ctx->clut_list != NULL) - { + while (ctx->clut_list) { clut = ctx->clut_list; ctx->clut_list = clut->next; @@ -335,17 +335,15 @@ static void delete_state(DVBSubContext *ctx) } /* Should already be null */ - if (ctx->object_list != NULL) + if (ctx->object_list) av_log(0, AV_LOG_ERROR, "Memory deallocation error!\n"); } -static int dvbsub_init_decoder(AVCodecContext *avctx) +static av_cold int dvbsub_init_decoder(AVCodecContext *avctx) { int i, r, g, b, a = 0; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; - cm = cropTbl + MAX_NEG_CROP; - memset(avctx->priv_data, 0, sizeof(DVBSubContext)); ctx->composition_id = avctx->sub_id & 0xffff; @@ -414,15 +412,14 @@ static int dvbsub_init_decoder(AVCodecContext *avctx) return 0; } -static int dvbsub_close_decoder(AVCodecContext *avctx) +static av_cold int dvbsub_close_decoder(AVCodecContext *avctx) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubRegionDisplay *display; delete_state(ctx); - while (ctx->display_list != NULL) - { + while (ctx->display_list) { display = ctx->display_list; ctx->display_list = display->next; @@ -433,7 +430,7 @@ static int dvbsub_close_decoder(AVCodecContext *avctx) } static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, - uint8_t **srcbuf, int buf_size, + const uint8_t **srcbuf, int buf_size, int non_mod, uint8_t *map_table) { GetBitContext gb; @@ -442,21 +439,21 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, int run_length; int pixels_read = 0; - init_get_bits(&gb, *srcbuf, buf_size << 8); + init_get_bits(&gb, *srcbuf, buf_size << 3); - while (get_bits_count(&gb) < (buf_size << 8) && pixels_read < dbuf_len) { + while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) { bits = get_bits(&gb, 2); - if (bits != 0) { + if (bits) { if (non_mod != 1 || bits != 1) { - if (map_table != NULL) + if (map_table) *destbuf++ = map_table[bits]; else *destbuf++ = bits; } pixels_read++; } else { - bits = get_bits(&gb, 1); + bits = get_bits1(&gb); if (bits == 1) { run_length = get_bits(&gb, 3) + 3; bits = get_bits(&gb, 2); @@ -464,7 +461,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; else { - if (map_table != NULL) + if (map_table) bits = map_table[bits]; while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -472,7 +469,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, } } } else { - bits = get_bits(&gb, 1); + bits = get_bits1(&gb); if (bits == 0) { bits = get_bits(&gb, 2); if (bits == 2) { @@ -482,7 +479,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; else { - if (map_table != NULL) + if (map_table) bits = map_table[bits]; while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -496,7 +493,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; else { - if (map_table != NULL) + if (map_table) bits = map_table[bits]; while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -505,7 +502,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, } } else if (bits == 1) { pixels_read += 2; - if (map_table != NULL) + if (map_table) bits = map_table[0]; else bits = 0; @@ -518,7 +515,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, return pixels_read; } } else { - if (map_table != NULL) + if (map_table) bits = map_table[0]; else bits = 0; @@ -529,7 +526,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, } } - if (get_bits(&gb, 6) != 0) + if (get_bits(&gb, 6)) av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n"); (*srcbuf) += (get_bits_count(&gb) + 7) >> 3; @@ -538,7 +535,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, } static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, - uint8_t **srcbuf, int buf_size, + const uint8_t **srcbuf, int buf_size, int non_mod, uint8_t *map_table) { GetBitContext gb; @@ -547,21 +544,21 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, int run_length; int pixels_read = 0; - init_get_bits(&gb, *srcbuf, buf_size << 8); + init_get_bits(&gb, *srcbuf, buf_size << 3); - while (get_bits_count(&gb) < (buf_size << 8) && pixels_read < dbuf_len) { + while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) { bits = get_bits(&gb, 4); - if (bits != 0) { + if (bits) { if (non_mod != 1 || bits != 1) { - if (map_table != NULL) + if (map_table) *destbuf++ = map_table[bits]; else *destbuf++ = bits; } pixels_read++; } else { - bits = get_bits(&gb, 1); + bits = get_bits1(&gb); if (bits == 0) { run_length = get_bits(&gb, 3); @@ -572,7 +569,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, run_length += 2; - if (map_table != NULL) + if (map_table) bits = map_table[0]; else bits = 0; @@ -582,7 +579,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, pixels_read++; } } else { - bits = get_bits(&gb, 1); + bits = get_bits1(&gb); if (bits == 0) { run_length = get_bits(&gb, 2) + 4; bits = get_bits(&gb, 4); @@ -590,7 +587,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; else { - if (map_table != NULL) + if (map_table) bits = map_table[bits]; while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -606,7 +603,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; else { - if (map_table != NULL) + if (map_table) bits = map_table[bits]; while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -620,7 +617,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; else { - if (map_table != NULL) + if (map_table) bits = map_table[bits]; while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -629,7 +626,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, } } else if (bits == 1) { pixels_read += 2; - if (map_table != NULL) + if (map_table) bits = map_table[0]; else bits = 0; @@ -638,7 +635,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, *destbuf++ = bits; } } else { - if (map_table != NULL) + if (map_table) bits = map_table[0]; else bits = 0; @@ -650,7 +647,7 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, } } - if (get_bits(&gb, 8) != 0) + if (get_bits(&gb, 8)) av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n"); (*srcbuf) += (get_bits_count(&gb) + 7) >> 3; @@ -659,10 +656,10 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, } static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, - uint8_t **srcbuf, int buf_size, + const uint8_t **srcbuf, int buf_size, int non_mod, uint8_t *map_table) { - uint8_t *sbuf_end = (*srcbuf) + buf_size; + const uint8_t *sbuf_end = (*srcbuf) + buf_size; int bits; int run_length; int pixels_read = 0; @@ -670,9 +667,9 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, while (*srcbuf < sbuf_end && pixels_read < dbuf_len) { bits = *(*srcbuf)++; - if (bits != 0) { + if (bits) { if (non_mod != 1 || bits != 1) { - if (map_table != NULL) + if (map_table) *destbuf++ = map_table[bits]; else *destbuf++ = bits; @@ -686,7 +683,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, return pixels_read; } - if (map_table != NULL) + if (map_table) bits = map_table[0]; else bits = 0; @@ -699,7 +696,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, if (non_mod == 1 && bits == 1) pixels_read += run_length; - if (map_table != NULL) + if (map_table) bits = map_table[bits]; else while (run_length-- > 0 && pixels_read < dbuf_len) { *destbuf++ = bits; @@ -709,7 +706,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, } } - if (*(*srcbuf)++ != 0) + if (*(*srcbuf)++) av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n"); return pixels_read; @@ -718,12 +715,12 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display, - uint8_t *buf, int buf_size, int top_bottom, int non_mod) + const uint8_t *buf, int buf_size, int top_bottom, int non_mod) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubRegion *region = get_region(ctx, display->region_id); - uint8_t *buf_end = buf + buf_size; + const uint8_t *buf_end = buf + buf_size; uint8_t *pbuf; int x_pos, y_pos; int i; @@ -740,8 +737,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis #endif #ifdef DEBUG_PACKET_CONTENTS - for (i = 0; i < buf_size; i++) - { + for (i = 0; i < buf_size; i++) { if (i % 16 == 0) av_log(avctx, AV_LOG_INFO, "0x%08p: ", buf+i); @@ -750,7 +746,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis av_log(avctx, AV_LOG_INFO, "\n"); } - if (i % 16 != 0) + if (i % 16) av_log(avctx, AV_LOG_INFO, "\n"); #endif @@ -838,20 +834,20 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis } static void dvbsub_parse_object_segment(AVCodecContext *avctx, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; - uint8_t *buf_end = buf + buf_size; - uint8_t *block; + const uint8_t *buf_end = buf + buf_size; + const uint8_t *block; int object_id; DVBSubObject *object; DVBSubObjectDisplay *display; int top_field_len, bottom_field_len; - int coding_method, non_modifying_colour; + int coding_method, non_modifying_color; - object_id = BE_16(buf); + object_id = AV_RB16(buf); buf += 2; object = get_object(ctx, object_id); @@ -860,12 +856,12 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx, return; coding_method = ((*buf) >> 2) & 3; - non_modifying_colour = ((*buf++) >> 1) & 1; + non_modifying_color = ((*buf++) >> 1) & 1; if (coding_method == 0) { - top_field_len = BE_16(buf); + top_field_len = AV_RB16(buf); buf += 2; - bottom_field_len = BE_16(buf); + bottom_field_len = AV_RB16(buf); buf += 2; if (buf + top_field_len + bottom_field_len > buf_end) { @@ -873,11 +869,11 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx, return; } - for (display = object->display_list; display != 0; display = display->object_list_next) { + for (display = object->display_list; display; display = display->object_list_next) { block = buf; dvbsub_parse_pixel_data_block(avctx, display, block, top_field_len, 0, - non_modifying_colour); + non_modifying_color); if (bottom_field_len > 0) block = buf + top_field_len; @@ -885,7 +881,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx, bottom_field_len = top_field_len; dvbsub_parse_pixel_data_block(avctx, display, block, bottom_field_len, 1, - non_modifying_colour); + non_modifying_color); } /* } else if (coding_method == 1) {*/ @@ -896,35 +892,12 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx, } -#define SCALEBITS 10 -#define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1<> SCALEBITS];\ - g = cm[(y + g_add) >> SCALEBITS];\ - b = cm[(y + b_add) >> SCALEBITS];\ -} - - static void dvbsub_parse_clut_segment(AVCodecContext *avctx, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; - uint8_t *buf_end = buf + buf_size; + const uint8_t *buf_end = buf + buf_size; int clut_id; DVBSubCLUT *clut; int entry_id, depth , full_range; @@ -936,14 +909,13 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx, av_log(avctx, AV_LOG_INFO, "DVB clut packet:\n"); - for (i=0; i < buf_size; i++) - { + for (i=0; i < buf_size; i++) { av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]); if (i % 16 == 15) av_log(avctx, AV_LOG_INFO, "\n"); } - if (i % 16 != 0) + if (i % 16) av_log(avctx, AV_LOG_INFO, "\n"); #endif @@ -953,7 +925,7 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx, clut = get_clut(ctx, clut_id); - if (clut == NULL) { + if (!clut) { clut = av_malloc(sizeof(DVBSubCLUT)); memcpy(clut, &default_clut, sizeof(DVBSubCLUT)); @@ -964,8 +936,7 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx, ctx->clut_list = clut; } - while (buf + 4 < buf_end) - { + while (buf + 4 < buf_end) { entry_id = *buf++; depth = (*buf) & 0xe0; @@ -1012,11 +983,11 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx, static void dvbsub_parse_region_segment(AVCodecContext *avctx, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; - uint8_t *buf_end = buf + buf_size; + const uint8_t *buf_end = buf + buf_size; int region_id, object_id; DVBSubRegion *region; DVBSubObject *object; @@ -1030,8 +1001,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, region = get_region(ctx, region_id); - if (region == NULL) - { + if (!region) { region = av_mallocz(sizeof(DVBSubRegion)); region->id = region_id; @@ -1042,13 +1012,13 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, fill = ((*buf++) >> 3) & 1; - region->width = BE_16(buf); + region->width = AV_RB16(buf); buf += 2; - region->height = BE_16(buf); + region->height = AV_RB16(buf); buf += 2; if (region->width * region->height != region->buf_size) { - if (region->pbuf != 0) + if (region->pbuf) av_free(region->pbuf); region->buf_size = region->width * region->height; @@ -1059,17 +1029,21 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, } region->depth = 1 << (((*buf++) >> 2) & 7); + if(region->depth<2 || region->depth>8){ + av_log(avctx, AV_LOG_ERROR, "region depth %d is invalid\n", region->depth); + region->depth= 4; + } region->clut = *buf++; if (region->depth == 8) - region->bgcolour = *buf++; + region->bgcolor = *buf++; else { buf += 1; if (region->depth == 4) - region->bgcolour = (((*buf++) >> 4) & 15); + region->bgcolor = (((*buf++) >> 4) & 15); else - region->bgcolour = (((*buf++) >> 2) & 3); + region->bgcolor = (((*buf++) >> 2) & 3); } #ifdef DEBUG @@ -1077,21 +1051,21 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, #endif if (fill) { - memset(region->pbuf, region->bgcolour, region->buf_size); + memset(region->pbuf, region->bgcolor, region->buf_size); #ifdef DEBUG - av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolour); + av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolor); #endif } delete_region_display_list(ctx, region); while (buf + 5 < buf_end) { - object_id = BE_16(buf); + object_id = AV_RB16(buf); buf += 2; object = get_object(ctx, object_id); - if (object == NULL) { + if (!object) { object = av_mallocz(sizeof(DVBSubObject)); object->id = object_id; @@ -1106,14 +1080,14 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, display->object_id = object_id; display->region_id = region_id; - display->x_pos = BE_16(buf) & 0xfff; + display->x_pos = AV_RB16(buf) & 0xfff; buf += 2; - display->y_pos = BE_16(buf) & 0xfff; + display->y_pos = AV_RB16(buf) & 0xfff; buf += 2; if ((object->type == 1 || object->type == 2) && buf+1 < buf_end) { - display->fgcolour = *buf++; - display->bgcolour = *buf++; + display->fgcolor = *buf++; + display->bgcolor = *buf++; } display->region_list_next = region->display_list; @@ -1125,13 +1099,13 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, } static void dvbsub_parse_page_segment(AVCodecContext *avctx, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubRegionDisplay *display; DVBSubRegionDisplay *tmp_display_list, **tmp_ptr; - uint8_t *buf_end = buf + buf_size; + const uint8_t *buf_end = buf + buf_size; int region_id; int page_state; @@ -1145,8 +1119,7 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx, av_log(avctx, AV_LOG_INFO, "Page time out %ds, state %d\n", ctx->time_out, page_state); #endif - if (page_state == 2) - { + if (page_state == 2) { delete_state(ctx); } @@ -1161,19 +1134,19 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx, display = tmp_display_list; tmp_ptr = &tmp_display_list; - while (display != NULL && display->region_id != region_id) { + while (display && display->region_id != region_id) { tmp_ptr = &display->next; display = display->next; } - if (display == NULL) + if (!display) display = av_mallocz(sizeof(DVBSubRegionDisplay)); display->region_id = region_id; - display->x_pos = BE_16(buf); + display->x_pos = AV_RB16(buf); buf += 2; - display->y_pos = BE_16(buf); + display->y_pos = AV_RB16(buf); buf += 2; *tmp_ptr = display->next; @@ -1187,7 +1160,7 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx, #endif } - while (tmp_display_list != 0) { + while (tmp_display_list) { display = tmp_display_list; tmp_display_list = display->next; @@ -1216,7 +1189,7 @@ static void save_display_set(DVBSubContext *ctx) width = 0; height = 0; - for (display = ctx->display_list; display != NULL; display = display->next) { + for (display = ctx->display_list; display; display = display->next) { region = get_region(ctx, display->region_id); if (x_pos == -1) { @@ -1249,7 +1222,7 @@ static void save_display_set(DVBSubContext *ctx) pbuf = av_malloc(width * height * 4); - for (display = ctx->display_list; display != NULL; display = display->next) { + for (display = ctx->display_list; display; display = display->next) { region = get_region(ctx, display->region_id); x_off = display->x_pos - x_pos; @@ -1282,7 +1255,7 @@ static void save_display_set(DVBSubContext *ctx) } - snprintf(filename, 32, "dvbs.%d", fileno_index); + snprintf(filename, sizeof(filename), "dvbs.%d", fileno_index); png_save2(filename, pbuf, width, height); @@ -1293,7 +1266,7 @@ static void save_display_set(DVBSubContext *ctx) } #endif -static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, +static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf, int buf_size, AVSubtitle *sub) { DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; @@ -1312,16 +1285,19 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, sub->num_rects = ctx->display_list_size; - if (sub->num_rects > 0) - sub->rects = av_mallocz(sizeof(AVSubtitleRect) * sub->num_rects); + if (sub->num_rects > 0){ + sub->rects = av_mallocz(sizeof(*sub->rects) * sub->num_rects); + for(i=0; inum_rects; i++) + sub->rects[i] = av_mallocz(sizeof(*sub->rects[i])); + } i = 0; - for (display = ctx->display_list; display != NULL; display = display->next) { + for (display = ctx->display_list; display; display = display->next) { region = get_region(ctx, display->region_id); - rect = &sub->rects[i]; + rect = sub->rects[i]; - if (region == NULL) + if (!region) continue; rect->x = display->x_pos; @@ -1329,11 +1305,11 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, rect->w = region->width; rect->h = region->height; rect->nb_colors = 16; - rect->linesize = region->width; + rect->pict.linesize[0] = region->width; clut = get_clut(ctx, region->clut); - if (clut == NULL) + if (!clut) clut = &default_clut; switch (region->depth) { @@ -1349,11 +1325,11 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, break; } - rect->rgba_palette = av_malloc((1 << region->depth) * sizeof(uint32_t)); - memcpy(rect->rgba_palette, clut_table, (1 << region->depth) * sizeof(uint32_t)); + rect->pict.data[1] = av_malloc((1 << region->depth) * sizeof(uint32_t)); + memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t)); - rect->bitmap = av_malloc(region->buf_size); - memcpy(rect->bitmap, region->pbuf, region->buf_size); + rect->pict.data[0] = av_malloc(region->buf_size); + memcpy(rect->pict.data[0], region->pbuf, region->buf_size); i++; } @@ -1369,11 +1345,13 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, static int dvbsub_decode(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; AVSubtitle *sub = (AVSubtitle*) data; - uint8_t *p, *p_end; + const uint8_t *p, *p_end; int segment_type; int page_id; int segment_length; @@ -1383,14 +1361,13 @@ static int dvbsub_decode(AVCodecContext *avctx, av_log(avctx, AV_LOG_INFO, "DVB sub packet:\n"); - for (i=0; i < buf_size; i++) - { + for (i=0; i < buf_size; i++) { av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]); if (i % 16 == 15) av_log(avctx, AV_LOG_INFO, "\n"); } - if (i % 16 != 0) + if (i % 16) av_log(avctx, AV_LOG_INFO, "\n"); #endif @@ -1401,13 +1378,12 @@ static int dvbsub_decode(AVCodecContext *avctx, p = buf; p_end = buf + buf_size; - while (p < p_end && *p == 0x0f) - { + while (p < p_end && *p == 0x0f) { p += 1; segment_type = *p++; - page_id = BE_16(p); + page_id = AV_RB16(p); p += 2; - segment_length = BE_16(p); + segment_length = AV_RB16(p); p += 2; if (page_id == ctx->composition_id || page_id == ctx->ancillary_id) { @@ -1439,8 +1415,7 @@ static int dvbsub_decode(AVCodecContext *avctx, p += segment_length; } - if (p != p_end) - { + if (p != p_end) { #ifdef DEBUG av_log(avctx, AV_LOG_INFO, "Junk at end of packet\n"); #endif @@ -1460,174 +1435,5 @@ AVCodec dvbsub_decoder = { NULL, dvbsub_close_decoder, dvbsub_decode, -}; - -/* Parser (mostly) copied from dvdsub.c */ - -#define PARSE_BUF_SIZE (65536) - - -/* parser definition */ -typedef struct DVBSubParseContext { - uint8_t *packet_buf; - int packet_start; - int packet_index; - int in_packet; -} DVBSubParseContext; - -static int dvbsub_parse_init(AVCodecParserContext *s) -{ - DVBSubParseContext *pc = s->priv_data; - pc->packet_buf = av_malloc(PARSE_BUF_SIZE); - - return 0; -} - -static int dvbsub_parse(AVCodecParserContext *s, - AVCodecContext *avctx, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size) -{ - DVBSubParseContext *pc = s->priv_data; - uint8_t *p, *p_end; - int len, buf_pos = 0; - -#ifdef DEBUG - av_log(avctx, AV_LOG_INFO, "DVB parse packet pts=%Lx, lpts=%Lx, cpts=%Lx:\n", - s->pts, s->last_pts, s->cur_frame_pts[s->cur_frame_start_index]); -#endif - -#ifdef DEBUG_PACKET_CONTENTS - int i; - - for (i=0; i < buf_size; i++) - { - av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]); - if (i % 16 == 15) - av_log(avctx, AV_LOG_INFO, "\n"); - } - - if (i % 16 != 0) - av_log(avctx, AV_LOG_INFO, "\n"); - -#endif - - *poutbuf = NULL; - *poutbuf_size = 0; - - s->fetch_timestamp = 1; - - if (s->last_pts != s->pts && s->last_pts != AV_NOPTS_VALUE) /* Start of a new packet */ - { - if (pc->packet_index != pc->packet_start) - { -#ifdef DEBUG - av_log(avctx, AV_LOG_INFO, "Discarding %d bytes\n", - pc->packet_index - pc->packet_start); -#endif - } - - pc->packet_start = 0; - pc->packet_index = 0; - - if (buf_size < 2 || buf[0] != 0x20 || buf[1] != 0x00) { -#ifdef DEBUG - av_log(avctx, AV_LOG_INFO, "Bad packet header\n"); -#endif - return -1; - } - - buf_pos = 2; - - pc->in_packet = 1; - } else { - if (pc->packet_start != 0) - { - if (pc->packet_index != pc->packet_start) - { - memmove(pc->packet_buf, pc->packet_buf + pc->packet_start, - pc->packet_index - pc->packet_start); - - pc->packet_index -= pc->packet_start; - pc->packet_start = 0; - } else { - pc->packet_start = 0; - pc->packet_index = 0; - } - } - } - - if (buf_size - buf_pos + pc->packet_index > PARSE_BUF_SIZE) - return -1; - -/* if not currently in a packet, discard data */ - if (pc->in_packet == 0) - return buf_size; - - memcpy(pc->packet_buf + pc->packet_index, buf + buf_pos, buf_size - buf_pos); - pc->packet_index += buf_size - buf_pos; - - p = pc->packet_buf; - p_end = pc->packet_buf + pc->packet_index; - - while (p < p_end) - { - if (*p == 0x0f) - { - if (p + 6 <= p_end) - { - len = BE_16(p + 4); - - if (p + len + 6 <= p_end) - { - *poutbuf_size += len + 6; - - p += len + 6; - } else - break; - } else - break; - } else if (*p == 0xff) { - if (p + 1 < p_end) - { -#ifdef DEBUG - av_log(avctx, AV_LOG_INFO, "Junk at end of packet\n"); -#endif - } - pc->packet_index = p - pc->packet_buf; - pc->in_packet = 0; - break; - } else { - av_log(avctx, AV_LOG_ERROR, "Junk in packet\n"); - - pc->packet_index = p - pc->packet_buf; - pc->in_packet = 0; - break; - } - } - - if (*poutbuf_size > 0) - { - *poutbuf = pc->packet_buf; - pc->packet_start = *poutbuf_size; - } - - if (s->last_pts == AV_NOPTS_VALUE) - s->last_pts = s->pts; - - return buf_size; -} - -static void dvbsub_parse_close(AVCodecParserContext *s) -{ - DVBSubParseContext *pc = s->priv_data; - av_freep(&pc->packet_buf); -} - -AVCodecParser dvbsub_parser = { - { CODEC_ID_DVB_SUBTITLE }, - sizeof(DVBSubParseContext), - dvbsub_parse_init, - dvbsub_parse, - dvbsub_parse_close, + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), };