RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  h264_sei: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-02 12:37:37 +02:00
parent da4cd61502 b18412171f
commit 2ae5ac78d8
1 changed files with 87 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libavcodec/h264_sei.c
View File

@ -37,14 +37,16 @@ static const uint8_t sei_num_clock_ts_table[9]={
1, 1, 1, 2, 2, 3, 3, 2, 3
};
void ff_h264_reset_sei(H264Context *h) {
void ff_h264_reset_sei(H264Context *h)
{
h->sei_recovery_frame_cnt = -1;
h->sei_dpb_output_delay = 0;
h->sei_cpb_removal_delay = -1;
h->sei_buffering_period_present = 0;
}
static int decode_picture_timing(H264Context *h){
static int decode_picture_timing(H264Context *h)
{
SPS *sps = &h->sps;
int i;
@ -53,11 +55,14 @@ static int decode_picture_timing(H264Context *h){
sps = h->sps_buffers[i];
if (sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag) {
h->sei_cpb_removal_delay = get_bits_long(&h->gb, sps->cpb_removal_delay_length);
h->sei_dpb_output_delay = get_bits_long(&h->gb, sps->dpb_output_delay_length);
h->sei_cpb_removal_delay = get_bits_long(&h->gb,
sps->cpb_removal_delay_length);
h->sei_dpb_output_delay = get_bits_long(&h->gb,
sps->dpb_output_delay_length);
}
if (sps->pic_struct_present_flag) {
unsigned int i, num_clock_ts;
h->sei_pic_struct = get_bits(&h->gb, 4);
h->sei_ct_type = 0;
@ -69,6 +74,7 @@ static int decode_picture_timing(H264Context *h){
for (i = 0; i < num_clock_ts; i++) {
if (get_bits(&h->gb, 1)) { /* clock_timestamp_flag */
unsigned int full_timestamp_flag;
h->sei_ct_type |= 1 << get_bits(&h->gb, 2);
skip_bits(&h->gb, 1); /* nuit_field_based_flag */
skip_bits(&h->gb, 5); /* counting_type */
@ -91,17 +97,20 @@ static int decode_picture_timing(H264Context *h){
}
}
if (sps->time_offset_length > 0)
skip_bits(&h->gb, sps->time_offset_length); /* time_offset */
skip_bits(&h->gb,
sps->time_offset_length); /* time_offset */
}
}
if (h->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(h->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
av_log(h->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n",
h->sei_ct_type, h->sei_pic_struct);
}
return 0;
}
static int decode_user_data_itu_t_t35(H264Context *h, int size) {
static int decode_user_data_itu_t_t35(H264Context *h, int size)
{
uint32_t user_identifier;
int dtg_active_format;
@ -137,16 +146,16 @@ static int decode_user_data_itu_t_t35(H264Context *h, int size) {
return 0;
}
static int decode_unregistered_user_data(H264Context *h, int size){
static int decode_unregistered_user_data(H264Context *h, int size)
{
uint8_t user_data[16 + 256];
int e, build, i;
if (size < 16)
return -1;
for(i=0; i<sizeof(user_data)-1 && i<size; i++){
for (i = 0; i < sizeof(user_data) - 1 && i < size; i++)
user_data[i] = get_bits(&h->gb, 8);
}
user_data[i] = 0;
e = sscanf(user_data + 16, "x264 - core %d", &build);
@ -164,9 +173,14 @@ static int decode_unregistered_user_data(H264Context *h, int size){
return 0;
}
static int decode_recovery_point(H264Context *h){
static int decode_recovery_point(H264Context *h)
{
h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb);
skip_bits(&h->gb, 4); /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
/* 1b exact_match_flag,
* 1b broken_link_flag,
* 2b changing_slice_group_idc */
skip_bits(&h->gb, 4);
if (h->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(h->avctx, AV_LOG_DEBUG, "sei_recovery_frame_cnt: %d\n", h->sei_recovery_frame_cnt);
@ -174,14 +188,16 @@ static int decode_recovery_point(H264Context *h){
return 0;
}
static int decode_buffering_period(H264Context *h){
static int decode_buffering_period(H264Context *h)
{
unsigned int sps_id;
int sched_sel_idx;
SPS *sps;
sps_id = get_ue_golomb_31(&h->gb);
if (sps_id > 31 || !h->sps_buffers[sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
av_log(h->avctx, AV_LOG_ERROR,
"non-existing SPS %d referenced in buffering period\n", sps_id);
return -1;
}
sps = h->sps_buffers[sps_id];
@ -189,14 +205,18 @@ static int decode_buffering_period(H264Context *h){
// NOTE: This is really so duplicated in the standard... See H.264, D.1.1
if (sps->nal_hrd_parameters_present_flag) {
for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length);
skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
h->initial_cpb_removal_delay[sched_sel_idx] =
get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length);
// initial_cpb_removal_delay_offset
skip_bits(&h->gb, sps->initial_cpb_removal_delay_length);
}
}
if (sps->vcl_hrd_parameters_present_flag) {
for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length);
skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
h->initial_cpb_removal_delay[sched_sel_idx] =
get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length);
// initial_cpb_removal_delay_offset
skip_bits(&h->gb, sps->initial_cpb_removal_delay_length);
}
}
@ -242,19 +262,19 @@ static int decode_frame_packing(H264Context *h, int size){
return 0;
}
int ff_h264_decode_sei(H264Context *h){
int ff_h264_decode_sei(H264Context *h)
{
while (get_bits_left(&h->gb) > 16) {
int type;
unsigned size, next;
int type = 0;
unsigned size = 0;
unsigned next;
type=0;
do {
if (get_bits_left(&h->gb) < 8)
return AVERROR_INVALIDDATA;
type += show_bits(&h->gb, 8);
} while (get_bits(&h->gb, 8) == 255);
size=0;
do {
if (get_bits_left(&h->gb) < 8)
return AVERROR_INVALIDDATA;