ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavcodec/pgssubdec.c

 /*
  * 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.
@@ skipping 10 matching lines @@
 
 /**
  * @file
  * PGS subtitle decoder
  */
 
 #include "avcodec.h"
 #include "dsputil.h"
 #include "bytestream.h"
 #include "libavutil/colorspace.h"
+#include "libavcore/imgutils.h"
 
 //#define DEBUG_PACKET_CONTENTS
 
 #define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
 
 enum SegmentType {
     PALETTE_SEGMENT      = 0x14,
     PICTURE_SEGMENT      = 0x15,
     PRESENTATION_SEGMENT = 0x16,
     WINDOW_SEGMENT       = 0x17,
     DISPLAY_SEGMENT      = 0x80,
 };
 
 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      *rle;
     unsigned int rle_buffer_size, rle_data_len;
 } PGSSubPicture;
 
@@ skipping 120 matching lines @@
         return -1;
     }
 
     ctx->picture.rle_data_len = 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) {
+    if (avctx->width < width || avctx->height < height) {
         av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger then video.\n");
         return -1;
     }
 
     ctx->picture.w = width;
     ctx->picture.h = height;
 
     av_fast_malloc(&ctx->picture.rle, &ctx->picture.rle_buffer_size, rle_bitmap_len);
 
     if (!ctx->picture.rle)
@@ skipping 59 matching lines @@
  * @todo TODO: Blanking of subtitle
  */
 static void parse_presentation_segment(AVCodecContext *avctx,
                                        const uint8_t *buf, int buf_size)
 {
     PGSSubContext *ctx = 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);
+    int w = bytestream_get_be16(&buf);
+    int h = bytestream_get_be16(&buf);
 
     dprintf(avctx, "Video Dimensions %dx%d\n",
-            ctx->presentation.video_w, ctx->presentation.video_h);
+            w, h);
+    if (av_image_check_size(w, h, 0, avctx) >= 0)
+        avcodec_set_dimensions(avctx, w, h);
 
     /* Skip 1 bytes of unknown, frame rate? */
     buf++;
 
     ctx->presentation.id_number = bytestream_get_be16(&buf);
 
     /* Next byte is the state. */
     block = bytestream_get_byte(&buf);;
     if (block == 0x80) {
         /*
          * Skip 7 bytes 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) {
+        if (x > avctx->width || y > avctx->height) {
             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, y, avctx->width, avctx->height);
             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
@@ skipping 142 matching lines @@
     "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"),
 };