MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swscale: add unscaled conversion from yuv420p to p010

This commit is contained in:
Timo Rothenpieler 2016-09-02 14:18:25 +02:00
parent fdd9663781
commit e3fd1857fb
10 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libswscale/swscale_unscaled.c
View File

@ -33,6 +33,7 @@
#include "libavutil/bswap.h"
#include "libavutil/pixdesc.h"
#include "libavutil/avassert.h"
#include "libavutil/avconfig.h"
DECLARE_ALIGNED(8, static const uint8_t, dithers)[8][8][8]={
{
@ -236,6 +237,57 @@ static int planarToP010Wrapper(SwsContext *c, const uint8_t *src8[],
return srcSliceH;
}
#if AV_HAVE_BIGENDIAN
#define output_pixel(p, v) do { \
uint16_t *pp = (p); \
AV_WL16(pp, (v)); \
} while(0)
#else
#define output_pixel(p, v) (*p) = (v)
#endif
static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[],
int srcStride[], int srcSliceY,
int srcSliceH, uint8_t *dstParam8[],
int dstStride[])
{
uint16_t *dstY = (uint16_t*)(dstParam8[0] + dstStride[0] * srcSliceY);
uint16_t *dstUV = (uint16_t*)(dstParam8[1] + dstStride[1] * srcSliceY / 2);
int x, y, t;
av_assert0(!(dstStride[0] % 2 || dstStride[1] % 2));
for (y = 0; y < srcSliceH; y++) {
uint16_t *tdstY = dstY;
const uint8_t *tsrc0 = src[0];
for (x = c->srcW; x > 0; x--) {
t = *tsrc0++;
output_pixel(tdstY++, t | (t << 8));
}
src[0] += srcStride[0];
dstY += dstStride[0] / 2;
if (!(y & 1)) {
uint16_t *tdstUV = dstUV;
const uint8_t *tsrc1 = src[1];
const uint8_t *tsrc2 = src[2];
for (x = c->srcW / 2; x > 0; x--) {
t = *tsrc1++;
output_pixel(tdstUV++, t | (t << 8));
t = *tsrc2++;
output_pixel(tdstUV++, t | (t << 8));
}
src[1] += srcStride[1];
src[2] += srcStride[2];
dstUV += dstStride[1] / 2;
}
}
return srcSliceH;
}
#undef output_pixel
static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[],
int srcStride[], int srcSliceY, int srcSliceH,
uint8_t *dstParam[], int dstStride[])
@ -1653,6 +1705,11 @@ void ff_get_unscaled_swscale(SwsContext *c)
dstFormat == AV_PIX_FMT_P010) {
c->swscale = planarToP010Wrapper;
}
/* yuv420p_to_p010le */
if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) &&
dstFormat == AV_PIX_FMT_P010LE) {
c->swscale = planar8ToP01xleWrapper;
}
if (srcFormat == AV_PIX_FMT_YUV410P && !(dstH & 3) &&
(dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) &&

2
tests/ref/fate/filter-pixdesc-p010le
View File

@ -1 +1 @@
pixdesc-p010le 0268fd44f63022e21ada69704534fc85
pixdesc-p010le 7b4a503997eb4e14cba80ee52db85e39

2
tests/ref/fate/filter-pixfmts-copy
View File

@ -36,7 +36,7 @@ monow 54d16d2c01abfd72ecdb5e51e283937c
nv12 8e24feb2c544dc26a20047a71e4c27aa
nv21 335d85c9af6110f26ae9e187a82ed2cf
p010be 7f9842d6015026136bad60d03c035cc3
p010le 1929db89609c4b8c6d9c9030a9e7843d
p010le c453421b9f726bdaf2bacf59a492c43b
pal8 ff5929f5b42075793b2c34cb441bede5
rgb0 0de71e5a1f97f81fb51397a0435bfa72
rgb24 f4438057d046e6d98ade4e45294b21be

2
tests/ref/fate/filter-pixfmts-crop
View File

@ -34,7 +34,7 @@ gray16le 9ff7c866bd98def4e6c91542c1c45f80
nv12 92cda427f794374731ec0321ee00caac
nv21 1bcfc197f4fb95de85ba58182d8d2f69
p010be 8b2de2eb6b099bbf355bfc55a0694ddc
p010le a1e4f713e145dfc465bfe0cc77096a03
p010le 373b50c766dfd0a8e79c9a73246d803a
pal8 1f2cdc8e718f95c875dbc1034a688bfb
rgb0 736646b70dd9a0be22b8da8041e35035
rgb24 c5fbbf816bb2000f4d2914e335698ef5

2
tests/ref/fate/filter-pixfmts-field
View File

@ -36,7 +36,7 @@ monow 03d783611d265cae78293f88ea126ea1
nv12 16f7a46708ef25ebd0b72e47920cc11e
nv21 7294574037cc7f9373ef5695d8ebe809
p010be a0311a09bba7383553267d2b3b9c075e
p010le f1cc90d292046109a626db2da9f0f9b6
p010le ee09a18aefa3ebe97715b3a7312cb8ff
pal8 0658c18dcd8d052d59dfbe23f5b368d9
rgb0 ca3fa6e865b91b3511c7f2bf62830059
rgb24 25ab271e26a5785be169578d99da5dd0

2
tests/ref/fate/filter-pixfmts-hflip
View File

@ -34,7 +34,7 @@ gray16le d91ce41e304419bcf32ac792f01bd64f
nv12 801e58f1be5fd0b5bc4bf007c604b0b4
nv21 9f10dfff8963dc327d3395af21f0554f
p010be 744b13e44d39e1ff7588983fa03e0101
p010le aeb31f50c66f376b0530c7bb6287212b
p010le a50b160346ab94f55a425065b57006f0
pal8 5b7c77d99817b4f52339742a47de7797
rgb0 0092452f37d73da20193265ace0b7d57
rgb24 21571104e6091a689feabb7867e513dd

2
tests/ref/fate/filter-pixfmts-il
View File

@ -36,7 +36,7 @@ monow 6e9cfb8d3a344c5f0c3e1d5e1297e580
nv12 3c3ba9b1b4c4dfff09c26f71b51dd146
nv21 ab586d8781246b5a32d8760a61db9797
p010be 3df51286ef66b53e3e283dbbab582263
p010le 38945445b360fa737e9e37257393e823
p010le eadcd8241e97e35b2b47d5eb2eaea6cd
rgb0 cfaf68671e43248267d8cd50cae8c13f
rgb24 88894f608cf33ba310f21996748d77a7
rgb444be 99d36d814988fb388aacdef575dacfcf

2
tests/ref/fate/filter-pixfmts-null
View File

@ -36,7 +36,7 @@ monow 54d16d2c01abfd72ecdb5e51e283937c
nv12 8e24feb2c544dc26a20047a71e4c27aa
nv21 335d85c9af6110f26ae9e187a82ed2cf
p010be 7f9842d6015026136bad60d03c035cc3
p010le 1929db89609c4b8c6d9c9030a9e7843d
p010le c453421b9f726bdaf2bacf59a492c43b
pal8 ff5929f5b42075793b2c34cb441bede5
rgb0 0de71e5a1f97f81fb51397a0435bfa72
rgb24 f4438057d046e6d98ade4e45294b21be

2
tests/ref/fate/filter-pixfmts-scale
View File

@ -36,7 +36,7 @@ monow 35c68b86c226d6990b2dcb573a05ff6b
nv12 b118d24a3653fe66e5d9e079033aef79
nv21 c74bb1c10dbbdee8a1f682b194486c4d
p010be 1d6726d94bf1385996a9a9840dd0e878
p010le 5d436e6b35292a0e356d81f37f989b66
p010le 4b316f2b9e18972299beb73511278fa8
pal8 29e10892009b2cfe431815ec3052ed3b
rgb0 fbd27e98154efb7535826afed41e9bb0
rgb24 e022e741451e81f2ecce1c7240b93e87

2
tests/ref/fate/filter-pixfmts-vflip
View File

@ -36,7 +36,7 @@ monow 90a947bfcd5f2261e83b577f48ec57b1
nv12 261ebe585ae2aa4e70d39a10c1679294
nv21 2909feacd27bebb080c8e0fa41795269
p010be 06e9354b6e0e38ba41736352cedc0bd5
p010le cdf6a3c38d9d4e3f079fa369e1dda662
p010le fd18d322bffbf5816902c13102872e22
pal8 450b0155d0f2d5628bf95a442db5f817
rgb0 56a7ea69541bcd27bef6a5615784722b
rgb24 195e6dae1c3a488b9d3ceb7560d25d85