#include "libavutil/colorspace.h"
#include "libavutil/imgutils.h"
-//#define DEBUG_PACKET_CONTENTS
-
#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
enum SegmentType {
int y;
int id_number;
int object_number;
+ uint8_t composition_flag;
} PGSSubPresentation;
typedef struct PGSSubPicture {
static av_cold int init_decoder(AVCodecContext *avctx)
{
- avctx->pix_fmt = PIX_FMT_PAL8;
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
return 0;
}
/* Make sure the bitmap is not too large */
if (avctx->width < width || avctx->height < height) {
- av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger then video.\n");
+ av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger than video.\n");
return -1;
}
while (buf < buf_end) {
color_id = bytestream_get_byte(&buf);
y = bytestream_get_byte(&buf);
- cb = bytestream_get_byte(&buf);
cr = bytestream_get_byte(&buf);
+ cb = bytestream_get_byte(&buf);
alpha = bytestream_get_byte(&buf);
YUV_TO_RGB1(cb, cr);
buf += 3;
ctx->presentation.object_number = bytestream_get_byte(&buf);
+ ctx->presentation.composition_flag = 0;
if (!ctx->presentation.object_number)
return;
/*
- * Skip 4 bytes of unknown:
+ * Skip 3 bytes of unknown:
* object_id_ref (2 bytes),
* window_id_ref,
- * composition_flag (0x80 - object cropped, 0x40 - object forced)
*/
- buf += 4;
+ buf += 3;
+ ctx->presentation.composition_flag = bytestream_get_byte(&buf);
x = bytestream_get_be16(&buf);
y = bytestream_get_be16(&buf);
sub->rects[0] = av_mallocz(sizeof(*sub->rects[0]));
sub->num_rects = 1;
+ if (ctx->presentation.composition_flag & 0x40)
+ sub->rects[0]->flags |= AV_SUBTITLE_FLAG_FORCED;
+
sub->rects[0]->x = ctx->presentation.x;
sub->rects[0]->y = ctx->presentation.y;
sub->rects[0]->w = ctx->picture.w;
const uint8_t *buf_end;
uint8_t segment_type;
int segment_length;
-
-#ifdef DEBUG_PACKET_CONTENTS
int i;
- av_log(avctx, AV_LOG_INFO, "PGS sub packet:\n");
+ av_dlog(avctx, "PGS sub packet:\n");
for (i = 0; i < buf_size; 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 & 15)
- av_log(avctx, AV_LOG_INFO, "\n");
-#endif
+ av_dlog(avctx, "\n");
*data_size = 0;
case WINDOW_SEGMENT:
/*
* Window Segment Structure (No new information provided):
- * 2 bytes: Unkown,
+ * 2 bytes: Unknown,
* 2 bytes: X position of subtitle,
* 2 bytes: Y position of subtitle,
* 2 bytes: Width of subtitle,
}
AVCodec ff_pgssub_decoder = {
- "pgssub",
- AVMEDIA_TYPE_SUBTITLE,
- CODEC_ID_HDMV_PGS_SUBTITLE,
- sizeof(PGSSubContext),
- init_decoder,
- NULL,
- close_decoder,
- decode,
- .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
+ .name = "pgssub",
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .id = AV_CODEC_ID_HDMV_PGS_SUBTITLE,
+ .priv_data_size = sizeof(PGSSubContext),
+ .init = init_decoder,
+ .close = close_decoder,
+ .decode = decode,
+ .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
};