Ticket #6748: bluray_subtitles_mythtv_trunk_21011.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -7148 +7148 @@
                 if (player_ctx->buffer->isDVD())
                     vsize = (float) video_disp_dim.height();
 
-                float hmult = osd->GetSubtitleBounds().width() / 720.0;
-                float vmult = osd->GetSubtitleBounds().height() / vsize;
+//                float hmult = osd->GetSubtitleBounds().width() / 720.0;
+//                float vmult = osd->GetSubtitleBounds().height() / vsize;
+                float hmult = 1.0;
+                float vmult = 1.0;
 
-                rect->x = (int)(rect->x * hmult);
-                rect->y = (int)(rect->y * vmult);
-                rect->w = (int)(rect->w * hmult);
-                rect->h = (int)(rect->h * vmult);
+                rect->x = (int)(rect->x / hmult);
+                rect->y = (int)(rect->y / vmult);
+                rect->w = (int)(rect->w / hmult);
+                rect->h = (int)(rect->h / vmult);
 
                 if (hmult < 0.98 || hmult > 1.02 || vmult < 0.98 || hmult > 1.02)
                     qImage = qImage.scaled(rect->w, rect->h,

libs/libavcodec/allcodecs.c

@@ -302 +302 @@
     /* subtitles */
     REGISTER_ENCDEC  (DVBSUB, dvbsub);
     REGISTER_ENCDEC  (DVDSUB, dvdsub);
+    REGISTER_DECODER (PGSSUB, pgssub);
     REGISTER_ENCDEC  (XSUB, xsub);
 
     /* external libraries */

libs/libavcodec/avcodec.h

@@ -329 +329 @@
     CODEC_ID_XSUB,
     CODEC_ID_SSA,
     CODEC_ID_MOV_TEXT,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
 
     /* teletext codecs */
     CODEC_ID_MPEG2VBI,

libs/libavcodec/libavcodec.pro

@@ -222 +222 @@
 contains( CONFIG_PGM_ENCODER, yes )             { SOURCES *= pnmenc.c }
 contains( CONFIG_PGMYUV_DECODER, yes )          { SOURCES *= pnmenc.c pnm.c }
 contains( CONFIG_PGMYUV_ENCODER, yes )          { SOURCES *= pnmenc.c }
+contains( CONFIG_PGSSUB_DECODER, yes )          { SOURCES *= pgssubdec.c }
 contains( CONFIG_PNG_DECODER, yes )             { SOURCES *= png.c pngdec.c }
 contains( CONFIG_PNG_ENCODER, yes )             { SOURCES *= png.c pngenc.c }
 contains( CONFIG_PPM_DECODER, yes )             { SOURCES *= pnmenc.c pnm.c }

libs/libavcodec/pgssubdec.c

@@ +1 @@
+/*
+ * PGS subtitle decoder
+ * Copyright (c) 2009 Stephen Backway
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavcodec/pgssubdec.c
+ * PGS subtitle decoder
+ */
+
+#include "avcodec.h"
+#include "dsputil.h"
+#include "colorspace.h"
+#include "bytestream.h"
+
+//#define DEBUG_PACKET_CONTENTS
+//#define DEBUG_SAVE_IMAGES
+
+#define PGSSUB_PALETTE_SEGMENT      0x14
+#define PGSSUB_PICTURE_SEGMENT      0x15
+#define PGSSUB_PRESENTATION_SEGMENT 0x16
+#define PGSSUB_WINDOW_SEGMENT       0x17
+#define PGSSUB_DISPLAY_SEGMENT      0x80
+
+#define cm (ff_cropTbl + MAX_NEG_CROP)
+#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+
+typedef struct PGSSubPresentation {
+    int x;
+    int y;
+    int video_w;
+    int video_h;
+    int id_number;
+} PGSSubPresentation;
+
+typedef struct PGSSubPicture {
+    int w;
+    int h;
+    uint8_t *bitmap;
+} PGSSubPicture;
+
+typedef struct PGSSubContext {
+    PGSSubPresentation *presentation;
+    uint32_t           clut[256];
+    PGSSubPicture      *picture;
+} PGSSubContext;
+
+static av_cold int pgssub_init_decoder(AVCodecContext *avctx)
+{
+    avctx->pix_fmt     = PIX_FMT_RGB32;
+    PGSSubContext *ctx = (PGSSubContext*) avctx->priv_data;
+
+    ctx->presentation  = av_mallocz(sizeof(PGSSubPresentation));
+    ctx->picture       = av_mallocz(sizeof(PGSSubPicture));
+    return 0;
+}
+
+static av_cold int pgssub_close_decoder(AVCodecContext *avctx)
+{
+    PGSSubContext *ctx = (PGSSubContext*) avctx->priv_data;
+
+    if (ctx->picture->bitmap)
+        av_freep(&ctx->picture->bitmap);
+
+    av_freep(&ctx->presentation);
+    av_freep(&ctx->picture);
+    return 0;
+}
+
+static void pgssub_parse_picture_segment(AVCodecContext *avctx,
+                                         const uint8_t *buf, int buf_size)
+{
+    PGSSubContext *ctx = (PGSSubContext*) avctx->priv_data;
+
+    uint8_t block, flags, colour, *rle_bitmap_end, sequence_desc;
+    int rle_bitmap_len, pixel_count, line_count, run, width, height;
+
+    /* skip 3 unknown bytes: Object ID (2 bytes), Version Number */
+    buf += 3;
+
+    /* Read the Sequence Description to determine if start of RLE data or Appended to previous RLE */
+    sequence_desc = bytestream_get_byte(&buf);
+
+    if (!(sequence_desc & 0x80)) {
+        av_log(avctx, AV_LOG_ERROR, "Decoder does not support object data over multiple packets.\n");
+        return;
+    }
+
+    /* Decode rle bitmap length */
+    rle_bitmap_len = bytestream_get_be24(&buf);
+
+    /* Check to ensure we have enough data for rle_bitmap_length if just a single packet*/
+    if (rle_bitmap_len > (buf_size - 7)) {
+        av_log(avctx, AV_LOG_ERROR, "Not enough RLE data for specified length of %d.\n", rle_bitmap_len);
+        return;
+    }
+
+    rle_bitmap_end = buf + rle_bitmap_len;
+
+    /* Get bitmap dimensions from data */
+    width  = bytestream_get_be16(&buf);
+    height = bytestream_get_be16(&buf);
+
+    /* Make sure the bitmap is not too large. */
+    if (ctx->presentation->video_w < width || ctx->presentation->video_h < height) {
+        av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger then video.\n");
+        return;
+    }
+
+    ctx->picture->w = width;
+    ctx->picture->h = height;
+
+    ctx->picture->bitmap = av_malloc(width * height * sizeof(uint8_t));
+
+    pixel_count = 0;
+    line_count  = 0;
+
+    while (buf < rle_bitmap_end && line_count < height) {
+        block = bytestream_get_byte(&buf);
+
+        if (block == 0x00) {
+            block = bytestream_get_byte(&buf);
+            flags = block & 0xC0;
+
+            switch (flags) {
+            case 0x00:
+                run = block & 0x3F;
+                if (run > 0)
+                    colour = 0;
+                break;
+            case 0xC0:
+                run = (block & 0x3F) << 8 | bytestream_get_byte(&buf);
+                colour = bytestream_get_byte(&buf);
+                break;
+            case 0x80:
+                run = block & 0x3F;
+                colour = bytestream_get_byte(&buf);
+                break;
+            case 0x40:
+                run = (block & 0x3F) << 8 | bytestream_get_byte(&buf);
+                colour = 0;
+                break;
+            default:
+                av_log(avctx, AV_LOG_ERROR, "Unknown RLE code.\n");
+                run = -1;
+                break;
+            }
+        } else {
+            run = 1;
+            colour = block;
+        }
+
+        if (run > 0) {
+            memset(ctx->picture->bitmap + pixel_count, colour, run);
+            pixel_count += run;
+        } else if (run == 0) {
+            /**
+             * New Line. Check if correct pixels decoded,
+             * if not display warning and adjust bitmap
+             * pointer to correct new line position.
+             */
+            if (pixel_count % width == width - 1)
+                av_log(avctx, AV_LOG_ERROR, "Decoded %d pixels, when line should be %d pixels\n",
+                       pixel_count % width, width);
+            line_count++;
+        }
+    }
+
+    dprintf(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, width * height);
+}
+
+static void pgssub_parse_palette_segment(AVCodecContext *avctx,
+                                         const uint8_t *buf, int buf_size)
+{
+    PGSSubContext *ctx = (PGSSubContext*) avctx->priv_data;
+
+    const uint8_t *buf_end = buf + buf_size;
+    int colour_id, max_colour_id;
+    int y, cb, cr, alpha;
+    int r, g, b, r_add, g_add, b_add;
+
+    max_colour_id = (buf_size - 2) % 5;
+
+    /* Check to ensure that the buffer provided is not larger then the maximum palette */
+    if (max_colour_id > 255) {
+        av_log(avctx, AV_LOG_INFO, "Palette Packet too large, pontentially %d colours defined.\n",
+               max_colour_id);
+        return;
+    }
+
+    /* Skip two null bytes */
+    buf += 2;
+
+    while (buf < buf_end) {
+        colour_id = bytestream_get_byte(&buf);
+        y         = bytestream_get_byte(&buf);
+        cb        = bytestream_get_byte(&buf);
+        cr        = bytestream_get_byte(&buf);
+        alpha     = bytestream_get_byte(&buf);
+
+        YUV_TO_RGB1(cb, cr);
+        YUV_TO_RGB2(r, g, b, y);
+
+        dprintf(avctx, "Colour %d := (%d,%d,%d,%d)\n", colour_id, r, g, b, alpha);
+
+        /* Store colour in palette */
+        if (colour_id < 255)
+            ctx->clut[colour_id] = RGBA(r,g,b,alpha);
+    }
+}
+
+static void pgssub_parse_presentation_segment(AVCodecContext *avctx,
+                                              const uint8_t *buf, int buf_size)
+{
+    PGSSubContext *ctx = (PGSSubContext*) avctx->priv_data;
+
+    int x, y;
+    uint8_t block;
+
+    ctx->presentation->video_w = bytestream_get_be16(&buf);
+    ctx->presentation->video_h = bytestream_get_be16(&buf);
+
+    dprintf(avctx, "Video Dimensions %dx%d\n",
+            ctx->presentation->video_w, ctx->presentation->video_h);
+
+    /* Skip 1 bytes of unknown, frame rate? */
+    buf += 1;
+
+    ctx->presentation->id_number = bytestream_get_be16(&buf);
+
+    /* Next byte is the state. */
+    block = bytestream_get_byte(&buf);
+    if (block == 0x80) {
+        /**
+         * Skip 7 bytes (+1 for previous byte) of unknown:
+         *     palette_update_flag (0x80),
+         *     palette_id_to_use,
+         *     Object Number (if > 0 determines if more data to process),
+         *     object_id_ref (2 bytes),
+         *     window_id_ref,
+         *     composition_flag (0x80 - object cropped, 0x40 - object forced)
+         */
+        buf += 7;
+
+        x = bytestream_get_be16(&buf);
+        y = bytestream_get_be16(&buf);
+
+        /* TODO If cropping, cropping_x, cropping_y, cropping_width, cropping_height (all 2 bytes).*/
+
+        dprintf(avctx, "Subtitle Placement x=%d, y=%d\n", x, y);
+
+        if (x > ctx->presentation->video_w || y > ctx->presentation->video_h) {
+            av_log(avctx, AV_LOG_ERROR, "Subtitle out of video bounds. x = %d, y = %d, video width = %d, video height = %d.\n",
+                   x, y, ctx->presentation->video_w, ctx->presentation->video_h);
+            x = 0; y =0;
+        }
+
+        /* Fill in dimensions */
+        ctx->presentation->x = x;
+        ctx->presentation->y = y;
+    } else if (block == 0x00) {
+        /* TODO: Blank context as subtitle should not be displayed.
+         *       If the subtitle is blanked now the subtitle is not
+         *       on screen long enough to read, due to a delay in
+         *       initial display timing.
+         */
+    }
+}
+
+#ifdef DEBUG_SAVE_IMAGES
+#undef fprintf
+#undef perror
+#undef exit
+static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
+                     uint32_t *rgba_palette)
+{
+    int x, y, v;
+    FILE *f;
+
+    f = fopen(filename, "w");
+    if (!f) {
+        perror(filename);
+        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);
+}
+#endif
+
+static int pgssub_display_end_segment(AVCodecContext *avctx,
+                                      void *data,
+                                      const uint8_t *buf, int buf_size)
+{
+    AVSubtitle    *sub = data;
+    PGSSubContext *ctx = (PGSSubContext*) avctx->priv_data;
+
+    sub->start_display_time = 0;
+    sub->end_display_time   = 20000;
+    sub->format             = 0;
+
+    if (!sub->rects) {
+        sub->rects     = av_mallocz(sizeof(*sub->rects));
+        sub->rects[0]  = av_mallocz(sizeof(*sub->rects[0]));
+        sub->num_rects = 1;
+    }
+
+    sub->rects[0]->x    = ctx->presentation->x;
+    sub->rects[0]->y    = ctx->presentation->y;
+    sub->rects[0]->w    = ctx->picture->w;
+    sub->rects[0]->h    = ctx->picture->h;
+    sub->rects[0]->type = SUBTITLE_BITMAP;
+
+    /* Allocate memory for bitmap */
+    sub->rects[0]->pict.data[0]     = av_malloc(ctx->picture->w * ctx->picture->h);
+    sub->rects[0]->pict.linesize[0] = ctx->picture->w;
+
+    if (ctx->picture->bitmap)
+        memcpy(sub->rects[0]->pict.data[0], ctx->picture->bitmap, ctx->picture->w * ctx->picture->h);
+
+    /* Allocate memory for colours */
+    sub->rects[0]->nb_colors    = 256;
+    sub->rects[0]->pict.data[1] = av_mallocz(sub->rects[0]->nb_colors * sizeof(uint32_t));
+
+    memcpy(sub->rects[0]->pict.data[1], ctx->clut, sub->rects[0]->nb_colors * sizeof(uint32_t));
+
+#ifdef DEBUG_SAVE_IMAGES
+    ppm_save("/tmp/a.ppm", sub->rects[0]->pict.data[0],
+             sub->rects[0]->w, sub->rects[0]->h, sub->rects[0]->pict.data[1]);
+#endif
+
+    return 1;
+}
+
+static int pgssub_decode(AVCodecContext *avctx,
+                         void *data, int *data_size,
+                         AVPacket *avpkt)
+{
+    const uint8_t *buf = avpkt->data;
+    int buf_size       = avpkt->size;
+    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");
+
+    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)
+        av_log(avctx, AV_LOG_INFO, "\n");
+#endif
+
+    *data_size = 0;
+
+    /* Ensure that we have received at a least a segment code and segment length */
+    if (buf_size < 3)
+        return -1;
+
+    buf_end = buf + buf_size;
+
+    /* Step through buffer to identify segments */
+    while (buf < buf_end) {
+        segment_type   = bytestream_get_byte(&buf);
+        segment_length = bytestream_get_be16(&buf);
+
+        dprintf(avctx, "Segment Length %d, Segment Type %x\n", segment_length, segment_type);
+
+        if (!(segment_type == PGSSUB_DISPLAY_SEGMENT) && (buf + segment_length > buf_end))
+            break;
+
+        switch (segment_type) {
+        case PGSSUB_PALETTE_SEGMENT:
+            pgssub_parse_palette_segment(avctx, buf, segment_length);
+            break;
+        case PGSSUB_PICTURE_SEGMENT:
+            pgssub_parse_picture_segment(avctx, buf, segment_length);
+            break;
+        case PGSSUB_PRESENTATION_SEGMENT:
+            pgssub_parse_presentation_segment(avctx, buf, segment_length);
+            break;
+        case PGSSUB_WINDOW_SEGMENT:
+            /**
+             * Window Segment Structure (No new information provided):
+             *     2 bytes: Unkown,
+             *     2 bytes: X position of subtitle,
+             *     2 bytes: Y position of subtitle,
+             *     2 bytes: Width of subtitle,
+             *     2 bytes: Height of subtitle.
+             */
+            break;
+        case PGSSUB_DISPLAY_SEGMENT:
+            *data_size = pgssub_display_end_segment(avctx, data, buf, segment_length);
+            break;
+        default:
+            av_log(avctx, AV_LOG_ERROR, "Unknown subtitle segment type 0x%x, length %d\n",
+                   segment_type, segment_length);
+            break;
+        }
+
+        buf += segment_length;
+    }
+
+    return buf_size;
+}
+
+AVCodec pgssub_decoder = {
+    "pgssub",
+    CODEC_TYPE_SUBTITLE,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
+    sizeof(PGSSubContext),
+    pgssub_init_decoder,
+    NULL,
+    pgssub_close_decoder,
+    pgssub_decode,
+    .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
+};

