bugfix in ratematching for higher rv
This commit is contained in:
@@ -364,8 +364,8 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
|
|||||||
if (ind < Foffset) { // case where we have some bits before the filler and the rest after
|
if (ind < Foffset) { // case where we have some bits before the filler and the rest after
|
||||||
memcpy((void*)e,(void*)(w+ind),Foffset-ind);
|
memcpy((void*)e,(void*)(w+ind),Foffset-ind);
|
||||||
|
|
||||||
if (E + F <= Ncb) { // E+F doesn't contain all coded bits
|
if (E + F <= Ncb-ind) { // E+F doesn't contain all coded bits
|
||||||
memcpy((void*)(e+Foffset-ind),(void*)(w+Foffset+F-ind),E-Foffset+ind);
|
memcpy((void*)(e+Foffset-ind),(void*)(w+Foffset+F),E-Foffset+ind);
|
||||||
k=E;
|
k=E;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -375,11 +375,12 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (E + F <= Ncb-ind) { //E+F doesn't contain all coded bits
|
if (E + F <= Ncb-ind) { //E+F doesn't contain all coded bits
|
||||||
memcpy((void*)(e+Foffset-ind),(void*)(w+Foffset+F-ind),E-Foffset+ind);
|
memcpy((void*)(e),(void*)(w+ind),E);
|
||||||
k=E;
|
k=E;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
memcpy((void*)(e),(void*)(w+ind),Ncb-ind);
|
||||||
|
k=Ncb-ind;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -460,6 +460,9 @@ int nr_dlsch_encoding(unsigned char *a,
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
F = dlsch->harq_processes[harq_pid]->F;
|
||||||
|
|
||||||
|
Kr = dlsch->harq_processes[harq_pid]->K;
|
||||||
for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
|
for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
|
||||||
|
|
||||||
if (F>0) {
|
if (F>0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user