Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

swscale/swscale_internal: Don't export internal function

Browse Source 
sws_alloc_set_opts() can actually be made internal to utils.c.
This commit does so.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/7.1
Andreas Rheinhardt 10 months ago
parent ad1cef04a9
commit 2d38141ea6
2 changed files with 43 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      libswscale/swscale_internal.h
  2. 83
      libswscale/utils.c

11
libswscale/swscale_internal.h
Unescape View File

@ -1003,17 +1003,6 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2,
int dstWidth, const uint8_t *src1,
const uint8_t *src2, int srcW, int xInc);
/**
* Allocate and return an SwsContext.
* This is like sws_getContext() but does not perform the init step, allowing
* the user to set additional AVOptions.
*
* @see sws_getContext()
*/
struct SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat,
int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags, const double *param);
int ff_sws_alphablendaway(SwsContext *c, const uint8_t *src[],
int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dst[], int dstStride[]);

83
libswscale/utils.c
Unescape View File

@ -269,6 +269,34 @@ static const FormatEntry format_entries[] = {
[AV_PIX_FMT_XV36LE] = { 1, 1 },
};
/**
* Allocate and return an SwsContext without performing initialization.
*/
static SwsContext *alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat,
int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags, const double *param)
{
SwsContext *c = sws_alloc_context();
if (!c)
return NULL;
c->flags = flags;
c->srcW = srcW;
c->srcH = srcH;
c->dstW = dstW;
c->dstH = dstH;
c->srcFormat = srcFormat;
c->dstFormat = dstFormat;
if (param) {
c->param[0] = param[0];
c->param[1] = param[1];
}
return c;
}
int ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos,
int filterSize, int16_t *filter,
int dstW)
@ -1101,9 +1129,9 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
if (ret < 0)
return ret;
c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, c->srcFormat,
tmp_width, tmp_height, tmp_format,
c->flags, c->param);
c->cascaded_context[0] = alloc_set_opts(srcW, srcH, c->srcFormat,
tmp_width, tmp_height, tmp_format,
c->flags, c->param);
if (!c->cascaded_context[0])
return -1;
@ -1116,9 +1144,9 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
srcRange, table, dstRange,
brightness, contrast, saturation);
c->cascaded_context[1] = sws_alloc_set_opts(tmp_width, tmp_height, tmp_format,
dstW, dstH, c->dstFormat,
c->flags, c->param);
c->cascaded_context[1] = alloc_set_opts(tmp_width, tmp_height, tmp_format,
dstW, dstH, c->dstFormat,
c->flags, c->param);
if (!c->cascaded_context[1])
return -1;
c->cascaded_context[1]->srcRange = srcRange;
@ -1682,9 +1710,9 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter,
if (ret < 0)
return ret;
c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat,
srcW, srcH, tmpFormat,
flags, c->param);
c->cascaded_context[0] = alloc_set_opts(srcW, srcH, srcFormat,
srcW, srcH, tmpFormat,
flags, c->param);
if (!c->cascaded_context[0])
return AVERROR(EINVAL);
c->cascaded_context[0]->alphablend = c->alphablend;
@ -1692,9 +1720,9 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter,
if (ret < 0)
return ret;
c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
dstW, dstH, dstFormat,
flags, c->param);
c->cascaded_context[1] = alloc_set_opts(srcW, srcH, tmpFormat,
dstW, dstH, dstFormat,
flags, c->param);
if (!c->cascaded_context[1])
return AVERROR(EINVAL);
@ -2066,31 +2094,6 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
return sws_init_single_context(c, srcFilter, dstFilter);
}
SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat,
int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags, const double *param)
{
SwsContext *c;
if (!(c = sws_alloc_context()))
return NULL;
c->flags = flags;
c->srcW = srcW;
c->srcH = srcH;
c->dstW = dstW;
c->dstH = dstH;
c->srcFormat = srcFormat;
c->dstFormat = dstFormat;
if (param) {
c->param[0] = param[0];
c->param[1] = param[1];
}
return c;
}
SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags, SwsFilter *srcFilter,
@ -2098,9 +2101,9 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
{
SwsContext *c;
c = sws_alloc_set_opts(srcW, srcH, srcFormat,
dstW, dstH, dstFormat,
flags, param);
c = alloc_set_opts(srcW, srcH, srcFormat,
dstW, dstH, dstFormat,
flags, param);
if (!c)
return NULL;

Write Preview
Loading…
Cancel
Save