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

P-Slice testing, outputs P-slice as the second output slice

Browse source
This commit is contained in:
Marko Viitanen 2013-09-04 17:47:54 +03:00
parent ae14913af4
commit 0af55b8676
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/encoder.c
View file

@ -335,7 +335,7 @@ void encode_one_frame(encoder_control* encoder)
else else
{ {
cabac_start(&cabac); cabac_start(&cabac);
encoder->in.cur_pic.slicetype = SLICE_I; encoder->in.cur_pic.slicetype = (encoder->frame==1)?SLICE_P:SLICE_I;
encoder->in.cur_pic.type = NAL_TRAIL_R; encoder->in.cur_pic.type = NAL_TRAIL_R;
search_slice_data(encoder); search_slice_data(encoder);
@ -647,10 +647,19 @@ void encode_slice_header(encoder_control* encoder)
//if( IdrPicFlag ) <- nal_unit_type == 5 //if( IdrPicFlag ) <- nal_unit_type == 5
if(encoder->in.cur_pic.type != NAL_IDR_W_RADL && encoder->in.cur_pic.type != NAL_IDR_N_LP) if(encoder->in.cur_pic.type != NAL_IDR_W_RADL && encoder->in.cur_pic.type != NAL_IDR_N_LP)
{ {
int j;
int ref_negative = 1;
int ref_positive = 0;
WRITE_U(encoder->stream, encoder->frame&0xf, 4, "pic_order_cnt_lsb"); WRITE_U(encoder->stream, encoder->frame&0xf, 4, "pic_order_cnt_lsb");
WRITE_U(encoder->stream, 0, 1, "short_term_ref_pic_set_sps_flag"); WRITE_U(encoder->stream, 0, 1, "short_term_ref_pic_set_sps_flag");
WRITE_UE(encoder->stream, 0, "num_negative_pics"); WRITE_UE(encoder->stream, ref_negative, "num_negative_pics");
WRITE_UE(encoder->stream, 0, "num_positive_pics"); WRITE_UE(encoder->stream, ref_positive, "num_positive_pics");
for(j=0; j <ref_negative; j++)
{
WRITE_UE(encoder->stream, 0, "delta_poc_s0_minus1");
WRITE_U(encoder->stream,1,1, "used_by_curr_pic_s0_flag");
}
//WRITE_UE(encoder->stream, 0, "short_term_ref_pic_set_idx"); //WRITE_UE(encoder->stream, 0, "short_term_ref_pic_set_idx");
} }
//end if //end if

2
src/picture.h
View file

@ -112,7 +112,7 @@ int picture_destroy(picture *pic);
void picture_setBlockCoded(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth, int8_t coded); void picture_setBlockCoded(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth, int8_t coded);
void picture_setBlockSplit(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth, int8_t split); void picture_setBlockSplit(picture* pic,uint32_t xCtb, uint32_t yCtb, uint8_t depth, int8_t split);
enum { SLICE_P = 0, SLICE_B = 1, SLICE_I = 2 }; enum { SLICE_B = 0, SLICE_P = 1, SLICE_I = 2 };
enum { REF_PIC_LIST_0 = 0,REF_PIC_LIST_1 = 1,REF_PIC_LIST_X = 100 }; enum { REF_PIC_LIST_0 = 0,REF_PIC_LIST_1 = 1,REF_PIC_LIST_X = 100 };