[FFmpeg-cvslog] lavf: probe PGS subtitles definition.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Aug  7 18:53:00 2012 +0200| [b1511e00f6fefde6cb31b2e17f7812cfac1c8bd6] | committer: Nicolas George

lavf: probe PGS subtitles definition.

The resolution is in the packets, so decoding must happen.
Since most other formats do not set the dimension, make it
a special case for PGS. If other codecs were to have the
same requirement, using a CODEC_CAP would be preferred.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1511e00f6fefde6cb31b2e17f7812cfac1c8bd6
---

 libavformat/utils.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7b45944..8c2849d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2309,6 +2309,10 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr)
         if (st->info->found_decoder >= 0 && avctx->pix_fmt == PIX_FMT_NONE)
             FAIL("unspecified pixel format");
         break;
+    case AVMEDIA_TYPE_SUBTITLE:
+        if (avctx->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE && !avctx->width)
+            FAIL("unspecified size");
+        break;
     case AVMEDIA_TYPE_DATA:
         if(avctx->codec_id == AV_CODEC_ID_NONE) return 1;
     }
@@ -2324,6 +2328,7 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option
     AVCodec *codec;
     int got_picture = 1, ret = 0;
     AVFrame picture;
+    AVSubtitle subtitle;
     AVPacket pkt = *avpkt;
 
     if (!avcodec_is_open(st->codec) && !st->info->found_decoder) {
@@ -2369,6 +2374,11 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option
         case AVMEDIA_TYPE_AUDIO:
             ret = avcodec_decode_audio4(st->codec, &picture, &got_picture, &pkt);
             break;
+        case AVMEDIA_TYPE_SUBTITLE:
+            ret = avcodec_decode_subtitle2(st->codec, &subtitle,
+                                           &got_picture, &pkt);
+            ret = pkt.size;
+            break;
         default:
             break;
         }