[FFmpeg-cvslog] swscale: Add GBRAP10 output
Michael Niedermayer
git at videolan.org
Thu Nov 10 01:35:48 EET 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Nov 10 00:02:50 2016 +0100| [b828788d58cb6f55e0bffa4682d75ddf84b4214b] | committer: Michael Niedermayer
swscale: Add GBRAP10 output
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b828788d58cb6f55e0bffa4682d75ddf84b4214b
---
libswscale/output.c | 2 ++
libswscale/utils.c | 4 ++--
tests/ref/fate/filter-pixdesc-gbrap10be | 1 +
tests/ref/fate/filter-pixdesc-gbrap10le | 1 +
tests/ref/fate/filter-pixfmts-copy | 2 ++
tests/ref/fate/filter-pixfmts-crop | 2 ++
tests/ref/fate/filter-pixfmts-field | 2 ++
tests/ref/fate/filter-pixfmts-fieldorder | 2 ++
tests/ref/fate/filter-pixfmts-hflip | 2 ++
tests/ref/fate/filter-pixfmts-il | 2 ++
tests/ref/fate/filter-pixfmts-null | 2 ++
tests/ref/fate/filter-pixfmts-pad | 1 +
tests/ref/fate/filter-pixfmts-scale | 2 ++
tests/ref/fate/filter-pixfmts-vflip | 2 ++
14 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/libswscale/output.c b/libswscale/output.c
index 6ef5cb4..b0d33b1 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -2405,6 +2405,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
case AV_PIX_FMT_GBRP16BE:
case AV_PIX_FMT_GBRP16LE:
case AV_PIX_FMT_GBRAP:
+ case AV_PIX_FMT_GBRAP10BE:
+ case AV_PIX_FMT_GBRAP10LE:
case AV_PIX_FMT_GBRAP12BE:
case AV_PIX_FMT_GBRAP12LE:
*yuv2anyX = yuv2gbrp_full_X_c;
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 6e57ad3..4dea1ef 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -218,8 +218,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_GBRP9BE] = { 1, 1 },
[AV_PIX_FMT_GBRP10LE] = { 1, 1 },
[AV_PIX_FMT_GBRP10BE] = { 1, 1 },
- [AV_PIX_FMT_GBRAP10LE] = { 1, 0 },
- [AV_PIX_FMT_GBRAP10BE] = { 1, 0 },
+ [AV_PIX_FMT_GBRAP10LE] = { 1, 1 },
+ [AV_PIX_FMT_GBRAP10BE] = { 1, 1 },
[AV_PIX_FMT_GBRP12LE] = { 1, 1 },
[AV_PIX_FMT_GBRP12BE] = { 1, 1 },
[AV_PIX_FMT_GBRAP12LE] = { 1, 1 },
diff --git a/tests/ref/fate/filter-pixdesc-gbrap10be b/tests/ref/fate/filter-pixdesc-gbrap10be
new file mode 100644
index 0000000..fbdaf69
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrap10be
@@ -0,0 +1 @@
+pixdesc-gbrap10be 95487536cdc73e10e06d739e03427390
diff --git a/tests/ref/fate/filter-pixdesc-gbrap10le b/tests/ref/fate/filter-pixdesc-gbrap10le
new file mode 100644
index 0000000..f53ed5e
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrap10le
@@ -0,0 +1 @@
+pixdesc-gbrap10le bf2ce9a1b3cfd56667c19b30a1a51181
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index 540733d..8cac23e 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -19,6 +19,8 @@ bgra 3934fb81a602dfa7d29420b1a66f0fd8
bgra64be c8d3217bf58d34f080ac88c0b0012c77
bgra64le b71d75a928aac14cb768403e6f6a9910
gbrap 98d30987407c51e5620921e11d40a4ff
+gbrap10be edcffb185e44b6dae5c2ead5505b7125
+gbrap10le 2a7392e14b21b1f9457526a071236a6d
gbrap12be 0c4c1f8af361571265ca259d5f70f026
gbrap12le 5f1d8c663d4c28863e687192433b34a4
gbrp 5fbc319e30110d19d539f5b274eddb6d
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 165507e..ef74ed9 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -19,6 +19,8 @@ bgra e66a5f68ba463cbc89fce23a61bb5203
bgra64be 1ad8dd02714cafec793fb89577ddde47
bgra64le dd29ec9aba43aa3e8f9f5b9a93ca8831
gbrap 188cd467fe7ae7d85ae9ca8bdfa07739
+gbrap10be 1880c4856d9cc6492b8b859f2711aaf1
+gbrap10le c2b6e35f8b7ca363a7ec021ccdf31d1f
gbrap12be c9769d18733cdc2664d8b9af09a03f6d
gbrap12le 3f80453c1ac6c5d1b2febf3ef141b476
gbrp ec671f573c2105072ab68a1933c58fee
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 61fd2f9..149128b 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -19,6 +19,8 @@ bgra 66d6e0846990fff0f09a07c43c3add71
bgra64be ec0bdef8663dc9d73818a48419cb4764
bgra64le 9e2def541e51bc6e77fbffbff7fa146a
gbrap 08a28b79dbd19246d1a94e3466af3624
+gbrap10be 29d46cbf021b233f5f1886e5d5fe21b4
+gbrap10le 4017c5d8c124438eb9aefa107db58d3b
gbrap12be e7f471132628b1c034199cc109b84bc2
gbrap12le 886207e5aa379a0312485b94e5fd5edd
gbrp 838025a3062f7f31e99196ce66961ad7
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index ac882c5..a4b5447 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -19,6 +19,8 @@ bgra 5967b559257dbb6784f93b9d2bef4edd
bgra64be 64a4ec15bc35ede2018f650b50c2429b
bgra64le 5029192d0f32383c9f25f8e7da7cb5a0
gbrap 00afb65d44bea99c31b318fdbeb3be10
+gbrap10be 8b27254a69cd0e25fa55262a743f95e6
+gbrap10le 52278021718ec370903dccc923dc8bf6
gbrap12be 302b353dff696ec9fd0d85a0cc14802b
gbrap12le ae2d6db2c9c825f06d92389de21263d2
gbrp 506dea2fe492e985a396d1b11ccd8db3
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index 804d827..aba7a03 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -19,6 +19,8 @@ bgra 275f05a382bcbc9bc77c06b79e1d8a71
bgra64be 1cabeafe9c21a4f7ccd976220f22ee5a
bgra64le 1b15c01c94cf9af89273da1d1f994cff
gbrap bf6a2b2f206fbbb332a718fb570d7cb7
+gbrap10be f188dc23756469cbdd172fe97ad58121
+gbrap10le 262f0501633ea4670020fae8ac6835e2
gbrap12be ffe9aa4cbcc42f71757efe18826764ac
gbrap12le 88a85c1b3c5e19e299fdd209b73ac1ba
gbrp 0ecfeca171ba3a1a2ff4e92f572b71cf
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index c0e8a49..0bf0407 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -19,6 +19,8 @@ bgra e6ae08f06f157297296b319a249dddf5
bgra64be de7c036f20fc54d89690239cc6239678
bgra64le d1aa975fa03ce226008396b30a653420
gbrap 575ff1fe5d7585ed82da1db35f106e4c
+gbrap10be bafa57a2e4331d8a39f6f0087c85d4b1
+gbrap10le 553a1f439d8184dc400432d3f786fbce
gbrap12be 48609d6b61ff6313939fa2d9c3ebb6d9
gbrap12le e3b5342c8e47820f2de7e2dd61872312
gbrp dc06edb62e70024a216c8e303b79b328
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index 540733d..8cac23e 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -19,6 +19,8 @@ bgra 3934fb81a602dfa7d29420b1a66f0fd8
bgra64be c8d3217bf58d34f080ac88c0b0012c77
bgra64le b71d75a928aac14cb768403e6f6a9910
gbrap 98d30987407c51e5620921e11d40a4ff
+gbrap10be edcffb185e44b6dae5c2ead5505b7125
+gbrap10le 2a7392e14b21b1f9457526a071236a6d
gbrap12be 0c4c1f8af361571265ca259d5f70f026
gbrap12le 5f1d8c663d4c28863e687192433b34a4
gbrp 5fbc319e30110d19d539f5b274eddb6d
diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad
index 0913afa..adf1cc9 100644
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@@ -6,6 +6,7 @@ bgr0 32207a2de1b2ac7937e940a8459b97c0
bgr24 f8b65ad845905c7d0c93ca28dfbb826f
bgra 929aac15e848038e367c250037575f9f
gbrap 5f16cccab5a17cb766c882e865995167
+gbrap10le 454bf36e86ae92ab7853a9508bb75a99
gbrap12le e0e43f838cfbe98086042ba54b5f70be
gbrp 3c94d39256db2409015df913fd330a90
gbrp10le 5b356737cd8a396f39bbdadb7cb35e06
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 1952102..a23c457 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -19,6 +19,8 @@ bgra d8316272bc3a360ef9dff3ecc84520a3
bgra64be 4e6a1b9f9c18b881c27d76611d45f737
bgra64le efeee0abcc658ebcff049d5e74d74943
gbrap 4a100f750ac846b34bfeef0d6893c3de
+gbrap10be 6d89abb9248006c3e9017545e9474654
+gbrap10le cf974e23f485a10740f5de74a5c8c3df
gbrap12be 1d9b57766ba9c2192403f43967cb9af0
gbrap12le bb1ba1c157717db3dd612a76d38a018e
gbrp dc3387f925f972c61aae7eb23cdc19f0
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 36db7ba..71521ab0 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -19,6 +19,8 @@ bgra 0af63cc2ffd61af252df93cc767de358
bgra64be 31af33833f6d8f2e4a62683288770aa4
bgra64le 45feb93863055282447d1ff89c5158bf
gbrap 421c56a25f88d58b9361f5c7bb368e21
+gbrap10be e8134b72acc090b093b4d9b4d4703c7e
+gbrap10le 43bde7bd6a676c6ac33dbcc4c72762f3
gbrap12be 16a3d105ba852a9fa23ea5232db51b48
gbrap12le 6ef8a3ac4129ec23c34aec14ac41f249
gbrp 413b0f6ea51588d4be5f0c76d43d8796
More information about the ffmpeg-cvslog
mailing list