/*
- * DVB subtitle decoding for ffmpeg
+ * 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 "get_bits.h"
-#include "colorspace.h"
-//#define DEBUG
-//#define DEBUG_PACKET_CONTENTS
-//#define DEBUG_SAVE_IMAGES
+#include "avcodec.h"
+#include "bitstream.h"
+#include "bytestream.h"
+#include "internal.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
-#undef fprintf
-#if 0
-static void png_save(const char *filename, uint8_t *bitmap, int w, int h,
- uint32_t *rgba_palette)
-{
- int x, y, v;
- FILE *f;
- char fname[40], fname2[40];
- char command[1024];
-
- snprintf(fname, 40, "%s.ppm", filename);
-
- f = fopen(fname, "w");
- if (!f) {
- perror(fname);
- exit(1);
- }
- fprintf(f, "P6\n"
- "%d %d\n"
- "%d\n",
- w, h, 255);
- for(y = 0; y < h; y++) {
- for(x = 0; x < w; x++) {
- v = rgba_palette[bitmap[y * w + x]];
- putc((v >> 16) & 0xff, f);
- putc((v >> 8) & 0xff, f);
- putc((v >> 0) & 0xff, f);
- }
- }
- fclose(f);
-
-
- snprintf(fname2, 40, "%s-a.pgm", filename);
-
- f = fopen(fname2, "w");
- if (!f) {
- perror(fname2);
- exit(1);
- }
- fprintf(f, "P5\n"
- "%d %d\n"
- "%d\n",
- w, h, 255);
- for(y = 0; y < h; y++) {
- for(x = 0; x < w; x++) {
- v = rgba_palette[bitmap[y * w + x]];
- putc((v >> 24) & 0xff, f);
- }
- }
- fclose(f);
-
- snprintf(command, 1024, "pnmtopng -alpha %s %s > %s.png 2> /dev/null", fname2, fname, filename);
- system(command);
-
- snprintf(command, 1024, "rm %s %s", fname, fname2);
- system(command);
-}
-#endif
-
-static void png_save2(const char *filename, uint32_t *bitmap, int w, int h)
-{
- int x, y, v;
- FILE *f;
- char fname[40], fname2[40];
- char command[1024];
-
- snprintf(fname, sizeof(fname), "%s.ppm", filename);
-
- f = fopen(fname, "w");
- if (!f) {
- perror(fname);
- exit(1);
- }
- fprintf(f, "P6\n"
- "%d %d\n"
- "%d\n",
- w, h, 255);
- for(y = 0; y < h; y++) {
- for(x = 0; x < w; x++) {
- v = bitmap[y * w + x];
- putc((v >> 16) & 0xff, f);
- putc((v >> 8) & 0xff, f);
- putc((v >> 0) & 0xff, f);
- }
- }
- fclose(f);
-
-
- snprintf(fname2, sizeof(fname2), "%s-a.pgm", filename);
-
- f = fopen(fname2, "w");
- if (!f) {
- perror(fname2);
- exit(1);
- }
- fprintf(f, "P5\n"
- "%d %d\n"
- "%d\n",
- w, h, 255);
- for(y = 0; y < h; y++) {
- for(x = 0; x < w; x++) {
- v = bitmap[y * w + x];
- putc((v >> 24) & 0xff, f);
- }
- }
- fclose(f);
-
- snprintf(command, sizeof(command), "pnmtopng -alpha %s %s > %s.png 2> /dev/null", fname2, fname, filename);
- system(command);
+#define cm (ff_crop_tab + MAX_NEG_CROP)
- 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;
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;
ctx->region_list = region->next;
delete_region_display_list(ctx, region);
- if (region->pbuf)
- av_free(region->pbuf);
-
+ av_free(region->pbuf);
av_free(region);
}
av_free(clut);
}
+ av_freep(&ctx->display_definition);
+
/* Should already be null */
if (ctx->object_list)
- av_log(0, AV_LOG_ERROR, "Memory deallocation error!\n");
+ av_log(NULL, AV_LOG_ERROR, "Memory deallocation error!\n");
}
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;
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);
const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table)
{
- GetBitContext gb;
+ BitstreamContext bc;
int bits;
int run_length;
int pixels_read = 0;
- init_get_bits(&gb, *srcbuf, buf_size << 3);
+ bitstream_init(&bc, *srcbuf, buf_size << 3);
- while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) {
- bits = get_bits(&gb, 2);
+ while (bitstream_tell(&bc) < buf_size << 3 && pixels_read < dbuf_len) {
+ bits = bitstream_read(&bc, 2);
if (bits) {
if (non_mod != 1 || bits != 1) {
}
pixels_read++;
} else {
- bits = get_bits1(&gb);
+ bits = bitstream_read_bit(&bc);
if (bits == 1) {
- run_length = get_bits(&gb, 3) + 3;
- bits = get_bits(&gb, 2);
+ run_length = bitstream_read(&bc, 3) + 3;
+ bits = bitstream_read(&bc, 2);
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
}
}
} else {
- bits = get_bits1(&gb);
+ bits = bitstream_read_bit(&bc);
if (bits == 0) {
- bits = get_bits(&gb, 2);
+ bits = bitstream_read(&bc, 2);
if (bits == 2) {
- run_length = get_bits(&gb, 4) + 12;
- bits = get_bits(&gb, 2);
+ run_length = bitstream_read(&bc, 4) + 12;
+ bits = bitstream_read(&bc, 2);
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
}
}
} else if (bits == 3) {
- run_length = get_bits(&gb, 8) + 29;
- bits = get_bits(&gb, 2);
+ run_length = bitstream_read(&bc, 8) + 29;
+ bits = bitstream_read(&bc, 2);
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
*destbuf++ = bits;
}
} else {
- (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
+ *srcbuf += (bitstream_tell(&bc) + 7) >> 3;
return pixels_read;
}
} else {
}
}
- if (get_bits(&gb, 6))
- av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n");
+ if (bitstream_read(&bc, 6))
+ av_log(NULL, AV_LOG_ERROR, "DVBSub error: line overflow\n");
- (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
+ *srcbuf += (bitstream_tell(&bc) + 7) >> 3;
return pixels_read;
}
const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table)
{
- GetBitContext gb;
+ BitstreamContext bc;
int bits;
int run_length;
int pixels_read = 0;
- init_get_bits(&gb, *srcbuf, buf_size << 3);
+ bitstream_init(&bc, *srcbuf, buf_size << 3);
- while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) {
- bits = get_bits(&gb, 4);
+ while (bitstream_tell(&bc) < buf_size << 3 && pixels_read < dbuf_len) {
+ bits = bitstream_read(&bc, 4);
if (bits) {
if (non_mod != 1 || bits != 1) {
}
pixels_read++;
} else {
- bits = get_bits1(&gb);
+ bits = bitstream_read_bit(&bc);
if (bits == 0) {
- run_length = get_bits(&gb, 3);
+ run_length = bitstream_read(&bc, 3);
if (run_length == 0) {
- (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
+ *srcbuf += (bitstream_tell(&bc) + 7) >> 3;
return pixels_read;
}
pixels_read++;
}
} else {
- bits = get_bits1(&gb);
+ bits = bitstream_read_bit(&bc);
if (bits == 0) {
- run_length = get_bits(&gb, 2) + 4;
- bits = get_bits(&gb, 4);
+ run_length = bitstream_read(&bc, 2) + 4;
+ bits = bitstream_read(&bc, 4);
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
}
}
} else {
- bits = get_bits(&gb, 2);
+ bits = bitstream_read(&bc, 2);
if (bits == 2) {
- run_length = get_bits(&gb, 4) + 9;
- bits = get_bits(&gb, 4);
+ run_length = bitstream_read(&bc, 4) + 9;
+ bits = bitstream_read(&bc, 4);
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
}
}
} else if (bits == 3) {
- run_length = get_bits(&gb, 8) + 25;
- bits = get_bits(&gb, 4);
+ run_length = bitstream_read(&bc, 8) + 25;
+ bits = bitstream_read(&bc, 4);
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
}
}
- if (get_bits(&gb, 8))
- av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n");
+ if (bitstream_read(&bc, 8))
+ av_log(NULL, AV_LOG_ERROR, "DVBSub error: line overflow\n");
- (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
+ *srcbuf += (bitstream_tell(&bc) + 7) >> 3;
return pixels_read;
}
if (run_length == 0) {
return pixels_read;
}
-
- if (map_table)
- bits = map_table[0];
- else
- bits = 0;
- while (run_length-- > 0 && pixels_read < dbuf_len) {
- *destbuf++ = bits;
- pixels_read++;
- }
} else {
bits = *(*srcbuf)++;
if (non_mod == 1 && bits == 1)
pixels_read += run_length;
- if (map_table)
- bits = map_table[bits];
- else while (run_length-- > 0 && pixels_read < dbuf_len) {
- *destbuf++ = bits;
- pixels_read++;
- }
+ }
+ if (map_table)
+ bits = map_table[0];
+ else
+ bits = 0;
+ while (run_length-- > 0 && pixels_read < dbuf_len) {
+ *destbuf++ = bits;
+ pixels_read++;
}
}
}
if (*(*srcbuf)++)
- av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n");
+ av_log(NULL, AV_LOG_ERROR, "DVBSub error: line overflow\n");
return pixels_read;
}
static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,
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);
const uint8_t *buf_end = buf + buf_size;
0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
uint8_t *map_table;
- dprintf(avctx, "DVB pixel block size %d, %s field:\n", buf_size,
+ ff_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++) {
if (i % 16 == 0)
- av_log(avctx, AV_LOG_INFO, "0x%08p: ", buf+i);
+ ff_dlog(avctx, "0x%8p: ", buf+i);
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ ff_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ ff_dlog(avctx, "\n");
}
if (i % 16)
- av_log(avctx, AV_LOG_INFO, "\n");
-
-#endif
+ ff_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,
- const uint8_t *buf, int buf_size)
+static int dvbsub_parse_object_segment(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
{
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
+ DVBSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
const uint8_t *block;
object = get_object(ctx, object_id);
if (!object)
- return;
+ return AVERROR_INVALIDDATA;
coding_method = ((*buf) >> 2) & 3;
non_modifying_color = ((*buf++) >> 1) & 1;
if (buf + top_field_len + bottom_field_len > buf_end) {
av_log(avctx, AV_LOG_ERROR, "Field data size too large\n");
- return;
+ return AVERROR_INVALIDDATA;
}
for (display = object->display_list; display; display = display->object_list_next) {
av_log(avctx, AV_LOG_ERROR, "Unknown object coding %d\n", coding_method);
}
+ return 0;
}
-static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
+static int dvbsub_parse_clut_segment(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
{
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
+ DVBSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
- int clut_id;
+ 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");
+ ff_dlog(avctx, "DVB clut packet:\n");
for (i=0; i < buf_size; i++) {
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ ff_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ ff_dlog(avctx, "\n");
}
if (i % 16)
- av_log(avctx, AV_LOG_INFO, "\n");
-
-#endif
+ ff_dlog(avctx, "\n");
clut_id = *buf++;
buf += 1;
if (!clut) {
clut = av_malloc(sizeof(DVBSubCLUT));
+ if (!clut)
+ return AVERROR(ENOMEM);
memcpy(clut, &default_clut, sizeof(DVBSubCLUT));
if (depth == 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid clut depth 0x%x!\n", *buf);
- return;
+ return AVERROR_INVALIDDATA;
}
full_range = (*buf++) & 1;
YUV_TO_RGB1_CCIR(cb, cr);
YUV_TO_RGB2_CCIR(r, g, b, y);
- dprintf(avctx, "clut %d := (%d,%d,%d,%d)\n", entry_id, r, g, b, alpha);
+ ff_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);
if (depth & 0x20)
clut->clut256[entry_id] = RGBA(r,g,b,255 - alpha);
}
+
+ return 0;
}
-static void dvbsub_parse_region_segment(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
+static int dvbsub_parse_region_segment(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
{
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
+ DVBSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
int region_id, object_id;
int fill;
if (buf_size < 10)
- return;
+ return AVERROR_INVALIDDATA;
region_id = *buf++;
if (!region) {
region = av_mallocz(sizeof(DVBSubRegion));
+ if (!region)
+ return AVERROR(ENOMEM);
region->id = region_id;
buf += 2;
if (region->width * region->height != region->buf_size) {
- if (region->pbuf)
- av_free(region->pbuf);
+ av_free(region->pbuf);
region->buf_size = region->width * region->height;
region->pbuf = av_malloc(region->buf_size);
+ if (!region->pbuf)
+ return AVERROR(ENOMEM);
fill = 1;
}
region->bgcolor = (((*buf++) >> 2) & 3);
}
- dprintf(avctx, "Region %d, (%dx%d)\n", region_id, region->width, region->height);
+ ff_dlog(avctx, "Region %d, (%dx%d)\n", region_id, region->width, region->height);
if (fill) {
memset(region->pbuf, region->bgcolor, region->buf_size);
- dprintf(avctx, "Fill region (%d)\n", region->bgcolor);
+ ff_dlog(avctx, "Fill region (%d)\n", region->bgcolor);
}
delete_region_display_list(ctx, region);
if (!object) {
object = av_mallocz(sizeof(DVBSubObject));
+ if (!object)
+ return AVERROR(ENOMEM);
object->id = object_id;
object->next = ctx->object_list;
object->type = (*buf) >> 6;
display = av_mallocz(sizeof(DVBSubObjectDisplay));
+ if (!display)
+ return AVERROR(ENOMEM);
display->object_id = object_id;
display->region_id = region_id;
display->object_list_next = object->display_list;
object->display_list = display;
}
+
+ return 0;
}
-static void dvbsub_parse_page_segment(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
+static int dvbsub_parse_page_segment(AVCodecContext *avctx,
+ 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;
int page_state;
if (buf_size < 1)
- return;
+ return AVERROR_INVALIDDATA;
ctx->time_out = *buf++;
page_state = ((*buf++) >> 2) & 3;
- dprintf(avctx, "Page time out %ds, state %d\n", ctx->time_out, page_state);
+ ff_dlog(avctx, "Page time out %ds, state %d\n", ctx->time_out, page_state);
if (page_state == 2) {
delete_state(ctx);
display = display->next;
}
- if (!display)
+ if (!display) {
display = av_mallocz(sizeof(DVBSubRegionDisplay));
+ if (!display)
+ return AVERROR(ENOMEM);
+ }
display->region_id = region_id;
ctx->display_list = display;
ctx->display_list_size++;
- dprintf(avctx, "Region %d, (%d,%d)\n", region_id, display->x_pos, display->y_pos);
+ ff_dlog(avctx, "Region %d, (%d,%d)\n", region_id, display->x_pos, display->y_pos);
}
while (tmp_display_list) {
av_free(display);
}
+ return 0;
}
-#ifdef DEBUG_SAVE_IMAGES
-static void save_display_set(DVBSubContext *ctx)
+#ifdef DEBUG
+static void png_save(const char *filename, uint32_t *bitmap, int w, int h)
+{
+ int x, y, v;
+ FILE *f;
+ char fname[40], fname2[40];
+ char command[1024];
+
+ snprintf(fname, sizeof(fname), "%s.ppm", filename);
+
+ f = fopen(fname, "w");
+ if (!f) {
+ perror(fname);
+ return;
+ }
+ fprintf(f, "P6\n"
+ "%d %d\n"
+ "%d\n",
+ w, h, 255);
+ for(y = 0; y < h; y++) {
+ for(x = 0; x < w; x++) {
+ v = bitmap[y * w + x];
+ putc((v >> 16) & 0xff, f);
+ putc((v >> 8) & 0xff, f);
+ putc((v >> 0) & 0xff, f);
+ }
+ }
+ fclose(f);
+
+
+ snprintf(fname2, sizeof(fname2), "%s-a.pgm", filename);
+
+ f = fopen(fname2, "w");
+ if (!f) {
+ perror(fname2);
+ return;
+ }
+ fprintf(f, "P5\n"
+ "%d %d\n"
+ "%d\n",
+ w, h, 255);
+ for(y = 0; y < h; y++) {
+ for(x = 0; x < w; x++) {
+ v = bitmap[y * w + x];
+ putc((v >> 24) & 0xff, f);
+ }
+ }
+ fclose(f);
+
+ snprintf(command, sizeof(command), "pnmtopng -alpha %s %s > %s.png 2> /dev/null", fname2, fname, filename);
+ if (system(command) != 0) {
+ printf("Error running pnmtopng\n");
+ return;
+ }
+
+ snprintf(command, sizeof(command), "rm %s %s", fname, fname2);
+ if (system(command) != 0) {
+ printf("Error removing %s and %s\n", fname, fname2);
+ return;
+ }
+}
+
+static int save_display_set(DVBSubContext *ctx)
{
DVBSubRegion *region;
DVBSubRegionDisplay *display;
if (x_pos >= 0) {
pbuf = av_malloc(width * height * 4);
+ if (!pbuf)
+ return AVERROR(ENOMEM);
for (display = ctx->display_list; display; display = display->next) {
region = get_region(ctx, display->region_id);
snprintf(filename, sizeof(filename), "dvbs.%d", fileno_index);
- png_save2(filename, pbuf, width, height);
+ png_save(filename, pbuf, width, height);
av_free(pbuf);
}
fileno_index++;
+ return 0;
+}
+#endif /* DEBUG */
+
+static int 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 AVERROR_INVALIDDATA;
+
+ info_byte = bytestream_get_byte(&buf);
+ dds_version = info_byte >> 4;
+ if (display_def && display_def->version == dds_version)
+ return 0; // already have this display definition version
+
+ if (!display_def) {
+ display_def = av_mallocz(sizeof(*display_def));
+ if (!display_def)
+ return AVERROR(ENOMEM);
+ ctx->display_definition = display_def;
+ }
+
+ 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 AVERROR_INVALIDDATA;
+
+ 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;
+ }
+
+ return 0;
}
-#endif
static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
- int buf_size, AVSubtitle *sub)
+ 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)
+ return AVERROR_INVALIDDATA;
- 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]));
- }
+ sub->rects = av_mallocz_array(sub->num_rects * sub->num_rects,
+ sizeof(*sub->rects));
+ if (!sub->rects)
+ return AVERROR(ENOMEM);
i = 0;
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->type = SUBTITLE_BITMAP;
- rect->pict.linesize[0] = region->width;
+ rect->linesize[0] = region->width;
clut = get_clut(ctx, region->clut);
break;
}
- rect->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
- memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t));
+ rect->data[1] = av_mallocz(AVPALETTE_SIZE);
+ if (!rect->data[1]) {
+ av_free(sub->rects);
+ return AVERROR(ENOMEM);
+ }
+ memcpy(rect->data[1], clut_table, (1 << region->depth) * sizeof(uint32_t));
+
+ rect->data[0] = av_malloc(region->buf_size);
+ if (!rect->data[0]) {
+ av_free(rect->data[1]);
+ av_free(sub->rects);
+ return AVERROR(ENOMEM);
+ }
+ memcpy(rect->data[0], region->pbuf, region->buf_size);
- rect->pict.data[0] = av_malloc(region->buf_size);
- memcpy(rect->pict.data[0], region->pbuf, region->buf_size);
+#if FF_API_AVPICTURE
+FF_DISABLE_DEPRECATION_WARNINGS
+{
+ int j;
+ for (j = 0; j < 4; j++) {
+ rect->pict.data[j] = rect->data[j];
+ rect->pict.linesize[j] = rect->linesize[j];
+ }
+}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
i++;
}
sub->num_rects = i;
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
save_display_set(ctx);
#endif
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
- AVSubtitle *sub = (AVSubtitle*) data;
+ 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");
+ ff_dlog(avctx, "DVB sub packet:\n");
for (i=0; i < buf_size; i++) {
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ ff_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ ff_dlog(avctx, "\n");
}
if (i % 16)
- av_log(avctx, AV_LOG_INFO, "\n");
-
-#endif
+ ff_dlog(avctx, "\n");
- if (buf_size <= 2)
- return -1;
+ if (buf_size <= 6 || *buf != 0x0f) {
+ ff_dlog(avctx, "incomplete or broken packet");
+ return AVERROR_INVALIDDATA;
+ }
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) {
+ ff_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) {
+ int ret = 0;
switch (segment_type) {
case DVBSUB_PAGE_SEGMENT:
- dvbsub_parse_page_segment(avctx, p, segment_length);
+ ret = dvbsub_parse_page_segment(avctx, p, segment_length);
break;
case DVBSUB_REGION_SEGMENT:
- dvbsub_parse_region_segment(avctx, p, segment_length);
+ ret = dvbsub_parse_region_segment(avctx, p, segment_length);
break;
case DVBSUB_CLUT_SEGMENT:
- dvbsub_parse_clut_segment(avctx, p, segment_length);
+ ret = dvbsub_parse_clut_segment(avctx, p, segment_length);
break;
case DVBSUB_OBJECT_SEGMENT:
- dvbsub_parse_object_segment(avctx, p, segment_length);
+ ret = dvbsub_parse_object_segment(avctx, p, segment_length);
+ break;
+ case DVBSUB_DISPLAYDEFINITION_SEGMENT:
+ ret = dvbsub_parse_display_definition_segment(avctx, p,
+ segment_length);
break;
case DVBSUB_DISPLAY_SEGMENT:
- *data_size = dvbsub_display_end_segment(avctx, p, segment_length, sub);
+ ret = dvbsub_display_end_segment(avctx, p, segment_length, sub);
+ *data_size = ret;
break;
default:
- dprintf(avctx, "Subtitling segment type 0x%x, page id %d, length %d\n",
+ ff_dlog(avctx, "Subtitling segment type 0x%x, page id %d, length %d\n",
segment_type, page_id, segment_length);
break;
}
+ if (ret < 0)
+ return ret;
}
p += segment_length;
}
- if (p != p_end) {
- dprintf(avctx, "Junk at end of packet\n");
- 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,
- .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
+AVCodec ff_dvbsub_decoder = {
+ .name = "dvbsub",
+ .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
+ .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,
};