hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 02:24:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Intra testing

Browse source
This commit is contained in:
Marko Viitanen 2013-02-24 16:03:40 +02:00
parent 10fe0f8018
commit eba43088b2
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/encoder.c
View file

@ -682,12 +682,12 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui
return; return;
} }
} }
/*
if(border_x && border_y)//yCtb == 20 && xCtb == 20) if(/*border_x && border_y)//*/yCtb == 20 && (xCtb >= 20 && xCtb <= 40))
{ {
cur_CU->type = CU_INTRA; cur_CU->type = CU_INTRA;
} }
*/
/* coding_unit( x0, y0, log2CbSize ) */ /* coding_unit( x0, y0, log2CbSize ) */
/* prediction_unit 2Nx2N*/ /* prediction_unit 2Nx2N*/
@ -759,16 +759,16 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui
Int preds[3] = {-1, -1, -1}; Int preds[3] = {-1, -1, -1};
Int predNum = pcCU->getIntraDirLumaPredictor(absPartIdx+partOffset*j, preds); Int predNum = pcCU->getIntraDirLumaPredictor(absPartIdx+partOffset*j, preds);
*/ */
CABAC_BINS_EP(&cabac, predMode, 5, "intraPredMode"); CABAC_BINS_EP(&cabac, 10, 5, "intraPredMode");
predMode++; //predMode++;
predMode = predMode % 10; //predMode = predMode % 10;
if(encoder->in.video_format != FORMAT_400) if(encoder->in.video_format != FORMAT_400)
{ {
cabac.ctx = &g_ChromaPredSCModel[0]; cabac.ctx = &g_ChromaPredSCModel[0];
CABAC_BIN(&cabac,1,"IntraPredChroma"); CABAC_BIN(&cabac,1,"IntraPredChroma");
CABAC_BINS_EP(&cabac, 0, 2, "intraPredModeChroma"); CABAC_BINS_EP(&cabac, 1, 2, "intraPredModeChroma");
} }
/* Coeff */ /* Coeff */

1
src/intra.h
View file

@ -14,4 +14,5 @@
#define __INTRA_H #define __INTRA_H
#endif #endif

2
src/nal.c
View file

@ -37,10 +37,12 @@ void nal_write(FILE* output, uint8_t* buffer, uint32_t buffer_len, uint8_t nal_r
const uint8_t zero = 0x00; const uint8_t zero = 0x00;
/*start_code_prefix_one_3bytes */ /*start_code_prefix_one_3bytes */
/*
if(temporal_id == 0) if(temporal_id == 0)
{ {
fwrite(&zero, 1, 1, output); fwrite(&zero, 1, 1, output);
} }
*/
fwrite(&zero, 1, 1, output); fwrite(&zero, 1, 1, output);
fwrite(&zero, 1, 1, output); fwrite(&zero, 1, 1, output);
fwrite(&start_code_prefix_one_3bytes, 1, 1, output); fwrite(&start_code_prefix_one_3bytes, 1, 1, output);