Browse Source

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>
tags/n1.1
John Stebbins Diego Biurrun 13 years ago
parent
commit
1c5805521c
1 changed files with 8 additions and 2 deletions
  1. +8
    -2
      libavcodec/pgssubdec.c

+ 8
- 2
libavcodec/pgssubdec.c View File

@@ -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:
/*


Loading…
Cancel
Save