diff --git a/libswscale/output.c b/libswscale/output.c index a05fed8afa..6ef5cb40d1 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_GBRAP12BE: + case AV_PIX_FMT_GBRAP12LE: *yuv2anyX = yuv2gbrp_full_X_c; break; } diff --git a/libswscale/utils.c b/libswscale/utils.c index 0aef672041..6e57ad324c 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -222,8 +222,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GBRAP10BE] = { 1, 0 }, [AV_PIX_FMT_GBRP12LE] = { 1, 1 }, [AV_PIX_FMT_GBRP12BE] = { 1, 1 }, - [AV_PIX_FMT_GBRAP12LE] = { 1, 0 }, - [AV_PIX_FMT_GBRAP12BE] = { 1, 0 }, + [AV_PIX_FMT_GBRAP12LE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP12BE] = { 1, 1 }, [AV_PIX_FMT_GBRP14LE] = { 1, 1 }, [AV_PIX_FMT_GBRP14BE] = { 1, 1 }, [AV_PIX_FMT_GBRP16LE] = { 1, 0 }, diff --git a/tests/ref/fate/filter-pixdesc-gbrap12be b/tests/ref/fate/filter-pixdesc-gbrap12be new file mode 100644 index 0000000000..be7c1390f5 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap12be @@ -0,0 +1 @@ +pixdesc-gbrap12be 419eca7130f22b62fd50cab347a56459 diff --git a/tests/ref/fate/filter-pixdesc-gbrap12le b/tests/ref/fate/filter-pixdesc-gbrap12le new file mode 100644 index 0000000000..99c5901064 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap12le @@ -0,0 +1 @@ +pixdesc-gbrap12le 01fff1419a76749e214056618a43f8b1 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index f19dcb09ba..540733db41 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 +gbrap12be 0c4c1f8af361571265ca259d5f70f026 +gbrap12le 5f1d8c663d4c28863e687192433b34a4 gbrp 5fbc319e30110d19d539f5b274eddb6d gbrp10be 703a17591a2a5c236675c5101c349bcc gbrp10le ee014153f55c011918df5b2394815780 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 86b3f022a7..165507ef74 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 +gbrap12be c9769d18733cdc2664d8b9af09a03f6d +gbrap12le 3f80453c1ac6c5d1b2febf3ef141b476 gbrp ec671f573c2105072ab68a1933c58fee gbrp10be 6f0130a41f01e58593d3840446dd94b7 gbrp10le 9c152b7dfb7ad7bc477518d97316d04f diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 7f3abf6067..61fd2f97de 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 +gbrap12be e7f471132628b1c034199cc109b84bc2 +gbrap12le 886207e5aa379a0312485b94e5fd5edd gbrp 838025a3062f7f31e99196ce66961ad7 gbrp10be f63c2555ea19fc78b00fd5b3e2b48e8c gbrp10le be64c374ab318235d912372e99a0516a diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 6dac63846a..ac882c59cf 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 +gbrap12be 302b353dff696ec9fd0d85a0cc14802b +gbrap12le ae2d6db2c9c825f06d92389de21263d2 gbrp 506dea2fe492e985a396d1b11ccd8db3 gbrp10be 55bbfe2d472780dcbadf3027778caa0e gbrp10le 13a39077ab1b2c3b49afd3e250b84a77 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index f069fc67c7..804d82727b 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 +gbrap12be ffe9aa4cbcc42f71757efe18826764ac +gbrap12le 88a85c1b3c5e19e299fdd209b73ac1ba gbrp 0ecfeca171ba3a1a2ff4e92f572b71cf gbrp10be 774398c2f81757a536c094f16cfc541a gbrp10le e9a6434d691be541f789f850963da181 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 640a75a855..c0e8a4974d 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 +gbrap12be 48609d6b61ff6313939fa2d9c3ebb6d9 +gbrap12le e3b5342c8e47820f2de7e2dd61872312 gbrp dc06edb62e70024a216c8e303b79b328 gbrp10be 321e7f061d8b9b5801221b6cf3c99666 gbrp10le 799ed3afca01076439a0b6785b3dc4bb diff --git a/tests/ref/fate/filter-pixfmts-lut b/tests/ref/fate/filter-pixfmts-lut index 1f7c2eaa0f..58dc3b574b 100644 --- a/tests/ref/fate/filter-pixfmts-lut +++ b/tests/ref/fate/filter-pixfmts-lut @@ -3,6 +3,7 @@ argb 4f575be3cd02799389f581df99c4de38 bgr24 fa43e3b2abfde8d9e60e157a9acc553d bgra 4e2e689897ee7a8e42b16234597bab35 gbrap 0d1eb2c39e291c53c57302cdc653c2fc +gbrap12le 43fec231bd1d3dd957cdd8478cab9259 gbrp e572d53183f3f2ed3951aa9940d440a1 gbrp10le a8fd1ebbc36a477e2b134241fed91687 gbrp12le c5a4b89571f7095eb737ad9fd6b1ee08 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index f19dcb09ba..540733db41 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 +gbrap12be 0c4c1f8af361571265ca259d5f70f026 +gbrap12le 5f1d8c663d4c28863e687192433b34a4 gbrp 5fbc319e30110d19d539f5b274eddb6d gbrp10be 703a17591a2a5c236675c5101c349bcc gbrp10le ee014153f55c011918df5b2394815780 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 88236b26b0..0913afaf1b 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 +gbrap12le e0e43f838cfbe98086042ba54b5f70be gbrp 3c94d39256db2409015df913fd330a90 gbrp10le 5b356737cd8a396f39bbdadb7cb35e06 gbrp12le 91fdad0d1edf7bfa2805e2041e8da3cd diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 63205577bb..1952102815 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 +gbrap12be 1d9b57766ba9c2192403f43967cb9af0 +gbrap12le bb1ba1c157717db3dd612a76d38a018e gbrp dc3387f925f972c61aae7eb23cdc19f0 gbrp10be 0277d4c3a8498d75e2783fb81379e481 gbrp10le f3d70f8ab845c3c9b8f7452e4a6e285a diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 57dbca8bab..36db7ba04d 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 +gbrap12be 16a3d105ba852a9fa23ea5232db51b48 +gbrap12le 6ef8a3ac4129ec23c34aec14ac41f249 gbrp 413b0f6ea51588d4be5f0c76d43d8796 gbrp10be d02bd50db83213667808f5bacefe667c gbrp10le 2d4a5ebc773ffc3d857a6ef24afbe10e