Mercurial > libavcodec.hg
diff dvbsub.c @ 5354:dfa6e7fa2bac libavcodec
create colorspace.h and use it where appropriate
patch by Ian Caulfield: /ian caulfield gmail com/
author | benoit |
---|---|
date | Tue, 17 Jul 2007 12:33:14 +0000 |
parents | 6166fbf375cc |
children | d030978bcd93 |
line wrap: on
line diff
--- a/dvbsub.c Tue Jul 17 11:06:12 2007 +0000 +++ b/dvbsub.c Tue Jul 17 12:33:14 2007 +0000 @@ -20,6 +20,7 @@ */ #include "avcodec.h" #include "bytestream.h" +#include "colorspace.h" typedef struct DVBSubtitleContext { int hide_state; @@ -193,22 +194,6 @@ *pq = q; } -#define SCALEBITS 10 -#define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1<<SCALEBITS) + 0.5)) - -#define RGB_TO_Y_CCIR(r, g, b) \ -((FIX(0.29900*219.0/255.0) * (r) + FIX(0.58700*219.0/255.0) * (g) + \ - FIX(0.11400*219.0/255.0) * (b) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS) - -#define RGB_TO_U_CCIR(r1, g1, b1, shift)\ -(((- FIX(0.16874*224.0/255.0) * r1 - FIX(0.33126*224.0/255.0) * g1 + \ - FIX(0.50000*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) - -#define RGB_TO_V_CCIR(r1, g1, b1, shift)\ -(((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ - FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) - static int encode_dvb_subtitles(DVBSubtitleContext *s, uint8_t *outbuf, AVSubtitle *h) {