generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add "support for both orderings of the slices (top->down / bottom->up)"

Browse Source 
(r15249) to sws_scale() too (until now, it only was in sws_scale_ordered())

Originally committed as revision 21887 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Luca Abeni 2007-01-12 15:40:08 +00:00
parent 6eb2de748d
commit 703b56fb5d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libswscale/swscale.c
View File

@ -2414,7 +2414,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
* swscale warper, so we don't need to export the SwsContext. * swscale warper, so we don't need to export the SwsContext.
* assumes planar YUV to be in YUV order instead of YVU * assumes planar YUV to be in YUV order instead of YVU
*/ */
int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){ int srcSliceH, uint8_t* dst[], int dstStride[]){
if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) { if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
MSG_ERR("swScaler: slices start in the middle!\n"); MSG_ERR("swScaler: slices start in the middle!\n");
@ -2449,15 +2449,9 @@ int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
/** /**
* swscale warper, so we don't need to export the SwsContext * swscale warper, so we don't need to export the SwsContext
*/ */
int sws_scale(SwsContext *c, uint8_t* srcParam[], int srcStride[], int srcSliceY, int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]){ int srcSliceH, uint8_t* dst[], int dstStride[]){
uint8_t *src[3]; return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
uint8_t *dst[3];
src[0] = srcParam[0]; src[1] = srcParam[1]; src[2] = srcParam[2];
dst[0] = dstParam[0]; dst[1] = dstParam[1]; dst[2] = dstParam[2];
//printf("sws: slice %d %d\n", srcSliceY, srcSliceH);
return c->swScale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
} }
SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,