This repository was archived by the owner on Nov 11, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path0001-test.patch
More file actions
428 lines (401 loc) · 18.7 KB
/
0001-test.patch
File metadata and controls
428 lines (401 loc) · 18.7 KB
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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
From f6eabf5acc68d0ae781971844b1871a476178452 Mon Sep 17 00:00:00 2001
From: Wenjuan Zhang <wenjuan.zhang@intel.com>
Date: Fri, 3 Nov 2023 15:15:29 +0800
Subject: [PATCH] test
---
source/Lib/TLibCommon/TypeDef.h | 2 +-
source/Lib/TLibEncoder/TEncGOP.cpp | 133 ++++++++++++++---------------
source/Lib/TLibEncoder/TEncGOP.h | 38 +++++++--
source/Lib/TLibEncoder/TEncTop.cpp | 95 +++++++++++++++++----
source/Lib/TLibEncoder/TEncTop.h | 5 ++
5 files changed, 178 insertions(+), 95 deletions(-)
diff --git a/source/Lib/TLibCommon/TypeDef.h b/source/Lib/TLibCommon/TypeDef.h
index 4b15233d..184fa504 100644
--- a/source/Lib/TLibCommon/TypeDef.h
+++ b/source/Lib/TLibCommon/TypeDef.h
@@ -103,7 +103,7 @@
#define SHUTTER_INTERVAL_SEI_MESSAGE 1 ///< support for shutter interval SEI message
#define SEI_ENCODER_CONTROL 1 ///< add encoder control for the following SEI: film grain characteristics, content light level, ambient viewing environment
#define DPB_ENCODER_USAGE_CHECK 1 ///< Adds DPB encoder usage check.
-#define JVET_X0048_X0103_FILM_GRAIN 1 ///< JVET-X0048-X0103: SMPTE RDD-5 based film grain analysis and synthesis model for film grain characterstics (FGC) SEI
+#define JVET_X0048_X0103_FILM_GRAIN 0 ///< JVET-X0048-X0103: SMPTE RDD-5 based film grain analysis and synthesis model for film grain characterstics (FGC) SEI
#define JVET_T0050_ANNOTATED_REGIONS_SEI 1 ///< Detect static objects and use it in Annotated Regions SEI message
diff --git a/source/Lib/TLibEncoder/TEncGOP.cpp b/source/Lib/TLibEncoder/TEncGOP.cpp
index 36873287..32347580 100644
--- a/source/Lib/TLibEncoder/TEncGOP.cpp
+++ b/source/Lib/TLibEncoder/TEncGOP.cpp
@@ -1117,27 +1117,6 @@ cabac_zero_word_padding(TComSlice *const pcSlice, TComPic *const pcPic, const st
}
}
-class EfficientFieldIRAPMapping
-{
- private:
- Int IRAPGOPid;
- Bool IRAPtoReorder;
- Bool swapIRAPForward;
-
- public:
- EfficientFieldIRAPMapping() :
- IRAPGOPid(-1),
- IRAPtoReorder(false),
- swapIRAPForward(false)
- { }
-
- Void initialize(const Bool isField, const Int gopSize, const Int POCLast, const Int numPicRcvd, const Int lastIDR, TEncGOP *pEncGop, TEncCfg *pCfg);
-
- Int adjustGOPid(const Int gopID);
- Int restoreGOPid(const Int gopID);
- Int GetIRAPGOPid() const { return IRAPGOPid; }
-};
-
Void EfficientFieldIRAPMapping::initialize(const Bool isField, const Int gopSize, const Int POCLast, const Int numPicRcvd, const Int lastIDR, TEncGOP *pEncGop, TEncCfg *pCfg )
{
if(isField)
@@ -1288,46 +1267,16 @@ printHash(const HashType hashType, const std::string &digestStr)
}
-// ====================================================================================================================
-// Public member functions
-// ====================================================================================================================
-Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic,
+int TEncGOP::compressPIC( Int& iPOCLast, Int& iNumPicRcvd, TComList<TComPic*>& rcListPic,
TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP,
- Bool isField, Bool isTff, const InputColourSpaceConversion ip_conversion, const InputColourSpaceConversion snr_conversion, const TEncAnalyze::OutputLogControl &outputLogCtrl )
+ Bool isField, Bool isTff, const InputColourSpaceConversion ip_conversion, const InputColourSpaceConversion snr_conversion, const TEncAnalyze::OutputLogControl &outputLogCtrl
+ ,TComOutputBitstream* pcBitstreamRedirect
+ ,SEIMessages& leadingSeiMessages,SEIMessages& nestedSeiMessages,SEIMessages& duInfoSeiMessages,SEIMessages& trailingSeiMessages
+ ,std::deque<DUData>& duData,SEIDecodingUnitInfo& decodingUnitInfoSEI,EfficientFieldIRAPMapping& effFieldIRAPMap,Int &iGOPid)
{
- // TODO: Split this function up.
-
- TComPic* pcPic = NULL;
- TComPicYuv* pcPicYuvRecOut;
- TComSlice* pcSlice;
- TComOutputBitstream *pcBitstreamRedirect;
- pcBitstreamRedirect = new TComOutputBitstream;
- AccessUnit::iterator itLocationToPushSliceHeaderNALU; // used to store location where NALU containing slice header is to be inserted
-
- xInitGOP( iPOCLast, iNumPicRcvd, isField );
-
- m_iNumPicCoded = 0;
- SEIMessages leadingSeiMessages;
- SEIMessages nestedSeiMessages;
- SEIMessages duInfoSeiMessages;
- SEIMessages trailingSeiMessages;
- std::deque<DUData> duData;
- SEIDecodingUnitInfo decodingUnitInfoSEI;
-
- EfficientFieldIRAPMapping effFieldIRAPMap;
- if (m_pcCfg->getEfficientFieldIRAPEnabled())
- {
- effFieldIRAPMap.initialize(isField, m_iGopSize, iPOCLast, iNumPicRcvd, m_iLastIDR, this, m_pcCfg);
- }
-
- // reset flag indicating whether pictures have been encoded
- for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
- {
- m_pcCfg->setEncodedFlag(iGOPid, false);
- }
-
- for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
- {
+ TComPic* pcPic = NULL;
+ TComPicYuv* pcPicYuvRecOut;
+ TComSlice* pcSlice;
if (m_pcCfg->getEfficientFieldIRAPEnabled())
{
iGOPid=effFieldIRAPMap.adjustGOPid(iGOPid);
@@ -1359,11 +1308,12 @@ Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rc
if(pocCurr>=m_pcCfg->getFramesToBeEncoded())
{
+ cout<<"pocCurr:"<<pocCurr<<",m_pcCfg->getFramesToBeEncoded():"<<m_pcCfg->getFramesToBeEncoded()<<endl;
if (m_pcCfg->getEfficientFieldIRAPEnabled())
{
iGOPid=effFieldIRAPMap.restoreGOPid(iGOPid);
}
- continue;
+ return 2;
}
if( getNalUnitType(pocCurr, m_iLastIDR, isField) == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType(pocCurr, m_iLastIDR, isField) == NAL_UNIT_CODED_SLICE_IDR_N_LP )
@@ -2062,7 +2012,8 @@ Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rc
xWriteTrailingSEIMessages(trailingSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getSPS());
printHash(m_pcCfg->getDecodedPictureHashSEIType(), digestStr);
-
+
+ printf("zwj 这里update frame level信息,也在m_pcRateCtrl里,但是在这个GOP 函数外层是看不到的。\n");
if ( m_pcCfg->getUseRateCtrl() )
{
Double avgQP = m_pcRateCtrl->getRCPic()->calAverageQP();
@@ -2113,19 +2064,61 @@ Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rc
{
iGOPid=effFieldIRAPMap.restoreGOPid(iGOPid);
}
-#if REDUCED_ENCODER_MEMORY
+ return 0;
+}
+// ====================================================================================================================
+// Public member functions
+// ====================================================================================================================
+Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic,
+ TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP,
+ Bool isField, Bool isTff, const InputColourSpaceConversion ip_conversion, const InputColourSpaceConversion snr_conversion, const TEncAnalyze::OutputLogControl &outputLogCtrl )
+{
+ // TODO: Split this function up.
- pcPic->releaseReconstructionIntermediateData();
- if (!isField) // don't release the source data for field-coding because the fields are dealt with in pairs. // TODO: release source data for interlace simulations.
- {
- pcPic->releaseEncoderSourceImageData();
- }
-#endif
- } // iGOPid-loop
+ TComOutputBitstream *pcBitstreamRedirect;
+ pcBitstreamRedirect = new TComOutputBitstream;
- delete pcBitstreamRedirect;
+ xInitGOP( iPOCLast, iNumPicRcvd, isField );
+
+ m_iNumPicCoded = 0;
+ SEIMessages leadingSeiMessages;
+ SEIMessages nestedSeiMessages;
+ SEIMessages duInfoSeiMessages;
+ SEIMessages trailingSeiMessages;
+ std::deque<DUData> duData;
+ SEIDecodingUnitInfo decodingUnitInfoSEI;
+
+ EfficientFieldIRAPMapping effFieldIRAPMap;
+ if (m_pcCfg->getEfficientFieldIRAPEnabled())
+ {
+ effFieldIRAPMap.initialize(isField, m_iGopSize, iPOCLast, iNumPicRcvd, m_iLastIDR, this, m_pcCfg);
+ }
+
+ // reset flag indicating whether pictures have been encoded
+ for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
+ {
+ m_pcCfg->setEncodedFlag(iGOPid, false);
+ }
+
+for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
+{
+ Int status=compressPIC(iPOCLast,iNumPicRcvd,rcListPic,rcListPicYuvRecOut,accessUnitsInGOP,isField,isTff,ip_conversion,snr_conversion,outputLogCtrl
+ ,pcBitstreamRedirect,leadingSeiMessages,nestedSeiMessages,duInfoSeiMessages,trailingSeiMessages
+ ,duData,decodingUnitInfoSEI,effFieldIRAPMap,iGOPid);
+ if(status==1){
+ printf("break\n");
+ break;
+ }else if(status==2){
+
+ printf("continue\n");
+ continue;
+ }
+}
+
+ delete pcBitstreamRedirect;
+printf("m_iNumPicCoded:%d,iNumPicRcvd:%d\n",m_iNumPicCoded,iNumPicRcvd);
assert ( (m_iNumPicCoded == iNumPicRcvd) );
}
diff --git a/source/Lib/TLibEncoder/TEncGOP.h b/source/Lib/TLibEncoder/TEncGOP.h
index 6e3c6daa..c9de861a 100644
--- a/source/Lib/TLibEncoder/TEncGOP.h
+++ b/source/Lib/TLibEncoder/TEncGOP.h
@@ -73,9 +73,6 @@ class TEncTop;
// ====================================================================================================================
// Class definition
// ====================================================================================================================
-
-class TEncGOP
-{
class DUData
{
public:
@@ -86,8 +83,31 @@ class TEncGOP
Int accumBitsDU;
Int accumNalsDU;
};
+class EfficientFieldIRAPMapping
+{
+ private:
+ Int IRAPGOPid;
+ Bool IRAPtoReorder;
+ Bool swapIRAPForward;
-private:
+ public:
+ EfficientFieldIRAPMapping() :
+ IRAPGOPid(-1),
+ IRAPtoReorder(false),
+ swapIRAPForward(false)
+ { }
+
+ Void initialize(const Bool isField, const Int gopSize, const Int POCLast, const Int numPicRcvd, const Int lastIDR, TEncGOP *pEncGop, TEncCfg *pCfg);
+
+ Int adjustGOPid(const Int gopID);
+ Int restoreGOPid(const Int gopID);
+ Int GetIRAPGOPid() const { return IRAPGOPid; }
+};
+
+class TEncGOP
+{
+
+public:
TEncAnalyze m_gcAnalyzeAll;
TEncAnalyze m_gcAnalyzeI;
@@ -164,7 +184,13 @@ public:
Void init ( TEncTop* pcTEncTop );
Void compressGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec,
std::list<AccessUnit>& accessUnitsInGOP, Bool isField, Bool isTff, const InputColourSpaceConversion ip_conversion, const InputColourSpaceConversion snr_conversion, const TEncAnalyze::OutputLogControl &outputLogCtrl );
- Void xAttachSliceDataToNalUnit (OutputNALUnit& rNalu, TComOutputBitstream* pcBitstreamRedirect);
+ int compressPIC( Int& iPOCLast, Int& iNumPicRcvd, TComList<TComPic*>& rcListPic,
+ TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP,
+ Bool isField, Bool isTff, const InputColourSpaceConversion ip_conversion, const InputColourSpaceConversion snr_conversion, const TEncAnalyze::OutputLogControl &outputLogCtrl
+ ,TComOutputBitstream* pcBitstreamRedirect
+ ,SEIMessages& leadingSeiMessages,SEIMessages& nestedSeiMessages,SEIMessages& duInfoSeiMessages,SEIMessages& trailingSeiMessages
+ ,std::deque<DUData>& duData,SEIDecodingUnitInfo& decodingUnitInfoSEI,EfficientFieldIRAPMapping& effFieldIRAPMap,Int &iGOPid);
+ Void xAttachSliceDataToNalUnit (OutputNALUnit& rNalu, TComOutputBitstream* pcBitstreamRedirect);
Int getGOPSize() { return m_iGopSize; }
@@ -193,7 +219,7 @@ public:
protected:
TEncRateCtrl* getRateCtrl() { return m_pcRateCtrl; }
-protected:
+public:
Void xInitGOP ( Int iPOCLast, Int iNumPicRcvd, Bool isField );
Void xGetBuffer ( TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr, Bool isField );
diff --git a/source/Lib/TLibEncoder/TEncTop.cpp b/source/Lib/TLibEncoder/TEncTop.cpp
index 1d8917a1..37e42c8b 100644
--- a/source/Lib/TLibEncoder/TEncTop.cpp
+++ b/source/Lib/TLibEncoder/TEncTop.cpp
@@ -318,24 +318,10 @@ Void TEncTop::deletePicBuffer()
pcPic = NULL;
}
}
-
-/**
- - Application has picture buffer list with size of GOP + 1
- - Picture buffer list acts like as ring buffer
- - End of the list has the latest picture
- .
- \param flush cause encoder to encode a partial GOP
- \param pcPicYuvOrg original YUV picture
- \param pcPicYuvTrueOrg
- \param snrCSC
- \retval rcListPicYuvRecOut list of reconstruction YUV pictures
- \retval accessUnitsOut list of output access units
- \retval iNumEncoded number of encoded pictures
- */
#if JVET_X0048_X0103_FILM_GRAIN
-Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg, TComPicYuv* pcfilteredOrgPicForFG, const InputColourSpaceConversion ipCSC, const InputColourSpaceConversion snrCSC, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded)
+Void TEncTop::encode_func1( TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg,TComPicYuv* pcfilteredOrgPicForFG)
#else
-Void TEncTop::encode( Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg, const InputColourSpaceConversion ipCSC, const InputColourSpaceConversion snrCSC, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded )
+Void TEncTop::encode_func1( TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg)
#endif
{
if (pcPicYuvOrg != NULL)
@@ -372,7 +358,32 @@ Void TEncTop::encode( Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvT
m_cPreanalyzer.xPreanalyze( dynamic_cast<TEncPic*>( pcPicCurr ) );
}
}
+}
+/**
+ - Application has picture buffer list with size of GOP + 1
+ - Picture buffer list acts like as ring buffer
+ - End of the list has the latest picture
+ .
+ \param flush cause encoder to encode a partial GOP
+ \param pcPicYuvOrg original YUV picture
+ \param pcPicYuvTrueOrg
+ \param snrCSC
+ \retval rcListPicYuvRecOut list of reconstruction YUV pictures
+ \retval accessUnitsOut list of output access units
+ \retval iNumEncoded number of encoded pictures
+ */
+#if JVET_X0048_X0103_FILM_GRAIN
+Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg, TComPicYuv* pcfilteredOrgPicForFG, const InputColourSpaceConversion ipCSC, const InputColourSpaceConversion snrCSC, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded)
+#else
+Void TEncTop::encode( Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg, const InputColourSpaceConversion ipCSC, const InputColourSpaceConversion snrCSC, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded )
+#endif
+{
+#if JVET_X0048_X0103_FILM_GRAIN
+ encode_func1(pcPicYuvOrg,pcPicYuvTrueOrg,pcfilteredOrgPicForFG);
+#else
+ encode_func1(pcPicYuvOrg,pcPicYuvTrueOrg);
+#endif
if ((m_iNumPicRcvd == 0) || (!flush && (m_iPOCLast != 0) && (m_iNumPicRcvd != m_iGOPSize) && (m_iGOPSize != 0)))
{
iNumEncoded = 0;
@@ -385,7 +396,55 @@ Void TEncTop::encode( Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvT
}
// compress GOP
- m_cGOPEncoder.compressGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, false, false, ipCSC, snrCSC, getOutputLogControl());
+ Int iPOCLast=m_iPOCLast;
+ Int iNumPicRcvd=m_iNumPicRcvd;
+ Bool isField=false;
+ Bool isTff=false;
+
+ TComOutputBitstream *pcBitstreamRedirect;
+ pcBitstreamRedirect = new TComOutputBitstream;
+
+ m_cGOPEncoder.xInitGOP( iPOCLast, iNumPicRcvd, isField );
+
+ m_cGOPEncoder.m_iNumPicCoded = 0;
+ SEIMessages leadingSeiMessages;
+ SEIMessages nestedSeiMessages;
+ SEIMessages duInfoSeiMessages;
+ SEIMessages trailingSeiMessages;
+ std::deque<DUData> duData;
+ SEIDecodingUnitInfo decodingUnitInfoSEI;
+
+ EfficientFieldIRAPMapping effFieldIRAPMap;
+ if (m_cGOPEncoder.m_pcCfg->getEfficientFieldIRAPEnabled())
+ {
+ effFieldIRAPMap.initialize(isField, m_cGOPEncoder.m_iGopSize, iPOCLast, iNumPicRcvd,m_cGOPEncoder.m_iLastIDR, &m_cGOPEncoder, m_cGOPEncoder.m_pcCfg);
+ }
+
+ // reset flag indicating whether pictures have been encoded
+ for ( Int iGOPid=0; iGOPid < m_cGOPEncoder.m_iGopSize; iGOPid++ )
+ {
+ m_cGOPEncoder.m_pcCfg->setEncodedFlag(iGOPid, false);
+ }
+
+ for ( Int iGOPid=0; iGOPid < m_cGOPEncoder.m_iGopSize; iGOPid++ )
+ {
+
+ Int status=m_cGOPEncoder.compressPIC(iPOCLast,iNumPicRcvd,m_cListPic,rcListPicYuvRecOut,accessUnitsOut,isField,isTff,ipCSC,snrCSC,getOutputLogControl()
+ ,pcBitstreamRedirect,leadingSeiMessages,nestedSeiMessages,duInfoSeiMessages,trailingSeiMessages
+ ,duData,decodingUnitInfoSEI,effFieldIRAPMap,iGOPid);
+ if(status==1){
+ printf("break\n");
+ break;
+ }else if(status==2){
+
+ printf("continue\n");
+ continue;
+ }
+ }
+
+ delete pcBitstreamRedirect;
+printf("m_iNumPicCoded:%d,iNumPicRcvd:%d\n",m_cGOPEncoder.m_iNumPicCoded,iNumPicRcvd);
+ assert ( (m_cGOPEncoder.m_iNumPicCoded == iNumPicRcvd) );
if ( m_RCEnableRateControl )
{
@@ -458,7 +517,7 @@ Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTr
#endif
pcField->setTopField(isTopField); // interlaced requirement
-
+//component代表YUV component
for (UInt componentIndex = 0; componentIndex < pcPicYuvOrg->getNumberValidComponents(); componentIndex++)
{
const ComponentID component = ComponentID(componentIndex);
diff --git a/source/Lib/TLibEncoder/TEncTop.h b/source/Lib/TLibEncoder/TEncTop.h
index dc8d77ab..d037357b 100644
--- a/source/Lib/TLibEncoder/TEncTop.h
+++ b/source/Lib/TLibEncoder/TEncTop.h
@@ -180,6 +180,11 @@ public:
const InputColourSpaceConversion ipCSC, const InputColourSpaceConversion snrCSC, // used for SNR calculations. Picture in original colour space.
TComList<TComPicYuv*>& rcListPicYuvRecOut,
std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded );
+#endif
+#if JVET_X0048_X0103_FILM_GRAIN
+Void encode_func1( TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg,TComPicYuv* pcfilteredOrgPicForFG);
+#else
+Void encode_func1( TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg);
#endif
/// encode several number of pictures until end-of-sequence
--
2.38.1