diff options
| author | Martin Storsjö <martin@martin.st> | 2013-02-11 13:37:29 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-02-11 20:03:16 +0200 |
| commit | d192ac3e03d1ebdb671f22b290da577d19f3e156 (patch) | |
| tree | 3a7eb8200a818953161eb43914dc20c5acc1272e | |
| parent | 62a43d30cc3b9b2460f2c926beb522df32493625 (diff) | |
| download | ffmpeg-d192ac3e03d1ebdb671f22b290da577d19f3e156.tar.gz | |
swscale: Disallow conversion to GBRP16
This reverts parts of d6d5ef5534d582, that didn't work right. (The
tests that were added failed on big endian, and the output looked
garbled on little endian as well.)
This is due to the fact that the intermediate scaling values (from
e.g. hScale8To19_c or hScale16To19_c) are stored as int32_t and
thus requires a separate output function, while yuv2gbrp_full_X_c
only interprets it as int16_t.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libswscale/utils.c | 4 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixdesc | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_copy | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_null | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_scale | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_vflip | 2 |
6 files changed, 2 insertions, 12 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index b216eff63e..6bbdb64f8d 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -168,8 +168,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_GBRP16LE] = { 1, 1 }, - [AV_PIX_FMT_GBRP16BE] = { 1, 1 }, + [AV_PIX_FMT_GBRP16LE] = { 1, 0 }, + [AV_PIX_FMT_GBRP16BE] = { 1, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt) diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc index 683db66fb4..23452aed2a 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/lavfi/pixdesc @@ -15,8 +15,6 @@ bgra 76a18a5151242fa137133f604cd624d2 gbrp 76204621e200a3cc633012f6720c7005 gbrp10be 2ca4a4a589a7dc461ff186913c7a69e5 gbrp10le 46176f1fcc6e67f9862115fe373f73d3 -gbrp16be b577122bb4fc34274b9fc2d1c6b934d0 -gbrp16le 7a8fc641745c4f363348522a687d2a08 gbrp9be 981c2c1b0ef1791824b4c7518331bc2e gbrp9le 25fb915ed11d07d631e0e7b78d54bebf gray db08f7f0751900347e6b8649e4164d21 diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 683db66fb4..23452aed2a 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -15,8 +15,6 @@ bgra 76a18a5151242fa137133f604cd624d2 gbrp 76204621e200a3cc633012f6720c7005 gbrp10be 2ca4a4a589a7dc461ff186913c7a69e5 gbrp10le 46176f1fcc6e67f9862115fe373f73d3 -gbrp16be b577122bb4fc34274b9fc2d1c6b934d0 -gbrp16le 7a8fc641745c4f363348522a687d2a08 gbrp9be 981c2c1b0ef1791824b4c7518331bc2e gbrp9le 25fb915ed11d07d631e0e7b78d54bebf gray db08f7f0751900347e6b8649e4164d21 diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 683db66fb4..23452aed2a 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -15,8 +15,6 @@ bgra 76a18a5151242fa137133f604cd624d2 gbrp 76204621e200a3cc633012f6720c7005 gbrp10be 2ca4a4a589a7dc461ff186913c7a69e5 gbrp10le 46176f1fcc6e67f9862115fe373f73d3 -gbrp16be b577122bb4fc34274b9fc2d1c6b934d0 -gbrp16le 7a8fc641745c4f363348522a687d2a08 gbrp9be 981c2c1b0ef1791824b4c7518331bc2e gbrp9le 25fb915ed11d07d631e0e7b78d54bebf gray db08f7f0751900347e6b8649e4164d21 diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index fde07b091a..80816ecde0 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -15,8 +15,6 @@ bgra a5e7040f9a80cccd65e5acf2ca09ace5 gbrp 205c50f8359cb4ba2827a7711dea2cc6 gbrp10be 30b7f9d5ef5da474fb794743146236aa gbrp10le 2e9949a01fe4c38774728e34795165cc -gbrp16be 4045de229757b7a285fea274b9599c0d -gbrp16le f71e77371c0c5781e46af85ea95f92a3 gbrp9be 6bac01a7f64a381521b2149fc46f4178 gbrp9le 4b6cba7acf7886c13db122e590ec6b1f gray d7786a7d9d99ac74230cc045cab5632c diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index 3909d9a110..f0ad5eb8a8 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -15,8 +15,6 @@ bgra 7f9b799fb48544e49ce93e91d7f9fca8 gbrp 25c1bce192daefab910d51a56b52199e gbrp10be 6fe980f9ca94cbcdb9e01f4e906fdf19 gbrp10le f793a1d96d3524c6a17e53356c415c4e -gbrp16be 6517b6c4fde50fd451e6fb16ccd204c9 -gbrp16le 5b8f07a424c3c2843b39ba5dd9803d3e gbrp9be e10dc3a2566b065260a45356ef08c1cd gbrp9le f25105a33f18d6bcca3205c67ec106be gray 30d9014a9d43b5f37e7aa64be3a3ecfc |