diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:41:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:47:36 +0100 |
| commit | a201639a01284003a055f195f4e850a0cf3fc2d5 (patch) | |
| tree | 959d66dc788f6d76941e646bbb49dea93209b231 /tests | |
| parent | 788afee86e283535f37fdcb649b2f180ad305f75 (diff) | |
| parent | 7658295ba353b8bedb3af904f46cfb1ba0cea86a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixfmt: support more yuva formats
swscale: support gray to 9bit and 10bit formats
configure: rewrite print_config() function using awk
FATE: fix (AD)PCM test dependencies broken in e519990
Use ptrdiff_t instead of int for intra pred "stride" function parameter.
x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_copy | 18 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_null | 18 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_pixdesctest | 18 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_scale | 18 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_vflip | 18 |
5 files changed, 90 insertions, 0 deletions
diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 042f2d5518..d13af3d591 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -74,8 +74,26 @@ yuv444p16le 96a857dba8dc6792c58daec872825b32 yuv444p9be 07727e5c9040b7f0a17d591288ac330d yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva420p10be c15ea36665ebb6c6400b2817f8dc0959 +yuva420p10le ad2d0424033e7acbafa6d58f59b4487e +yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 +yuva420p16le 13e195aa96329eb49921b6f9f07b875c +yuva420p9be bfbc86280eb417d53c3e09df1d6628b2 +yuva420p9le 78f5593bf51a31841ef83df41d0316eb yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva422p10be 90ce250a517843b3e8a1ac0f4fdad733 +yuva422p10le c74cfda8934e3bf86940b7a08c809b35 +yuva422p16be c3f7354b6013b43439e02aa02be5fe69 +yuva422p16le a7ccc43820683ab15061d14cf8efce6c +yuva422p9be 14c55a16d19499b54b4341f135d3e558 +yuva422p9le a8bf168e5d2709222192d0aff46b1373 yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuva444p10be bea827ff82f229145a016954120b731f +yuva444p10le c51b0554cfba0fabacf979683dceee95 +yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa +yuva444p16le a9272ac197e4a4195662ce90f533976c +yuva444p9be f72f646ef07cdab613420585aba041ac +yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 yuvj420p 73661456012f20cda81207b14bb0c0a5 yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 042f2d5518..d13af3d591 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -74,8 +74,26 @@ yuv444p16le 96a857dba8dc6792c58daec872825b32 yuv444p9be 07727e5c9040b7f0a17d591288ac330d yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva420p10be c15ea36665ebb6c6400b2817f8dc0959 +yuva420p10le ad2d0424033e7acbafa6d58f59b4487e +yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 +yuva420p16le 13e195aa96329eb49921b6f9f07b875c +yuva420p9be bfbc86280eb417d53c3e09df1d6628b2 +yuva420p9le 78f5593bf51a31841ef83df41d0316eb yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva422p10be 90ce250a517843b3e8a1ac0f4fdad733 +yuva422p10le c74cfda8934e3bf86940b7a08c809b35 +yuva422p16be c3f7354b6013b43439e02aa02be5fe69 +yuva422p16le a7ccc43820683ab15061d14cf8efce6c +yuva422p9be 14c55a16d19499b54b4341f135d3e558 +yuva422p9le a8bf168e5d2709222192d0aff46b1373 yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuva444p10be bea827ff82f229145a016954120b731f +yuva444p10le c51b0554cfba0fabacf979683dceee95 +yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa +yuva444p16le a9272ac197e4a4195662ce90f533976c +yuva444p9be f72f646ef07cdab613420585aba041ac +yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 yuvj420p 73661456012f20cda81207b14bb0c0a5 yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df diff --git a/tests/ref/lavfi/pixfmts_pixdesctest b/tests/ref/lavfi/pixfmts_pixdesctest index 918efbc2ef..67e5925ce4 100644 --- a/tests/ref/lavfi/pixfmts_pixdesctest +++ b/tests/ref/lavfi/pixfmts_pixdesctest @@ -74,8 +74,26 @@ yuv444p16le 96a857dba8dc6792c58daec872825b32 yuv444p9be 07727e5c9040b7f0a17d591288ac330d yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva420p10be a3fd7193dc4abb551ab7f88b7e366d33 +yuva420p10le ad2d0424033e7acbafa6d58f59b4487e +yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 +yuva420p16le 13e195aa96329eb49921b6f9f07b875c +yuva420p9be cb12ffe4ea54b118020b97d7bc0c7fe5 +yuva420p9le 78f5593bf51a31841ef83df41d0316eb yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva422p10be 90ce250a517843b3e8a1ac0f4fdad733 +yuva422p10le c74cfda8934e3bf86940b7a08c809b35 +yuva422p16be c3f7354b6013b43439e02aa02be5fe69 +yuva422p16le a7ccc43820683ab15061d14cf8efce6c +yuva422p9be 14c55a16d19499b54b4341f135d3e558 +yuva422p9le a8bf168e5d2709222192d0aff46b1373 yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuva444p10be bea827ff82f229145a016954120b731f +yuva444p10le c51b0554cfba0fabacf979683dceee95 +yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa +yuva444p16le a9272ac197e4a4195662ce90f533976c +yuva444p9be f72f646ef07cdab613420585aba041ac +yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 yuvj420p 73661456012f20cda81207b14bb0c0a5 yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 3713142d86..76d7d34666 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -74,8 +74,26 @@ yuv444p16le f8bac16bf1f2afbd3626e07bcc815a9f yuv444p9be db739906e3ae3b8792cdc5a0c3387565 yuv444p9le 693b8d30958ef1a37296b1690b4b36d2 yuva420p df46b738bdaf30d3a7f880b5ae45b092 +yuva420p10be 8e5f3b069fdf2f0c14f49ad827991092 +yuva420p10le e6915376ad7d0f2be9d50099e5ee33ef +yuva420p16be aa8ca29a93936c62ef038ca8a57f47d7 +yuva420p16le ee0cbb31f9cdb897c1982df0caa8ffa0 +yuva420p9be b8ca5603123aeb953b9d4fc8ec8e35e1 +yuva420p9le 220212a81cda0f2d112f7ae96d532ff9 yuva422p 650755270debb03d2c03b2e93b64c576 +yuva422p10be fe0d8c2509d2d23f856093f9aea83cba +yuva422p10le c641064c6306c6eaf95b387e5ae08d67 +yuva422p16be 0b8f9385498d2449b18fb15237b0a448 +yuva422p16le ce22b20deb93b4846a5043aa104f22d1 +yuva422p9be 62e767085855b9605513b39eed787e8e +yuva422p9le f69c09e872838fe392dfe1825263d3f1 yuva444p 72083e0941cc45af9f97b89d3cd16112 +yuva444p10be d8b6fe8cfb60c6e516563c0a4f5c75a8 +yuva444p10le 4a85b717f21975216144efc11e2f2cda +yuva444p16be 36a8797545163c24fc0d73f669c3108c +yuva444p16le c017c229aacb832a12c2297fb080a7a0 +yuva444p9be 3826abd6dd62d42ad02c9bb610dec561 +yuva444p9le 2c7bfb90f7db9faab6862537801e1143 yuvj420p 31386dce60a2dcc493da5d0ed9d880df yuvj422p 492452e50a3fe66724840cad29be4098 yuvj440p 7632893e81d3f4f3ace3755f97479897 diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index 50a459dec0..45082f79ac 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -74,8 +74,26 @@ yuv444p16le 201e3acfa6f7628dfe2a1663de1128b1 yuv444p9be 6143c321929ade9e0bc93ddea926e936 yuv444p9le e43ba2026848ec803fabf74d77c10125 yuva420p dc8fd115eaf203a3eac351b92a7d8f18 +yuva420p10be 8dc20d4b654a82680dcb75391f1c8c28 +yuva420p10le f43a991e8b5fe7e192cf4e0dfee2b6cb +yuva420p16be b5c54895e87521f65a298d33bab5eb08 +yuva420p16le 95e208bc6644e23a2126ac5fca085f06 +yuva420p9be aa122367fc3fde822f812a4b878893f8 +yuva420p9le 4b57b8bd1534743f6740502c74bef385 yuva422p 6091f9c62a121c09eadb02e9173b2da2 +yuva422p10be 93b6afb2b1d1538b1c87caa040c43f4e +yuva422p10le 1c9359025ab8d257f0f5296e6b5a5787 +yuva422p16be 3fa019b3d5e6dcb7c8e338837b9cffe1 +yuva422p16le 871f244989e14f5d3eda45abb6b3dfd1 +yuva422p9be 923c816778f782ff8a56bcd1b14ef08d +yuva422p9le bd882d40af0369d9ef7891c8e7891024 yuva444p 9a55e83047abcc7a709f20805070135e +yuva444p10be 7ae88f488969b527c1348383c0d06ade +yuva444p10le 79a8dab388eb4d6cd12949b456ef5975 +yuva444p16be 4699a802e8ea3e74e968122980c0b0b0 +yuva444p16le 6f54a8cff38c54a235b92a0f1314e0aa +yuva444p9be 7472bb4b0c774d5d741035086d5e4330 +yuva444p9le ae11ddd5a3e8d69a36989f6f2a8897a1 yuvj420p 200b0332de9944e76c94d2e0699a5a2d yuvj422p a19a89ef145305cf224ef5aa247d075a yuvj440p 4240c9348d28af5f3edd0e642002bd2c |