URL
https://opencores.org/ocsvn/bluespec-h264/bluespec-h264/trunk
Subversion Repositories bluespec-h264
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 45 to Rev 46
- ↔ Reverse comparison
Rev 45 → Rev 46
/trunk/src/mkDeblockFilter.bsv
27,7 → 27,6
typedef enum |
{ |
Passing, //not working on anything in particular |
Initialize, |
Horizontal, |
Cleanup, |
HorizontalCleanup, |
341,6 → 340,7
80, 90,101,113,127,144,162,182,203,226, |
255,255}; |
Bit#(5) beta_table[52] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
|
0, 0, 0, 0, 0, 0, 2, 2, 2, 3, |
3, 3, 3, 4, 4, 4, 6, 6, 7, 7, |
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, |
367,7 → 367,13
|
Reg#(Bit#(6)) cleanup_state <- mkReg(0); |
|
Vector#(4, FIFO#(Bit#(32))) rowToColumnStore <- replicateM(mkSizedFIFO(3)); |
Vector#(4, FIFO#(Bit#(32))) rowToColumnStore = newVector();//replicateM(mkSizedFIFO(3)); |
rowToColumnStore[0] <- mkSizedFIFO(3); |
rowToColumnStore[1] <- mkFIFO; |
rowToColumnStore[2] <- mkFIFO; |
rowToColumnStore[3] <- mkFIFO; |
|
|
Reg#(Bit#(2)) rowToColumnState <- mkReg(0); |
FIFO#(Tuple2#(Bit#(4),Bit#(1))) rowToColumnStoreBlock <- mkFIFO(); // The third bit 1 is to rotate the damned |
// last left vector block |
374,7 → 380,13
FIFO#(Tuple2#(Bit#(4), Bit#(32))) verticalFilterBlock <- mkFIFO(); |
|
Reg#(Bit#(2)) columnState <- mkReg(0); |
Vector#(4, FIFO#(Bit#(32))) columnToRowStore <- replicateM(mkSizedFIFO(3)); |
Vector#(4, FIFO#(Bit#(32))) columnToRowStore = newVector(); |
columnToRowStore[0] <- mkSizedFIFO(3); |
columnToRowStore[1] <- mkFIFO; |
columnToRowStore[2] <- mkFIFO; |
columnToRowStore[3] <- mkFIFO; |
|
|
Reg#(Bit#(2)) columnToRowState <- mkReg(0); |
FIFO#(Tuple2#(Bit#(4), Bit#(1))) columnToRowStoreBlock <- mkFIFO(); |
|
491,7 → 503,18
end |
tagged PBbS .xdata : |
begin |
process <= Initialize; |
if(currMbHor<zeroExtend(picWidth)) |
begin |
process <= Horizontal; |
dataReqCount <= 1; |
dataRespCount <= 1; |
filterTopMbEdgeFlag <= !(currMb<zeroExtend(picWidth) || disable_deblocking_filter_idc==1 || (disable_deblocking_filter_idc==2 && currMb-firstMb<zeroExtend(picWidth))); |
filterLeftMbEdgeFlag <= !(currMbHor==0 || disable_deblocking_filter_idc==1 || (disable_deblocking_filter_idc==2 && currMb==firstMb)); |
filterInternalEdgesFlag <= !(disable_deblocking_filter_idc==1); |
blockNum <= 0; |
pixelNum <= 0; |
topVectorValidBits <= 0; |
end |
end |
tagged PBoutput .xdata : |
begin |
529,19 → 552,6
endrule |
|
|
rule initialize ( process==Initialize && currMbHor<zeroExtend(picWidth) ); |
$display( "TRACE Deblocking Filter: initialize %0d", currMb); |
process <= Horizontal; |
dataReqCount <= 1; |
dataRespCount <= 1; |
filterTopMbEdgeFlag <= !(currMb<zeroExtend(picWidth) || disable_deblocking_filter_idc==1 || (disable_deblocking_filter_idc==2 && currMb-firstMb<zeroExtend(picWidth))); |
filterLeftMbEdgeFlag <= !(currMbHor==0 || disable_deblocking_filter_idc==1 || (disable_deblocking_filter_idc==2 && currMb==firstMb)); |
filterInternalEdgesFlag <= !(disable_deblocking_filter_idc==1); |
blockNum <= 0; |
pixelNum <= 0; |
topVectorValidBits <= 0; |
endrule |
|
rule dataSendReq ( dataReqCount>0 && currMbHor<zeroExtend(picWidth) ); |
$display( "TRACE Deblocking Filter: dataSendReq %0d", dataReqCount); |
Bit#(PicWidthSz) temp = truncate(currMbHor); |
1111,8 → 1121,13
if(chromaFlag==0) |
begin |
chromaFlag <= 1; |
process <= Initialize; |
$display( "TRACE Deblocking Filter: horizontal bsFIFO luma completed"); |
process <= Horizontal; |
dataReqCount <= 1; |
dataRespCount <= 1; |
blockNum <= 0; |
pixelNum <= 0; |
topVectorValidBits <= 0; |
end |
else |
begin |
/trunk/src/mkBufferControl.bsv
714,7 → 714,11
//$finish(0); |
//outfifo.enq(EndOfFile); |
end |
default: infifo.deq(); |
default: |
begin |
$display("WARNING: Why are we in this clause"); |
infifo.deq(); |
end |
endcase |
end |
tagged DFBLuma .indata : |