diff options
| author | John Stebbins <jstebbins.hb@gmail.com> | 2012-11-02 09:30:39 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-11-18 18:34:05 +0100 |
| commit | 1c5805521c3e406886341d752ebf38f8d41e1d13 (patch) | |
| tree | 8e655b3a1ca3c524f3e54c4a35126c0640cfa9ff | |
| parent | 3bd1eacd2a7dad1a01ab5ddad69aa4fb2a487312 (diff) | |
| download | ffmpeg-1c5805521c3e406886341d752ebf38f8d41e1d13.tar.gz | |
PGS subtitles: Set AVSubtitle pts value
pts should be that of the packet containing the presentation segment.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/pgssubdec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 0326ea8f1b..f22088a747 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -46,6 +46,7 @@ typedef struct PGSSubPresentation { int id_number; int object_number; uint8_t composition_flag; + int64_t pts; } PGSSubPresentation; typedef struct PGSSubPicture { @@ -272,7 +273,8 @@ static void parse_palette_segment(AVCodecContext *avctx, * @todo TODO: Implement forcing of subtitles */ static void parse_presentation_segment(AVCodecContext *avctx, - const uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size, + int64_t pts) { PGSSubContext *ctx = avctx->priv_data; @@ -281,6 +283,8 @@ static void parse_presentation_segment(AVCodecContext *avctx, int w = bytestream_get_be16(&buf); int h = bytestream_get_be16(&buf); + ctx->presentation.pts = pts; + av_dlog(avctx, "Video Dimensions %dx%d\n", w, h); if (av_image_check_size(w, h, 0, avctx) >= 0) @@ -358,6 +362,8 @@ static int display_end_segment(AVCodecContext *avctx, void *data, */ memset(sub, 0, sizeof(*sub)); + sub->pts = ctx->presentation.pts; + // Blank if last object_number was 0. // Note that this may be wrong for more complex subtitles. if (!ctx->presentation.object_number) @@ -446,7 +452,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, parse_picture_segment(avctx, buf, segment_length); break; case PRESENTATION_SEGMENT: - parse_presentation_segment(avctx, buf, segment_length); + parse_presentation_segment(avctx, buf, segment_length, avpkt->pts); break; case WINDOW_SEGMENT: /* |