/*
- * DVB subtitle decoding for ffmpeg
- * Copyright (c) 2005 Ian Caulfield.
+ * DVB subtitle decoding
+ * Copyright (c) 2005 Ian Caulfield
*
- * 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 "dsputil.h"
-#include "bitstream.h"
-#include "colorspace.h"
-
-//#define DEBUG
-//#define DEBUG_PACKET_CONTENTS
-//#define DEBUG_SAVE_IMAGES
+#include "get_bits.h"
+#include "bytestream.h"
+#include "libavutil/colorspace.h"
#define DVBSUB_PAGE_SEGMENT 0x10
#define DVBSUB_REGION_SEGMENT 0x11
#define DVBSUB_CLUT_SEGMENT 0x12
#define DVBSUB_OBJECT_SEGMENT 0x13
+#define DVBSUB_DISPLAYDEFINITION_SEGMENT 0x14
#define DVBSUB_DISPLAY_SEGMENT 0x80
#define cm (ff_cropTbl + MAX_NEG_CROP)
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
#undef fprintf
+#undef perror
#if 0
static void png_save(const char *filename, uint8_t *bitmap, int w, int h,
uint32_t *rgba_palette)
f = fopen(fname, "w");
if (!f) {
perror(fname);
- exit(1);
+ return;
}
fprintf(f, "P6\n"
"%d %d\n"
f = fopen(fname2, "w");
if (!f) {
perror(fname2);
- exit(1);
+ return;
}
fprintf(f, "P5\n"
"%d %d\n"
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) {
perror(fname);
- exit(1);
+ return;
}
fprintf(f, "P6\n"
"%d %d\n"
fclose(f);
- snprintf(fname2, 40, "%s-a.pgm", filename);
+ snprintf(fname2, sizeof(fname2), "%s-a.pgm", filename);
f = fopen(fname2, "w");
if (!f) {
perror(fname2);
- exit(1);
+ return;
}
fprintf(f, "P5\n"
"%d %d\n"
}
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
-#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+#define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
typedef struct DVBSubCLUT {
int id;
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;
struct DVBSubRegion *next;
} DVBSubRegion;
+typedef struct DVBSubDisplayDefinition {
+ int version;
+
+ int x;
+ int y;
+ int width;
+ int height;
+} DVBSubDisplayDefinition;
+
typedef struct DVBSubContext {
int composition_id;
int ancillary_id;
int display_list_size;
DVBSubRegionDisplay *display_list;
+ DVBSubDisplayDefinition *display_definition;
} DVBSubContext;
{
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)
- av_free(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;
av_free(clut);
}
+ av_freep(&ctx->display_definition);
+
/* 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;
+ DVBSubContext *ctx = avctx->priv_data;
- memset(avctx->priv_data, 0, sizeof(DVBSubContext));
-
- ctx->composition_id = avctx->sub_id & 0xffff;
- ctx->ancillary_id = avctx->sub_id >> 16;
+ if (!avctx->extradata || avctx->extradata_size != 4) {
+ av_log(avctx, AV_LOG_WARNING, "Invalid extradata, subtitle streams may be combined!\n");
+ ctx->composition_id = -1;
+ ctx->ancillary_id = -1;
+ } else {
+ ctx->composition_id = AV_RB16(avctx->extradata);
+ ctx->ancillary_id = AV_RB16(avctx->extradata + 2);
+ }
default_clut.id = -1;
default_clut.next = NULL;
return 0;
}
-static int dvbsub_close_decoder(AVCodecContext *avctx)
+static av_cold int dvbsub_close_decoder(AVCodecContext *avctx)
{
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
+ DVBSubContext *ctx = 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;
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);
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 {
- bits = get_bits(&gb, 1);
+ bits = get_bits1(&gb);
if (bits == 0) {
bits = get_bits(&gb, 2);
if (bits == 2) {
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;
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);
run_length += 2;
- if (map_table != NULL)
+ if (map_table)
bits = map_table[0];
else
bits = 0;
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);
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;
+ DVBSubContext *ctx = 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;
0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
uint8_t *map_table;
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "DVB pixel block size %d, %s field:\n", buf_size,
- top_bottom ? "bottom" : "top");
-#endif
+ av_dlog(avctx, "DVB pixel block size %d, %s field:\n", buf_size,
+ top_bottom ? "bottom" : "top");
-#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_dlog(avctx, "0x%8p: ", buf+i);
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ av_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ av_dlog(avctx, "\n");
}
- if (i % 16 != 0)
- av_log(avctx, AV_LOG_INFO, "\n");
-
-#endif
+ if (i % 16)
+ av_dlog(avctx, "\n");
if (region == 0)
return;
map_table = NULL;
x_pos += dvbsub_read_2bit_string(pbuf + (y_pos * region->width) + x_pos,
- region->width - x_pos, &buf, buf_size,
+ region->width - x_pos, &buf, buf_end - buf,
non_mod, map_table);
break;
case 0x11:
map_table = NULL;
x_pos += dvbsub_read_4bit_string(pbuf + (y_pos * region->width) + x_pos,
- region->width - x_pos, &buf, buf_size,
+ region->width - x_pos, &buf, buf_end - buf,
non_mod, map_table);
break;
case 0x12:
}
x_pos += dvbsub_read_8bit_string(pbuf + (y_pos * region->width) + x_pos,
- region->width - x_pos, &buf, buf_size,
+ region->width - x_pos, &buf, buf_end - buf,
non_mod, NULL);
break;
}
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;
+ DVBSubContext *ctx = 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;
+ DVBSubContext *ctx = avctx->priv_data;
- uint8_t *buf_end = buf + buf_size;
- int clut_id;
+ const uint8_t *buf_end = buf + buf_size;
+ int i, clut_id;
DVBSubCLUT *clut;
int entry_id, depth , full_range;
int y, cr, cb, alpha;
int r, g, b, r_add, g_add, b_add;
-#ifdef DEBUG_PACKET_CONTENTS
- int i;
-
- av_log(avctx, AV_LOG_INFO, "DVB clut packet:\n");
+ av_dlog(avctx, "DVB clut packet:\n");
- for (i=0; i < buf_size; i++)
- {
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ for (i=0; i < buf_size; i++) {
+ av_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ av_dlog(avctx, "\n");
}
- if (i % 16 != 0)
- av_log(avctx, AV_LOG_INFO, "\n");
-
-#endif
+ if (i % 16)
+ av_dlog(avctx, "\n");
clut_id = *buf++;
buf += 1;
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;
YUV_TO_RGB1_CCIR(cb, cr);
YUV_TO_RGB2_CCIR(r, g, b, y);
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "clut %d := (%d,%d,%d,%d)\n", entry_id, r, g, b, alpha);
-#endif
+ av_dlog(avctx, "clut %d := (%d,%d,%d,%d)\n", entry_id, r, g, b, alpha);
if (depth & 0x80)
clut->clut4[entry_id] = RGBA(r,g,b,255 - alpha);
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;
+ DVBSubContext *ctx = 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)
- av_free(region->pbuf);
+ av_free(region->pbuf);
region->buf_size = region->width * region->height;
}
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
- av_log(avctx, AV_LOG_INFO, "Region %d, (%dx%d)\n", region_id, region->width, region->height);
-#endif
+ av_dlog(avctx, "Region %d, (%dx%d)\n", region_id, region->width, region->height);
if (fill) {
- memset(region->pbuf, region->bgcolour, region->buf_size);
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolour);
-#endif
+ memset(region->pbuf, region->bgcolor, region->buf_size);
+ av_dlog(avctx, "Fill region (%d)\n", region->bgcolor);
}
delete_region_display_list(ctx, region);
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;
+ DVBSubContext *ctx = 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;
ctx->time_out = *buf++;
page_state = ((*buf++) >> 2) & 3;
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "Page time out %ds, state %d\n", ctx->time_out, page_state);
-#endif
+ av_dlog(avctx, "Page time out %ds, state %d\n", ctx->time_out, page_state);
- 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;
ctx->display_list = display;
ctx->display_list_size++;
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "Region %d, (%d,%d)\n", region_id, display->x_pos, display->y_pos);
-#endif
+ av_dlog(avctx, "Region %d, (%d,%d)\n", region_id, display->x_pos, display->y_pos);
}
- while (tmp_display_list != 0) {
+ while (tmp_display_list) {
display = tmp_display_list;
tmp_display_list = display->next;
}
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
static void save_display_set(DVBSubContext *ctx)
{
DVBSubRegion *region;
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;
}
- snprintf(filename, 32, "dvbs.%d", fileno_index);
+ snprintf(filename, sizeof(filename), "dvbs.%d", fileno_index);
png_save2(filename, pbuf, width, height);
}
#endif
-static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf,
+static void dvbsub_parse_display_definition_segment(AVCodecContext *avctx,
+ const uint8_t *buf,
+ int buf_size)
+{
+ DVBSubContext *ctx = avctx->priv_data;
+ DVBSubDisplayDefinition *display_def = ctx->display_definition;
+ int dds_version, info_byte;
+
+ if (buf_size < 5)
+ return;
+
+ info_byte = bytestream_get_byte(&buf);
+ dds_version = info_byte >> 4;
+ if (display_def && display_def->version == dds_version)
+ return; // already have this display definition version
+
+ if (!display_def) {
+ display_def = av_mallocz(sizeof(*display_def));
+ ctx->display_definition = display_def;
+ }
+ if (!display_def)
+ return;
+
+ display_def->version = dds_version;
+ display_def->x = 0;
+ display_def->y = 0;
+ display_def->width = bytestream_get_be16(&buf) + 1;
+ display_def->height = bytestream_get_be16(&buf) + 1;
+
+ if (buf_size < 13)
+ return;
+
+ if (info_byte & 1<<3) { // display_window_flag
+ display_def->x = bytestream_get_be16(&buf);
+ display_def->y = bytestream_get_be16(&buf);
+ display_def->width = bytestream_get_be16(&buf) - display_def->x + 1;
+ display_def->height = bytestream_get_be16(&buf) - display_def->y + 1;
+ }
+}
+
+static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
int buf_size, AVSubtitle *sub)
{
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
+ DVBSubContext *ctx = avctx->priv_data;
+ DVBSubDisplayDefinition *display_def = ctx->display_definition;
DVBSubRegion *region;
DVBSubRegionDisplay *display;
DVBSubCLUT *clut;
uint32_t *clut_table;
int i;
+ int offset_x=0, offset_y=0;
sub->rects = NULL;
sub->start_display_time = 0;
sub->end_display_time = ctx->time_out * 1000;
sub->format = 0;
+ if (display_def) {
+ offset_x = display_def->x;
+ offset_y = display_def->y;
+ }
+
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; i<sub->num_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;
- rect->y = display->y_pos;
+ rect->x = display->x_pos + offset_x;
+ rect->y = display->y_pos + offset_y;
rect->w = region->width;
rect->h = region->height;
rect->nb_colors = 16;
- rect->linesize = region->width;
+ rect->type = SUBTITLE_BITMAP;
+ rect->pict.linesize[0] = region->width;
clut = get_clut(ctx, region->clut);
- if (clut == NULL)
+ if (!clut)
clut = &default_clut;
switch (region->depth) {
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_mallocz(AVPALETTE_SIZE);
+ 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++;
}
sub->num_rects = i;
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
save_display_set(ctx);
#endif
static int dvbsub_decode(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
- AVSubtitle *sub = (AVSubtitle*) data;
- uint8_t *p, *p_end;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ DVBSubContext *ctx = avctx->priv_data;
+ AVSubtitle *sub = data;
+ const uint8_t *p, *p_end;
int segment_type;
int page_id;
int segment_length;
-
-#ifdef DEBUG_PACKET_CONTENTS
int i;
- av_log(avctx, AV_LOG_INFO, "DVB sub packet:\n");
+ av_dlog(avctx, "DVB sub packet:\n");
- for (i=0; i < buf_size; i++)
- {
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ for (i=0; i < buf_size; i++) {
+ av_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ av_dlog(avctx, "\n");
}
- if (i % 16 != 0)
- av_log(avctx, AV_LOG_INFO, "\n");
+ if (i % 16)
+ av_dlog(avctx, "\n");
-#endif
-
- if (buf_size <= 2)
+ if (buf_size <= 6 || *buf != 0x0f) {
+ av_dlog(avctx, "incomplete or broken packet");
return -1;
+ }
p = buf;
p_end = buf + buf_size;
- while (p < p_end && *p == 0x0f)
- {
+ while (p_end - p >= 6 && *p == 0x0f) {
p += 1;
segment_type = *p++;
page_id = AV_RB16(p);
segment_length = AV_RB16(p);
p += 2;
- if (page_id == ctx->composition_id || page_id == ctx->ancillary_id) {
+ if (p_end - p < segment_length) {
+ av_dlog(avctx, "incomplete or broken packet");
+ return -1;
+ }
+
+ if (page_id == ctx->composition_id || page_id == ctx->ancillary_id ||
+ ctx->composition_id == -1 || ctx->ancillary_id == -1) {
switch (segment_type) {
case DVBSUB_PAGE_SEGMENT:
dvbsub_parse_page_segment(avctx, p, segment_length);
case DVBSUB_OBJECT_SEGMENT:
dvbsub_parse_object_segment(avctx, p, segment_length);
break;
+ case DVBSUB_DISPLAYDEFINITION_SEGMENT:
+ dvbsub_parse_display_definition_segment(avctx, p, segment_length);
case DVBSUB_DISPLAY_SEGMENT:
*data_size = dvbsub_display_end_segment(avctx, p, segment_length, sub);
break;
default:
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "Subtitling segment type 0x%x, page id %d, length %d\n",
+ av_dlog(avctx, "Subtitling segment type 0x%x, page id %d, length %d\n",
segment_type, page_id, segment_length);
-#endif
break;
}
}
p += segment_length;
}
- if (p != p_end)
- {
-#ifdef DEBUG
- av_log(avctx, AV_LOG_INFO, "Junk at end of packet\n");
-#endif
- return -1;
- }
-
- return buf_size;
+ return p - buf;
}
-AVCodec dvbsub_decoder = {
- "dvbsub",
- CODEC_TYPE_SUBTITLE,
- CODEC_ID_DVB_SUBTITLE,
- sizeof(DVBSubContext),
- dvbsub_init_decoder,
- NULL,
- dvbsub_close_decoder,
- dvbsub_decode,
+AVCodec ff_dvbsub_decoder = {
+ .name = "dvbsub",
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .id = AV_CODEC_ID_DVB_SUBTITLE,
+ .priv_data_size = sizeof(DVBSubContext),
+ .init = dvbsub_init_decoder,
+ .close = dvbsub_close_decoder,
+ .decode = dvbsub_decode,
+ .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
};
projects / ffmpeg / blobdiff