diff options
Diffstat (limited to 'recipes-multimedia/libyami')
11 files changed, 0 insertions, 428 deletions
diff --git a/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch b/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch deleted file mode 100644 index f7de9d16..00000000 --- a/recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | From f2e6d2ecfea635ab952649156e31ca893d4b1a47 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 12 Aug 2017 08:49:20 -0700 | ||
4 | Subject: [PATCH] Fix build with clang | ||
5 | |||
6 | Fix errors e.g. | ||
7 | error: comparison of constant -1 with expression of type 'char' is always true [-Werror,-Wtautological-constant-out-of-range-compare]error: comparison of constant -1 with expression of type 'char' is always true [-Werror,-Wtautological-constant-out-of-range-compare] | ||
8 | |||
9 | and | ||
10 | |||
11 | psnr.cpp:225:17: error: bool literal returned from 'main' [-Werror,-Wmain] | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | --- | ||
17 | tests/decodehelp.cpp | 2 +- | ||
18 | tests/encodehelp.h | 2 +- | ||
19 | tests/vpp.cpp | 2 +- | ||
20 | tests/yamitranscode.cpp | 2 +- | ||
21 | testscripts/psnr.cpp | 4 ++-- | ||
22 | 5 files changed, 6 insertions(+), 6 deletions(-) | ||
23 | |||
24 | diff --git a/tests/decodehelp.cpp b/tests/decodehelp.cpp | ||
25 | index b27b977..62cca63 100644 | ||
26 | --- a/tests/decodehelp.cpp | ||
27 | +++ b/tests/decodehelp.cpp | ||
28 | @@ -81,7 +81,7 @@ bool processCmdLine(int argc, char** argv, DecodeParameter* parameters) | ||
29 | { NULL, no_argument, NULL, 0 } | ||
30 | }; | ||
31 | |||
32 | - char opt; | ||
33 | + int opt; | ||
34 | while ((opt = getopt_long_only(argc, argv, "h:m:n:i:f:o:w:?", long_opts,&option_index)) != -1){ | ||
35 | switch (opt) { | ||
36 | case 'h': | ||
37 | diff --git a/tests/encodehelp.h b/tests/encodehelp.h | ||
38 | index 63580a4..651ec08 100644 | ||
39 | --- a/tests/encodehelp.h | ||
40 | +++ b/tests/encodehelp.h | ||
41 | @@ -109,7 +109,7 @@ static VideoRateControl string_to_rc_mode(char *str) | ||
42 | |||
43 | static bool process_cmdline(int argc, char *argv[]) | ||
44 | { | ||
45 | - char opt; | ||
46 | + int opt; | ||
47 | const struct option long_opts[] = { | ||
48 | { "help", no_argument, NULL, 'h' }, | ||
49 | { "qp", required_argument, NULL, 0 }, | ||
50 | diff --git a/tests/vpp.cpp b/tests/vpp.cpp | ||
51 | index 5a60c0a..52da43b 100644 | ||
52 | --- a/tests/vpp.cpp | ||
53 | +++ b/tests/vpp.cpp | ||
54 | @@ -151,7 +151,7 @@ public: | ||
55 | private: | ||
56 | bool processCmdLine(int argc, char* argv[]) | ||
57 | { | ||
58 | - char opt; | ||
59 | + int opt; | ||
60 | const struct option long_opts[] = { | ||
61 | { "help", no_argument, NULL, 'h' }, | ||
62 | { "sharpening", required_argument, NULL, 's' }, | ||
63 | diff --git a/tests/yamitranscode.cpp b/tests/yamitranscode.cpp | ||
64 | index 6207209..00164ce 100755 | ||
65 | --- a/tests/yamitranscode.cpp | ||
66 | +++ b/tests/yamitranscode.cpp | ||
67 | @@ -100,7 +100,7 @@ static VideoRateControl string_to_rc_mode(char *str) | ||
68 | |||
69 | static bool processCmdLine(int argc, char *argv[], TranscodeParams& para) | ||
70 | { | ||
71 | - char opt; | ||
72 | + int opt; | ||
73 | const struct option long_opts[] = { | ||
74 | { "help", no_argument, NULL, 'h' }, | ||
75 | { "qp", required_argument, NULL, 0 }, | ||
76 | diff --git a/testscripts/psnr.cpp b/testscripts/psnr.cpp | ||
77 | index 5cc24c9..68bd668 100644 | ||
78 | --- a/testscripts/psnr.cpp | ||
79 | +++ b/testscripts/psnr.cpp | ||
80 | @@ -215,14 +215,14 @@ int main(int argc, char *argv[]) | ||
81 | const char* psnrresult = "average_psnr.txt"; | ||
82 | int width=0,height=0; | ||
83 | int standardpsnr = NORMAL_PSNR; | ||
84 | - char opt; | ||
85 | + int opt; | ||
86 | while ((opt = getopt(argc, argv, "h:W:H:i:o:s:?")) != -1) | ||
87 | { | ||
88 | switch (opt) { | ||
89 | case 'h': | ||
90 | case '?': | ||
91 | print_help(argv[0]); | ||
92 | - return false; | ||
93 | + return -1; | ||
94 | case 'i': | ||
95 | filename1 = optarg; | ||
96 | break; | ||
diff --git a/recipes-multimedia/libyami/libyami-utils_1.3.1.bb b/recipes-multimedia/libyami/libyami-utils_1.3.1.bb deleted file mode 100644 index ab1b83aa..00000000 --- a/recipes-multimedia/libyami/libyami-utils_1.3.1.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | SUMMARY = "Applications and Scripts for libyami." | ||
2 | DESCRIPTION = "Applications and Scripts for libyami." | ||
3 | |||
4 | HOMEPAGE = "https://github.com/intel/libyami-utils" | ||
5 | BUGTRACKER = "https://github.com/intel/libyami-utils/issues/new" | ||
6 | |||
7 | LICENSE = "Apache-2.0" | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" | ||
9 | |||
10 | SRC_URI = "git://github.com/intel/libyami-utils.git \ | ||
11 | file://0001-Fix-build-with-clang.patch \ | ||
12 | " | ||
13 | SRCREV = "7e801b5cc3066b176c2dccffda0af8d762184650" | ||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | DEPENDS = "libva libyami" | ||
17 | |||
18 | inherit autotools pkgconfig distro_features_check | ||
19 | |||
20 | REQUIRED_DISTRO_FEATURES = "opengl" | ||
21 | |||
22 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
23 | |||
24 | # --enable-x11 needs libva-x11 | ||
25 | # gles-tests fail to build without x11: see https://github.com/intel/libyami-utils/issues/91 | ||
26 | PACKAGECONFIG[x11] = "--enable-x11 --enable-egl,--disable-x11 --disable-egl, virtual/libx11" | ||
diff --git a/recipes-multimedia/libyami/libyami/0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch b/recipes-multimedia/libyami/libyami/0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch deleted file mode 100644 index a96c9b85..00000000 --- a/recipes-multimedia/libyami/libyami/0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 294874b610a5b8af9b736b3afc938010af58785e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 17:15:45 -0700 | ||
4 | Subject: [PATCH 1/9] bitWriter.cpp: Delete unused CACHEBYTES | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | codecparsers/bitWriter.cpp | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/codecparsers/bitWriter.cpp b/codecparsers/bitWriter.cpp | ||
14 | index 9bcb14d..08469bf 100644 | ||
15 | --- a/codecparsers/bitWriter.cpp | ||
16 | +++ b/codecparsers/bitWriter.cpp | ||
17 | @@ -24,7 +24,6 @@ | ||
18 | |||
19 | namespace YamiParser { | ||
20 | |||
21 | -const uint32_t CACHEBYTES = sizeof(unsigned long int); | ||
22 | const uint32_t CACHEBITS = sizeof(unsigned long int) * 8; | ||
23 | |||
24 | // clip to keep lowest n bits | ||
25 | -- | ||
26 | 2.14.1 | ||
27 | |||
diff --git a/recipes-multimedia/libyami/libyami/0002-typecast-index-from-size_t-to-int.patch b/recipes-multimedia/libyami/libyami/0002-typecast-index-from-size_t-to-int.patch deleted file mode 100644 index a216566c..00000000 --- a/recipes-multimedia/libyami/libyami/0002-typecast-index-from-size_t-to-int.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 88fa048e22ad00b04054b8a64df53bd440e01537 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 17:29:02 -0700 | ||
4 | Subject: [PATCH 2/9] typecast index from size_t to int | ||
5 | |||
6 | size_t is not consistent across architectures e.g. on arm its unsigned int | ||
7 | |||
8 | Fixes | ||
9 | error: comparison of unsigned expression < 0 is always false [-Werror,-Wtautological-compare] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | codecparsers/jpegParser.cpp | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/codecparsers/jpegParser.cpp b/codecparsers/jpegParser.cpp | ||
19 | index 2217028..6da5c36 100644 | ||
20 | --- a/codecparsers/jpegParser.cpp | ||
21 | +++ b/codecparsers/jpegParser.cpp | ||
22 | @@ -639,7 +639,7 @@ bool Parser::parseDAC() | ||
23 | |||
24 | length -= 2; | ||
25 | |||
26 | - if (index < 0 || index >= (2 * NUM_ARITH_TBLS)) { | ||
27 | + if ((int)index < 0 || index >= (2 * NUM_ARITH_TBLS)) { | ||
28 | ERROR("Invalid DAC Index"); | ||
29 | return false; | ||
30 | } | ||
31 | @@ -747,7 +747,7 @@ bool Parser::parseDHT() | ||
32 | huffTables = &m_dcHuffTables; | ||
33 | } | ||
34 | |||
35 | - if (index < 0 || index >= NUM_HUFF_TBLS) { | ||
36 | + if ((int)index < 0 || index >= NUM_HUFF_TBLS) { | ||
37 | ERROR("Bad Huff Table Index"); | ||
38 | return false; | ||
39 | } | ||
40 | -- | ||
41 | 2.14.1 | ||
42 | |||
diff --git a/recipes-multimedia/libyami/libyami/0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch b/recipes-multimedia/libyami/libyami/0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch deleted file mode 100644 index 17289602..00000000 --- a/recipes-multimedia/libyami/libyami/0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 533d63287e9dd8f269b137c18fbe6c19206c8668 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 17:49:43 -0700 | ||
4 | Subject: [PATCH 3/9] Add -Wno-invalid-offsetof to compiler commandline | ||
5 | |||
6 | clang++ is fussy about offsetof on non-POD types | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | codecparsers/Makefile.am | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/codecparsers/Makefile.am b/codecparsers/Makefile.am | ||
16 | index 720bf81..d9226b3 100644 | ||
17 | --- a/codecparsers/Makefile.am | ||
18 | +++ b/codecparsers/Makefile.am | ||
19 | @@ -118,6 +118,7 @@ libyami_codecparser_cppflags = \ | ||
20 | -Dvp8dx_start_decode=libyami_vp8dx_start_decode \ | ||
21 | -Dvp8dx_bool_decoder_fill=libyami_vp8dx_bool_decoder_fill \ | ||
22 | -I$(top_srcdir)/interface \ | ||
23 | + -Wno-invalid-offsetof \ | ||
24 | $(extra_includes) \ | ||
25 | $(NULL) | ||
26 | |||
27 | -- | ||
28 | 2.14.1 | ||
29 | |||
diff --git a/recipes-multimedia/libyami/libyami/0004-Typecast-POWER32SUB2-to-uint8_t.patch b/recipes-multimedia/libyami/libyami/0004-Typecast-POWER32SUB2-to-uint8_t.patch deleted file mode 100644 index 27eca39b..00000000 --- a/recipes-multimedia/libyami/libyami/0004-Typecast-POWER32SUB2-to-uint8_t.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From d9c831ee38da4551396fad5cd53c3dfc0e5e0cf8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 17:57:34 -0700 | ||
4 | Subject: [PATCH 4/9] Typecast POWER32SUB2 to uint8_t | ||
5 | |||
6 | Fixes | ||
7 | |||
8 | h265Parser.cpp:1064:5: error: comparison of constant 4294967294 with expression | ||
9 | of type 'uint8_t' (aka 'unsigned char') is always false [-Werror,-Wtautological-constant-out-of-range-compare] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | codecparsers/h265Parser.cpp | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/codecparsers/h265Parser.cpp b/codecparsers/h265Parser.cpp | ||
19 | index 0dea3a6..c6cded2 100644 | ||
20 | --- a/codecparsers/h265Parser.cpp | ||
21 | +++ b/codecparsers/h265Parser.cpp | ||
22 | @@ -125,7 +125,7 @@ namespace H265 { | ||
23 | \ | ||
24 | CHECK_READ_UE(var->var##_max_num_reorder_pics[i], 0, var->var##_max_dec_pic_buffering_minus1[i]); \ | ||
25 | \ | ||
26 | - CHECK_READ_UE(var->var##_max_latency_increase_plus1[i], 0, POWER32SUB2); \ | ||
27 | + CHECK_READ_UE(var->var##_max_latency_increase_plus1[i], 0, (uint8_t)POWER32SUB2); \ | ||
28 | } \ | ||
29 | } | ||
30 | |||
31 | -- | ||
32 | 2.14.1 | ||
33 | |||
diff --git a/recipes-multimedia/libyami/libyami/0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch b/recipes-multimedia/libyami/libyami/0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch deleted file mode 100644 index c9c74520..00000000 --- a/recipes-multimedia/libyami/libyami/0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 27b61f5ab1b1643436f56517e4980734b4b9acca Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 18:38:05 -0700 | ||
4 | Subject: [PATCH 6/9] Avoid namespace conflicts by adding explicit using | ||
5 | <namespace> | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | Upstream-Status: Pending | ||
10 | |||
11 | decoder/vaapidecoder_h264.h | 1 + | ||
12 | decoder/vaapidecoder_h265.h | 1 + | ||
13 | 2 files changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/decoder/vaapidecoder_h264.h b/decoder/vaapidecoder_h264.h | ||
16 | index 57e2c27..ea5c2f2 100644 | ||
17 | --- a/decoder/vaapidecoder_h264.h | ||
18 | +++ b/decoder/vaapidecoder_h264.h | ||
19 | @@ -30,6 +30,7 @@ namespace YamiMediaCodec { | ||
20 | |||
21 | class VaapiDecPictureH264; | ||
22 | class VaapiDecoderH264 : public VaapiDecoderBase { | ||
23 | +using YamiMediaCodec::VaapiDecoderBase::createPicture; | ||
24 | public: | ||
25 | typedef SharedPtr<VaapiDecPictureH264> PicturePtr; | ||
26 | typedef std::vector<PicturePtr> RefSet; | ||
27 | diff --git a/decoder/vaapidecoder_h265.h b/decoder/vaapidecoder_h265.h | ||
28 | index f7e2303..159e25f 100644 | ||
29 | --- a/decoder/vaapidecoder_h265.h | ||
30 | +++ b/decoder/vaapidecoder_h265.h | ||
31 | @@ -38,6 +38,7 @@ namespace YamiMediaCodec { | ||
32 | |||
33 | class VaapiDecPictureH265; | ||
34 | class VaapiDecoderH265:public VaapiDecoderBase { | ||
35 | + using YamiMediaCodec::VaapiDecoderBase::createPicture; | ||
36 | typedef YamiParser::H265::SPS SPS; | ||
37 | typedef YamiParser::H265::SliceHeader SliceHeader; | ||
38 | typedef YamiParser::H265::NalUnit NalUnit; | ||
39 | -- | ||
40 | 2.14.1 | ||
41 | |||
diff --git a/recipes-multimedia/libyami/libyami/0007-Delete-unused-variables.patch b/recipes-multimedia/libyami/libyami/0007-Delete-unused-variables.patch deleted file mode 100644 index b80774c9..00000000 --- a/recipes-multimedia/libyami/libyami/0007-Delete-unused-variables.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From b982997c96e11b9c0b3cd58a31af2d0a219713a3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 18:39:58 -0700 | ||
4 | Subject: [PATCH 7/9] Delete unused variables | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | decoder/vaapidecoder_vp8.cpp | 8 ++++---- | ||
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/decoder/vaapidecoder_vp8.cpp b/decoder/vaapidecoder_vp8.cpp | ||
14 | index 5fc89ec..ff5b896 100644 | ||
15 | --- a/decoder/vaapidecoder_vp8.cpp | ||
16 | +++ b/decoder/vaapidecoder_vp8.cpp | ||
17 | @@ -32,12 +32,12 @@ typedef VaapiDecoderVP8::PicturePtr PicturePtr; | ||
18 | |||
19 | // the following parameter apply to Intra-Predicted Macroblocks, | ||
20 | // $11.2 $11.4: key frame default probs | ||
21 | -static const uint8_t keyFrameYModeProbs[4] = { 145, 156, 163, 128 }; | ||
22 | -static const uint8_t keyFrameUVModeProbs[3] = { 142, 114, 183 }; | ||
23 | +//static const uint8_t keyFrameYModeProbs[4] = { 145, 156, 163, 128 }; | ||
24 | +//static const uint8_t keyFrameUVModeProbs[3] = { 142, 114, 183 }; | ||
25 | |||
26 | // $16.1: non-key frame default probs | ||
27 | -static const uint8_t nonKeyFrameDefaultYModeProbs[4] = { 112, 86, 140, 37 }; | ||
28 | -static const uint8_t nonKeyFrameDefaultUVModeProbs[3] = { 162, 101, 204 }; | ||
29 | +//static const uint8_t nonKeyFrameDefaultYModeProbs[4] = { 112, 86, 140, 37 }; | ||
30 | +//static const uint8_t nonKeyFrameDefaultUVModeProbs[3] = { 162, 101, 204 }; | ||
31 | |||
32 | static const uint32_t surfaceNumVP8 = 3; | ||
33 | |||
34 | -- | ||
35 | 2.14.1 | ||
36 | |||
diff --git a/recipes-multimedia/libyami/libyami/0008-NalUnit-is-declared-in-different-namespace.patch b/recipes-multimedia/libyami/libyami/0008-NalUnit-is-declared-in-different-namespace.patch deleted file mode 100644 index 18b98be8..00000000 --- a/recipes-multimedia/libyami/libyami/0008-NalUnit-is-declared-in-different-namespace.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From c54130511c91e457f1c5bb47729f5e3a0fc0cb91 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 18:42:28 -0700 | ||
4 | Subject: [PATCH 8/9] NalUnit is declared in different namespace | ||
5 | |||
6 | Fixes | ||
7 | vaapidecoder_h265.h:32:5: error: struct 'NalUnit' was previously declared as a class [-Werror,-Wmismatched-tags] struct NalUnit; | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Pending | ||
12 | |||
13 | decoder/vaapidecoder_h265.h | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/decoder/vaapidecoder_h265.h b/decoder/vaapidecoder_h265.h | ||
17 | index 159e25f..674638f 100644 | ||
18 | --- a/decoder/vaapidecoder_h265.h | ||
19 | +++ b/decoder/vaapidecoder_h265.h | ||
20 | @@ -29,7 +29,7 @@ namespace YamiParser { | ||
21 | namespace H265 { | ||
22 | struct SPS; | ||
23 | struct SliceHeader; | ||
24 | - struct NalUnit; | ||
25 | + class NalUnit; | ||
26 | class Parser; | ||
27 | }; | ||
28 | }; | ||
29 | -- | ||
30 | 2.14.1 | ||
31 | |||
diff --git a/recipes-multimedia/libyami/libyami/0009-Fix-clang-warnings.patch b/recipes-multimedia/libyami/libyami/0009-Fix-clang-warnings.patch deleted file mode 100644 index 08ef455b..00000000 --- a/recipes-multimedia/libyami/libyami/0009-Fix-clang-warnings.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From a54dc7b6a777882f55a3f31bd97748a261db03d2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Aug 2017 18:53:06 -0700 | ||
4 | Subject: [PATCH 9/9] Fix clang warnings | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | encoder/vaapiencoder_h264.cpp | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/encoder/vaapiencoder_h264.cpp b/encoder/vaapiencoder_h264.cpp | ||
14 | index 98bc2ed..94015cb 100644 | ||
15 | --- a/encoder/vaapiencoder_h264.cpp | ||
16 | +++ b/encoder/vaapiencoder_h264.cpp | ||
17 | @@ -509,7 +509,7 @@ bit_writer_write_sps(BitWriter* bitwriter, | ||
18 | } | ||
19 | /* vcl_hrd_parameters_present_flag */ | ||
20 | bitwriter->writeBits(0, 1); | ||
21 | - if (nal_hrd_parameters_present_flag || 0/*vcl_hrd_parameters_present_flag*/) { | ||
22 | + if (nal_hrd_parameters_present_flag || !!(0)/*vcl_hrd_parameters_present_flag*/) { | ||
23 | /* low_delay_hrd_flag */ | ||
24 | bitwriter->writeBits(0, 1); | ||
25 | } | ||
26 | @@ -1889,7 +1889,7 @@ bool VaapiEncoderH264::addSliceHeaders (const PicturePtr& picture) const | ||
27 | sliceParam->num_macroblocks = curSliceMbs; | ||
28 | sliceParam->macroblock_info = VA_INVALID_ID; | ||
29 | sliceParam->slice_type = h264_get_slice_type (picture->m_type); | ||
30 | - assert (sliceParam->slice_type != -1); | ||
31 | + assert ((int)sliceParam->slice_type != -1); | ||
32 | sliceParam->idr_pic_id = m_idrNum; | ||
33 | sliceParam->pic_order_cnt_lsb = picture->m_poc % m_maxPicOrderCnt; | ||
34 | |||
35 | -- | ||
36 | 2.14.1 | ||
37 | |||
diff --git a/recipes-multimedia/libyami/libyami_1.3.1.bb b/recipes-multimedia/libyami/libyami_1.3.1.bb deleted file mode 100644 index 58895c81..00000000 --- a/recipes-multimedia/libyami/libyami_1.3.1.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMARY = "Yami is media infrastructure base on libva" | ||
2 | DESCRIPTION = "Yet Another Media Infrastructure \ | ||
3 | light weight hardware codec library base on VA-API " | ||
4 | |||
5 | HOMEPAGE = "https://github.com/intel/libyami" | ||
6 | BUGTRACKER = "https://github.com/intel/libyami/issues/new" | ||
7 | |||
8 | LICENSE = "Apache-2.0" | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
10 | |||
11 | SRC_URI = "git://github.com/intel/libyami.git;branch=apache \ | ||
12 | file://0001-bitWriter.cpp-Delete-unused-CACHEBYTES.patch \ | ||
13 | file://0002-typecast-index-from-size_t-to-int.patch \ | ||
14 | file://0003-Add-Wno-invalid-offsetof-to-compiler-commandline.patch \ | ||
15 | file://0004-Typecast-POWER32SUB2-to-uint8_t.patch \ | ||
16 | file://0006-Avoid-namespace-conflicts-by-adding-explicit-using-n.patch \ | ||
17 | file://0007-Delete-unused-variables.patch \ | ||
18 | file://0008-NalUnit-is-declared-in-different-namespace.patch \ | ||
19 | file://0009-Fix-clang-warnings.patch \ | ||
20 | " | ||
21 | SRCREV = "fb48083de91f837ddbf599dd4b5ad1eb1239e1cf" | ||
22 | S = "${WORKDIR}/git" | ||
23 | |||
24 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" | ||
25 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" | ||
26 | |||
27 | DEPENDS = "libva" | ||
28 | inherit autotools pkgconfig distro_features_check | ||
29 | |||
30 | REQUIRED_DISTRO_FEATURES = "opengl" | ||