*/
#include "avcodec.h"
-#include "get_bits.h"
+#include "bitstream.h"
#include "bytestream.h"
#include "internal.h"
#include "libavutil/colorspace.h"
#define cm (ff_crop_tab + MAX_NEG_CROP)
-#ifdef DEBUG
-#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);
- 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 = 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);
- 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 = 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);
- 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);
- system(command);
-
- snprintf(command, sizeof(command), "rm %s %s", fname, fname2);
- system(command);
-}
-#endif
-
#define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
typedef struct DVBSubCLUT {
/* 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)
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_init8(&bc, *srcbuf, buf_size);
- 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_init8(&bc, *srcbuf, buf_size);
- 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 (*(*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;
}
#ifdef DEBUG
-static void save_display_set(DVBSubContext *ctx)
+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;
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
+#endif /* DEBUG */
static int dvbsub_parse_display_definition_segment(AVCodecContext *avctx,
const uint8_t *buf,
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);
- if (!rect->pict.data[1]) {
+ rect->data[1] = av_mallocz(AVPALETTE_SIZE);
+ if (!rect->data[1]) {
av_free(sub->rects);
return AVERROR(ENOMEM);
}
- memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t));
+ memcpy(rect->data[1], clut_table, (1 << region->depth) * sizeof(uint32_t));
- rect->pict.data[0] = av_malloc(region->buf_size);
- if (!rect->pict.data[0]) {
- av_free(rect->pict.data[1]);
+ 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->pict.data[0], region->pbuf, region->buf_size);
+ memcpy(rect->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++;
}
projects / ffmpeg / blobdiff