libs/libavcodec/myth_utils.c

@@ -201 +201 @@
             /* subtitle codecs */
         case CODEC_ID_DVD_SUBTITLE:     return "DVD_SUBTITLE";
         case CODEC_ID_DVB_SUBTITLE:     return "DVB_SUBTITLE";
+        case CODEC_ID_HDMV_PGS_SUBTITLE:
+             return "HDMV_PGS_SUBTITLE";
 
         case CODEC_ID_MPEG2VBI:         return "MPEG2VBI";
         case CODEC_ID_DVB_VBI:          return "DVB_VBI";

libs/libavformat/mpegts.c

@@ -577 +577 @@
     { 0x84, CODEC_TYPE_AUDIO, CODEC_ID_AC3 },
     { 0x85, CODEC_TYPE_AUDIO, CODEC_ID_DTS },
     { 0x86, CODEC_TYPE_AUDIO, CODEC_ID_DTS },
+    { 0x90, CODEC_TYPE_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE },
     { 0 },
 };
 
@@ -1009 +1010 @@
             //case STREAM_TYPE_PRIVATE_DATA:
         case STREAM_TYPE_VBI_DVB:
         case STREAM_TYPE_SUBTITLE_DVB:
+        case STREAM_TYPE_SUBTITLE_PGS:
         case STREAM_TYPE_DSMCC_B:
             val = 1;
             break;
@@ -1592 +1594 @@
             codec_type = CODEC_TYPE_SUBTITLE;
             codec_id = CODEC_ID_DVB_SUBTITLE;
             break;
+        case STREAM_TYPE_SUBTITLE_PGS:
+            codec_type = CODEC_TYPE_SUBTITLE;
+            codec_id = CODEC_ID_HDMV_PGS_SUBTITLE;
+            break;
         case STREAM_TYPE_DSMCC_B:
             codec_type = CODEC_TYPE_DATA;
             codec_id = CODEC_ID_DSMCC_B;

libs/libavformat/mpegts.h

@@ -68 +68 @@
 #define STREAM_TYPE_AUDIO_HDMV_DTS_HD_MASTER 0x86
 
 #define STREAM_TYPE_SUBTITLE_DVB    0x100
+#define STREAM_TYPE_SUBTITLE_PGS    0x90
 #define STREAM_TYPE_VBI_DVB         0x101
 
 typedef struct MpegTSContext MpegTSContext;