1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From ffd917e7b4dc37ff3863b43cf4821f3454944344 Mon Sep 17 00:00:00 2001
From: Seunghyuk Park <seunghyuk.h.park@intel.com>
Date: Mon, 31 May 2021 10:47:41 -0700
Subject: [PATCH] Fix sample_encode i010 input
Upstream-Status: Backport
inner-source #ffd917e
Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
---
.../legacy/sample_encode/src/pipeline_encode.cpp | 16 ++++++++++------
tools/legacy/sample_encode/src/sample_encode.cpp | 4 ++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/tools/legacy/sample_encode/src/pipeline_encode.cpp b/tools/legacy/sample_encode/src/pipeline_encode.cpp
index 4aa5aef..9af4901 100644
--- a/tools/legacy/sample_encode/src/pipeline_encode.cpp
+++ b/tools/legacy/sample_encode/src/pipeline_encode.cpp
@@ -1716,15 +1716,19 @@ mfxStatus CEncodingPipeline::Init(sInputParams *pParams) {
m_MVCflags = pParams->MVC_flags;
- // FileReader can convert yv12->nv12 without vpp
- m_InputFourCC =
- (pParams->FileInputFourCC == MFX_FOURCC_I420) ? MFX_FOURCC_NV12 : pParams->FileInputFourCC;
+ // FileReader can convert yv12->nv12 without vpp, when hw impl
#if (MFX_VERSION >= 2000)
- if (pParams->bUseHWLib == true)
- pParams->EncodeFourCC = MFX_FOURCC_NV12;
+ if (pParams->bUseHWLib == false)
+ m_InputFourCC = pParams->FileInputFourCC;
else
- pParams->EncodeFourCC = MFX_FOURCC_I420;
#endif
+ {
+ m_InputFourCC = (pParams->FileInputFourCC == MFX_FOURCC_I420) ? MFX_FOURCC_NV12
+ : pParams->FileInputFourCC;
+ pParams->EncodeFourCC =
+ (pParams->EncodeFourCC == MFX_FOURCC_I420) ? MFX_FOURCC_NV12 : pParams->EncodeFourCC;
+ }
+
m_nTimeout = pParams->nTimeout;
m_strDevicePath = pParams->strDevicePath;
diff --git a/tools/legacy/sample_encode/src/sample_encode.cpp b/tools/legacy/sample_encode/src/sample_encode.cpp
index 0a22eb2..74607a8 100644
--- a/tools/legacy/sample_encode/src/sample_encode.cpp
+++ b/tools/legacy/sample_encode/src/sample_encode.cpp
@@ -592,8 +592,8 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU8 nArgNum, sInputParams* p
}
#if (MFX_VERSION >= 2000)
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-i420"))) {
- pParams->FileInputFourCC = MFX_FOURCC_IYUV;
- pParams->EncodeFourCC = MFX_FOURCC_IYUV;
+ pParams->FileInputFourCC = MFX_FOURCC_I420;
+ pParams->EncodeFourCC = MFX_FOURCC_I420;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-i010"))) {
pParams->FileInputFourCC = MFX_FOURCC_I010;
--
2.32.0
|
