[FFmpeg-devel] [PATCH] lavfi/lut: use ff_fill_rgba_map()

Paul B Mahol onemda at gmail.com
Tue Jan 1 18:57:03 CET 2013


On 1/1/13, Stefano Sabatini <stefasab at gmail.com> wrote:
> On date Tuesday 2013-01-01 16:41:15 +0000, Paul B Mahol encoded:
>> Signed-off-by: Paul B Mahol <onemda at gmail.com>
>> ---
>>  libavfilter/vf_lut.c | 12 +++---------
>>  1 file changed, 3 insertions(+), 9 deletions(-)
>>
>> diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
>> index 543785a..73f909d 100644
>> --- a/libavfilter/vf_lut.c
>> +++ b/libavfilter/vf_lut.c
>> @@ -29,6 +29,7 @@
>>  #include "libavutil/opt.h"
>>  #include "libavutil/pixdesc.h"
>>  #include "avfilter.h"
>> +#include "drawutils.h"
>>  #include "formats.h"
>>  #include "internal.h"
>>  #include "video.h"
>> @@ -175,7 +176,7 @@ static int config_props(AVFilterLink *inlink)
>>      AVFilterContext *ctx = inlink->dst;
>>      LutContext *lut = ctx->priv;
>>      const AVPixFmtDescriptor *desc =
>> av_pix_fmt_desc_get(inlink->format);
>> -    int rgba_map[4]; /* component index -> RGBA color index map */
>> +    uint8_t rgba_map[4]; /* component index -> RGBA color index map */
>>      int min[4], max[4];
>>      int val, comp, ret;
>>
>> @@ -208,14 +209,7 @@ static int config_props(AVFilterLink *inlink)
>>      else if (ff_fmt_is_in(inlink->format, rgb_pix_fmts)) lut->is_rgb =
>> 1;
>>
>>      if (lut->is_rgb) {
>> -        switch (inlink->format) {
>> -        case AV_PIX_FMT_ARGB:  rgba_map[0] = A; rgba_map[1] = R;
>> rgba_map[2] = G; rgba_map[3] = B; break;
>> -        case AV_PIX_FMT_ABGR:  rgba_map[0] = A; rgba_map[1] = B;
>> rgba_map[2] = G; rgba_map[3] = R; break;
>> -        case AV_PIX_FMT_RGBA:
>> -        case AV_PIX_FMT_RGB24: rgba_map[0] = R; rgba_map[1] = G;
>> rgba_map[2] = B; rgba_map[3] = A; break;
>> -        case AV_PIX_FMT_BGRA:
>> -        case AV_PIX_FMT_BGR24: rgba_map[0] = B; rgba_map[1] = G;
>> rgba_map[2] = R; rgba_map[3] = A; break;
>> -        }
>> +        ff_fill_rgba_map(rgba_map, inlink->format);
>>          lut->step = av_get_bits_per_pixel(desc) >> 3;
>
> LGTM, thanks.

applied

> --
> FFmpeg = Fundamentalist & Frenzy Mind-dumbing Peaceless Embarassing
> Gladiator
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>


More information about the ffmpeg-devel mailing list