On 10/14/2012 07:37 PM, John Stebbins wrote: > On 10/14/2012 06:28 PM, John Stebbins wrote: >> 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. >>> > > > ubitux rightly points out on irc that the forced flag should be per > rect. Although libav currently only fills one rect per PGS sub it could > and should support multiple, and each can be flagged as forced. > >
Ok, I'm an idiot. Forgot to attach the updated patch...
>From 0a1a465857bbd3ac929b9066f57629b071a52ef3 Mon Sep 17 00:00:00 2001 From: John Stebbins <[email protected]> Date: Sun, 14 Oct 2012 19:32:31 +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..7353671 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3137,6 +3137,8 @@ enum AVSubtitleType { SUBTITLE_ASS, }; +#define AV_SUBTITLE_FLAG_FORCED 0x00000001 + typedef struct AVSubtitleRect { int x; ///< top left corner of pict, undefined when pict is not set int y; ///< top left corner of pict, undefined when pict is not set @@ -3159,6 +3161,7 @@ typedef struct AVSubtitleRect { * struct. */ char *ass; + int flags; } AVSubtitleRect; typedef struct AVSubtitle { diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 9fd26d8..0326ea8 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); @@ -368,6 +370,9 @@ static int display_end_segment(AVCodecContext *avctx, void *data, sub->rects[0] = av_mallocz(sizeof(*sub->rects[0])); sub->num_rects = 1; + if (ctx->presentation.composition_flag & 0x40) + sub->rects[0]->flags |= AV_SUBTITLE_FLAG_FORCED; + sub->rects[0]->x = ctx->presentation.x; sub->rects[0]->y = ctx->presentation.y; sub->rects[0]->w = ctx->picture.w; -- 1.7.9.5
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
