On 10/14/2012 05:17 PM, Måns Rullgård wrote: > Luca Barbato <[email protected]> writes: > >> On 10/14/2012 04:52 PM, John Stebbins wrote: >>> + uint8_t forced; >> why uint8_t ? I guess it would require a version bump btw. > Add a flags member instead so more things can be added later without > changing ABI incompatibly again. >
Updated patch with flags as suggested.
>From 65614697aaa618bfae3f2db97b85db49ee0d9707 Mon Sep 17 00:00:00 2001 From: John Stebbins <[email protected]> Date: Sun, 14 Oct 2012 18:24:10 +0200 Subject: [PATCH] PGS subtitles: Expose forced flag Useful for detection of subtitles displayed during foreign language scenes. --- libavcodec/avcodec.h | 3 +++ libavcodec/pgssubdec.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 51270e6..78f007d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3161,6 +3161,8 @@ typedef struct AVSubtitleRect { char *ass; } AVSubtitleRect; +#define AV_SUBTITLE_FLAG_FORCED 0x00000001 + typedef struct AVSubtitle { uint16_t format; /* 0 = graphics */ uint32_t start_display_time; /* relative to packet pts, in ms */ @@ -3168,6 +3170,7 @@ typedef struct AVSubtitle { unsigned num_rects; AVSubtitleRect **rects; int64_t pts; ///< Same as packet pts, in AV_TIME_BASE + int flags; } AVSubtitle; /** diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 9fd26d8..8d42230 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -45,6 +45,7 @@ typedef struct PGSSubPresentation { int y; int id_number; int object_number; + uint8_t composition_flag; } PGSSubPresentation; typedef struct PGSSubPicture { @@ -299,16 +300,17 @@ static void parse_presentation_segment(AVCodecContext *avctx, buf += 3; ctx->presentation.object_number = bytestream_get_byte(&buf); + ctx->presentation.composition_flag = 0; if (!ctx->presentation.object_number) return; /* - * Skip 4 bytes of unknown: + * Skip 3 bytes of unknown: * object_id_ref (2 bytes), * window_id_ref, - * composition_flag (0x80 - object cropped, 0x40 - object forced) */ - buf += 4; + buf += 3; + ctx->presentation.composition_flag = bytestream_get_byte(&buf); x = bytestream_get_be16(&buf); y = bytestream_get_be16(&buf); @@ -356,6 +358,9 @@ static int display_end_segment(AVCodecContext *avctx, void *data, */ memset(sub, 0, sizeof(*sub)); + if (ctx->presentation.composition_flag & 0x40) + sub->flags |= AV_SUBTITLE_FLAG_FORCED; + // Blank if last object_number was 0. // Note that this may be wrong for more complex subtitles. if (!ctx->presentation.object_number) -- 1.7.9.5
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
