[FFmpeg-devel] [PATCH 01/23] lavc/movtextdec: fix ass header colors

[Nicolas George]

John Stebbins (12020-04-06):
> A conversion from rgb to bgr is necessary
> ---
>  libavcodec/movtextdec.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
> index c38c5edce6..05becaf64d 100644
> --- a/libavcodec/movtextdec.c
> +++ b/libavcodec/movtextdec.c
> @@ -48,6 +48,8 @@
>  #define TOP_CENTER      8
>  #define TOP_RIGHT       9
>  
> +#define RGB_TO_BGR(c) (((c) & 0xff) << 16 | ((c) & 0xff00) | (((c) >> 16) & 0xff))
> +
>  typedef struct {
>      char *font;
>      int fontsize;
> @@ -448,10 +450,11 @@ static int mov_text_init(AVCodecContext *avctx) {
>      MovTextContext *m = avctx->priv_data;
>      ret = mov_text_tx3g(avctx, m);
>      if (ret == 0) {
> -        return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize, m->d.color,
> -                                m->d.back_color, m->d.bold, m->d.italic,
> -                                m->d.underline, ASS_DEFAULT_BORDERSTYLE,
> -                                m->d.alignment);

> +        return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize,
> +                    RGB_TO_BGR(m->d.color),
> +                    RGB_TO_BGR(m->d.back_color),
> +                    m->d.bold, m->d.italic, m->d.underline,
> +                    ASS_DEFAULT_BORDERSTYLE, m->d.alignment);

Indentation is off. It was off before, but since the lines are changed
it should be ok now.

Can't judge on semantic.

>      } else
>          return ff_ass_subtitle_header_default(avctx);
>  }

Regards,

-- 
  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20200406/415f50e1/attachment.sig>