int x_pos;
int y_pos;
- int fgcolour;
- int bgcolour;
+ int fgcolor;
+ int bgcolor;
struct DVBSubObjectDisplay *region_list_next;
struct DVBSubObjectDisplay *object_list_next;
int depth;
int clut;
- int bgcolour;
+ int bgcolor;
uint8_t *pbuf;
int buf_size;
{
DVBSubObject *ptr = ctx->object_list;
- while (ptr != NULL && ptr->id != object_id) {
+ while (ptr && ptr->id != object_id) {
ptr = ptr->next;
}
{
DVBSubCLUT *ptr = ctx->clut_list;
- while (ptr != NULL && ptr->id != clut_id) {
+ while (ptr && ptr->id != clut_id) {
ptr = ptr->next;
}
{
DVBSubRegion *ptr = ctx->region_list;
- while (ptr != NULL && ptr->id != region_id) {
+ while (ptr && ptr->id != region_id) {
ptr = ptr->next;
}
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;
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;
}
/* 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;
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;
}
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;
while (get_bits_count(&gb) < (buf_size << 8) && 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;
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;
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;
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;
}
} else if (bits == 1) {
pixels_read += 2;
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
return pixels_read;
}
} else {
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
}
}
- 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;
}
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;
while (get_bits_count(&gb) < (buf_size << 8) && 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;
run_length += 2;
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
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;
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;
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;
}
} else if (bits == 1) {
pixels_read += 2;
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
*destbuf++ = bits;
}
} else {
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
}
}
- 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;
}
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;
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;
return pixels_read;
}
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
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;
}
}
- if (*(*srcbuf)++ != 0)
+ if (*(*srcbuf)++)
av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n");
return pixels_read;
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;
#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);
av_log(avctx, AV_LOG_INFO, "\n");
}
- if (i % 16 != 0)
+ if (i % 16)
av_log(avctx, AV_LOG_INFO, "\n");
#endif
}
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 = AV_RB16(buf);
buf += 2;
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 = AV_RB16(buf);
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;
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) {*/
}
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;
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
clut = get_clut(ctx, clut_id);
- if (clut == NULL) {
+ if (!clut) {
clut = av_malloc(sizeof(DVBSubCLUT));
memcpy(clut, &default_clut, sizeof(DVBSubCLUT));
ctx->clut_list = clut;
}
- while (buf + 4 < buf_end)
- {
+ while (buf + 4 < buf_end) {
entry_id = *buf++;
depth = (*buf) & 0xe0;
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;
region = get_region(ctx, region_id);
- if (region == NULL)
- {
+ if (!region) {
region = av_mallocz(sizeof(DVBSubRegion));
region->id = region_id;
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;
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
#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
}
object = get_object(ctx, object_id);
- if (object == NULL) {
+ if (!object) {
object = av_mallocz(sizeof(DVBSubObject));
object->id = object_id;
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;
}
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;
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);
}
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;
#endif
}
- while (tmp_display_list != 0) {
+ while (tmp_display_list) {
display = tmp_display_list;
tmp_display_list = display->next;
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) {
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;
}
#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;
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];
- if (region == NULL)
+ if (!region)
continue;
rect->x = display->x_pos;
clut = get_clut(ctx, region->clut);
- if (clut == NULL)
+ if (!clut)
clut = &default_clut;
switch (region->depth) {
static int dvbsub_decode(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_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;
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
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 = AV_RB16(p);
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
NULL,
dvbsub_close_decoder,
dvbsub_decode,
+ .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
};