highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplifies fish vhook by using sws_getCachedContext()

Browse Source 
Patch by Victor Paesa %wzrlpy A arsystel P com%
Original thread:
Date: Sep 15, 2006 6:21 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6650 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Víctor Paesa 2006-10-11 12:14:37 +00:00 committed by Guillaume Poirier
parent 2d7490fcf4
commit df117196d3
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vhook/fish.c
View File

@ -94,8 +94,6 @@ typedef struct {
int inset; int inset;
int min_width; int min_width;
struct SwsContext *toRGB_convert_ctx; struct SwsContext *toRGB_convert_ctx;
enum PixelFormat sws_pix_fmt; // Sws_Context is opaque, we need to save
int sws_width, sws_height; // this to check if we can re-use contexts
} ContextInfo; } ContextInfo;
static void dorange(const char *s, int *first, int *second, int maxval) static void dorange(const char *s, int *first, int *second, int maxval)
@ -346,33 +344,19 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
avpicture_fill(&picture1, buf, PIX_FMT_RGB24, width, height); avpicture_fill(&picture1, buf, PIX_FMT_RGB24, width, height);
// if we already got a SWS context, let's realloc if is not re-useable // if we already got a SWS context, let's realloc if is not re-useable
if (ci->toRGB_convert_ctx != NULL) { ci->toRGB_convert_ctx = sws_getCachedContext(ci->toRGB_convert_ctx,
if ((ci->sws_pix_fmt != pix_fmt) || width, height, pix_fmt,
(ci->sws_width != width) || (ci->sws_height != height)) { width, height, PIX_FMT_RGB24,
sws_freeContext(ci->toRGB_convert_ctx); sws_flags, NULL, NULL, NULL);
ci->toRGB_convert_ctx = NULL;
}
}
if (ci->toRGB_convert_ctx == NULL) { if (ci->toRGB_convert_ctx == NULL) {
ci->sws_pix_fmt = pix_fmt; av_log(NULL, AV_LOG_ERROR,
ci->sws_width = width; "Cannot initialize the toRGB conversion context\n");
ci->sws_height = height; exit(1);
ci->toRGB_convert_ctx = sws_getContext(
ci->sws_width, ci->sws_height,
ci->sws_pix_fmt,
ci->sws_width, ci->sws_height,
PIX_FMT_RGB24,
sws_flags, NULL, NULL, NULL);
if (ci->toRGB_convert_ctx == NULL) {
av_log(NULL, AV_LOG_ERROR,
"Cannot initialize the toRGB conversion context\n");
exit(1);
}
} }
// img_convert parameters are 2 first destination, then 4 source // img_convert parameters are 2 first destination, then 4 source
// sws_scale parameters are context, 4 first source, then 2 destination // sws_scale parameters are context, 4 first source, then 2 destination
sws_scale(ci->toRGB_convert_ctx, sws_scale(ci->toRGB_convert_ctx,
picture->data, picture->linesize, 0, ci->sws_height, picture->data, picture->linesize, 0, height,
picture1.data, picture1.linesize); picture1.data, picture1.linesize);
/* Write out the PPM file */ /* Write out the PPM file */