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

Defined more NAL typed and added better checking for NAL type in slice_header

Browse source
This commit is contained in:
Marko Viitanen 2013-09-03 17:55:36 +03:00
parent 764cf60971
commit cb2eecf002
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/encoder.c
View file

@ -289,7 +289,7 @@ void encode_one_frame(encoder_control* encoder)
/* First slice is IDR */ /* First slice is IDR */
cabac_start(&cabac); cabac_start(&cabac);
encoder->in.cur_pic.slicetype = SLICE_I; encoder->in.cur_pic.slicetype = SLICE_I;
encoder->in.cur_pic.type = NAL_IDR_SLICE; encoder->in.cur_pic.type = NAL_IDR_W_RADL;
search_slice_data(encoder); search_slice_data(encoder);
encode_slice_header(encoder); encode_slice_header(encoder);
@ -298,7 +298,7 @@ void encode_one_frame(encoder_control* encoder)
cabac_flush(&cabac); cabac_flush(&cabac);
bitstream_align(encoder->stream); bitstream_align(encoder->stream);
bitstream_flush(encoder->stream); bitstream_flush(encoder->stream);
nal_write(encoder->output, encoder->stream->buffer, encoder->stream->buffer_pos, 0, NAL_IDR_SLICE, 0); nal_write(encoder->output, encoder->stream->buffer, encoder->stream->buffer_pos, 0, NAL_IDR_W_RADL, 0);
bitstream_clear_buffer(encoder->stream); bitstream_clear_buffer(encoder->stream);
} }
@ -336,7 +336,7 @@ void encode_one_frame(encoder_control* encoder)
{ {
cabac_start(&cabac); cabac_start(&cabac);
encoder->in.cur_pic.slicetype = SLICE_I; encoder->in.cur_pic.slicetype = SLICE_I;
encoder->in.cur_pic.type = 1; encoder->in.cur_pic.type = NAL_TRAIL_R;
search_slice_data(encoder); search_slice_data(encoder);
encode_slice_header(encoder); encode_slice_header(encoder);
@ -345,7 +345,7 @@ void encode_one_frame(encoder_control* encoder)
cabac_flush(&cabac); cabac_flush(&cabac);
bitstream_align(encoder->stream); bitstream_align(encoder->stream);
bitstream_flush(encoder->stream); bitstream_flush(encoder->stream);
nal_write(encoder->output, encoder->stream->buffer, encoder->stream->buffer_pos, 0,1,encoder->frame); nal_write(encoder->output, encoder->stream->buffer, encoder->stream->buffer_pos, 0,NAL_TRAIL_R,encoder->frame);
bitstream_clear_buffer(encoder->stream); bitstream_clear_buffer(encoder->stream);
} }
#ifdef _DEBUG #ifdef _DEBUG
@ -629,7 +629,7 @@ void encode_slice_header(encoder_control* encoder)
#endif #endif
WRITE_U(encoder->stream, 1, 1, "first_slice_segment_in_pic_flag"); WRITE_U(encoder->stream, 1, 1, "first_slice_segment_in_pic_flag");
if(encoder->in.cur_pic.type == NAL_IDR_SLICE) if(encoder->in.cur_pic.type >= NAL_BLA_W_LP && encoder->in.cur_pic.type <= NAL_RSV_IRAP_VCL23)
{ {
WRITE_U(encoder->stream, 1, 1, "no_output_of_prior_pics_flag"); WRITE_U(encoder->stream, 1, 1, "no_output_of_prior_pics_flag");
} }
@ -645,7 +645,7 @@ void encode_slice_header(encoder_control* encoder)
//WRITE_U(encoder->stream, 1, 1, "pic_output_flag"); //WRITE_U(encoder->stream, 1, 1, "pic_output_flag");
//end if //end if
//if( IdrPicFlag ) <- nal_unit_type == 5 //if( IdrPicFlag ) <- nal_unit_type == 5
if(encoder->in.cur_pic.type != NAL_IDR_SLICE) if(encoder->in.cur_pic.type != NAL_IDR_W_RADL && encoder->in.cur_pic.type != NAL_IDR_N_LP)
{ {
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");

12
src/nal.h
View file

@ -13,7 +13,17 @@
#ifndef __NAL_H #ifndef __NAL_H
#define __NAL_H #define __NAL_H
enum { NAL_NONIDR_SLICE = 0x1,NAL_IDR_SLICE = 19, NAL_VID_PARAMETER_SET = 32,NAL_SEQ_PARAMETER_SET = 33, NAL_PIC_PARAMETER_SET = 34 }; enum { NAL_TRAIL_N = 0, NAL_TRAIL_R = 1,
NAL_BLA_W_LP = 16,
NAL_IDR_W_RADL = 19, NAL_IDR_N_LP = 10,
NAL_RSV_IRAP_VCL23 = 23,
/* Parameter sets */
NAL_VID_PARAMETER_SET = 32, NAL_SEQ_PARAMETER_SET = 33, NAL_PIC_PARAMETER_SET = 34
};
void nal_write(FILE* output, uint8_t* buffer, uint32_t buffer_len, uint8_t nal_ref, uint8_t nal_type, uint8_t temporal_id); void nal_write(FILE* output, uint8_t* buffer, uint32_t buffer_len, uint8_t nal_ref, uint8_t nal_type, uint8_t temporal_id);