Unified · Split
| @@ -1345,7 +1345,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, · 1344 unmodified lines | |||
| 1345 | avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0; | 1345 | avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0; |
| 1346 | fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", | 1346 | fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", |
| 1347 | (double)video_size / 1024, ti1, bitrate, avg_bitrate); | 1347 | (double)video_size / 1024, ti1, bitrate, avg_bitrate); |
| 1348 | fprintf(vstats_file,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type)); | 1348 | fprintf(vstats_file,"type= %c\n", av_get_picture_type_char(enc->coded_frame->pict_type)); |
| 1349 | } | 1349 | } |
| 1350 | } | 1350 | } |
| 1351 | 1351 | ||
| @@ -1381,7 +1381,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_ · 1380 unmodified lines | |||
| 1381 | 1381 | ||
| 1382 | #if defined(DEBUG_SYNC) && 0 | 1382 | #if defined(DEBUG_SYNC) && 0 |
| 1383 | printf("frame_type=%c clock=%0.3f pts=%0.3f\n", | 1383 | printf("frame_type=%c clock=%0.3f pts=%0.3f\n", |
| 1384 | av_get_pict_type_char(src_frame->pict_type), pts, pts1); | 1384 | av_get_picture_type_char(src_frame->pict_type), pts, pts1); |
| 1385 | #endif | 1385 | #endif |
| 1386 | 1386 | ||
| 1387 | /* wait until we have space to put a new picture */ | 1387 | /* wait until we have space to put a new picture */ |
| @@ -109,7 +109,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s) · 108 unmodified lines | |||
| 109 | 109 | ||
| 110 | if(s->avctx->debug & FF_DEBUG_PICT_INFO){ | 110 | if(s->avctx->debug & FF_DEBUG_PICT_INFO){ |
| 111 | av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", | 111 | av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", |
| 112 | s->dropable ? 'D' : av_get_pict_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number); | 112 | s->dropable ? 'D' : av_get_picture_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | s->y_dc_scale_table= | 115 | s->y_dc_scale_table= |
| @@ -2307,7 +2307,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ · 2306 unmodified lines | |||
| 2307 | h->slice_num, | 2307 | h->slice_num, |
| 2308 | (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), | 2308 | (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
| 2309 | first_mb_in_slice, | 2309 | first_mb_in_slice, |
| 2310 | av_get_pict_type_char(h->slice_type), h->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", | 2310 | av_get_picture_type_char(h->slice_type), h->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", |
| 2311 | pps_id, h->frame_num, | 2311 | pps_id, h->frame_num, |
| 2312 | s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | 2312 | s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], |
| 2313 | h->ref_count[0], h->ref_count[1], | 2313 | h->ref_count[0], h->ref_count[1], |
| @@ -591,7 +591,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){ · 590 unmodified lines | |||
| 591 | mb_type--; | 591 | mb_type--; |
| 592 | decode_intra_mb: | 592 | decode_intra_mb: |
| 593 | if(mb_type > 25){ | 593 | if(mb_type > 25){ |
| 594 | av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y); | 594 | av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_picture_type_char(h->slice_type), s->mb_x, s->mb_y); |
| 595 | return -1; | 595 | return -1; |
| 596 | } | 596 | } |
| 597 | partition_count=0; | 597 | partition_count=0; |
| @@ -71,7 +71,7 @@ static const int h263_mb_type_b_map[15]= { · 70 unmodified lines | |||
| 71 | void ff_h263_show_pict_info(MpegEncContext *s){ | 71 | void ff_h263_show_pict_info(MpegEncContext *s){ |
| 72 | if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | 72 | if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
| 73 | av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d\n", | 73 | av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d\n", |
| 74 | s->qscale, av_get_pict_type_char(s->pict_type), | 74 | s->qscale, av_get_picture_type_char(s->pict_type), |
| 75 | s->gb.size_in_bits, 1-s->no_rounding, | 75 | s->gb.size_in_bits, 1-s->no_rounding, |
| 76 | s->obmc ? " AP" : "", | 76 | s->obmc ? " AP" : "", |
| 77 | s->umvplus ? " UMV" : "", | 77 | s->umvplus ? " UMV" : "", |
| @@ -788,7 +788,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) · 787 unmodified lines | |||
| 788 | 788 | ||
| 789 | if(s->avctx->debug&FF_DEBUG_RC){ | 789 | if(s->avctx->debug&FF_DEBUG_RC){ |
| 790 | av_log(s->avctx, AV_LOG_DEBUG, "%c qp:%d<%2.1f<%d %d want:%d total:%d comp:%f st_q:%2.2f size:%d var:%d/%d br:%d fps:%d\n", | 790 | av_log(s->avctx, AV_LOG_DEBUG, "%c qp:%d<%2.1f<%d %d want:%d total:%d comp:%f st_q:%2.2f size:%d var:%d/%d br:%d fps:%d\n", |
| 791 | av_get_pict_type_char(pict_type), qmin, q, qmax, picture_number, (int)wanted_bits/1000, (int)s->total_bits/1000, | 791 | av_get_picture_type_char(pict_type), qmin, q, qmax, picture_number, (int)wanted_bits/1000, (int)s->total_bits/1000, |
| 792 | br_compensation, short_term_q, s->frame_bits, pic->mb_var_sum, pic->mc_mb_var_sum, s->bit_rate/1000, (int)fps | 792 | br_compensation, short_term_q, s->frame_bits, pic->mb_var_sum, pic->mc_mb_var_sum, s->bit_rate/1000, (int)fps |
| 793 | ); | 793 | ); |
| 794 | } | 794 | } |
| @@ -941,7 +941,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, · 940 unmodified lines | |||
| 941 | 941 | ||
| 942 | if (avctx->debug&FF_DEBUG_PICT_INFO){ | 942 | if (avctx->debug&FF_DEBUG_PICT_INFO){ |
| 943 | av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", | 943 | av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", |
| 944 | av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, | 944 | av_get_picture_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, |
| 945 | s->adaptive_quant, s->qscale, h->slice_num); | 945 | s->adaptive_quant, s->qscale, h->slice_num); |
| 946 | } | 946 | } |
| 947 | 947 | ||