diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 15:51:40 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 16:12:38 +0200 |
commit | 31ab1575e59e33957864d1bdf13253f8d366ccba (patch) | |
tree | 074dd6605a3d7e0a42b6cd12d2f071fe25d3d25a /libavcodec/mpegvideo_enc.c | |
parent | adc5539e7b94a94114d591d83e7ae63f52b5916f (diff) | |
parent | 1218777ffd152287244349d4ff9e1cbc84fa2c54 (diff) | |
download | ffmpeg-streaming-31ab1575e59e33957864d1bdf13253f8d366ccba.zip ffmpeg-streaming-31ab1575e59e33957864d1bdf13253f8d366ccba.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: Convert some commented-out printf/av_log instances to av_dlog
avcodec: Drop silly and/or broken printf debug output
avcodec: Drop some silly commented-out av_log() invocations
avformat: Convert some commented-out printf/av_log instances to av_dlog
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
Remove some silly disabled code.
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Conflicts:
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/mjpegdec.c
libavcodec/motion_est_template.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo_enc.c
libavcodec/put_bits.h
libavcodec/ratecontrol.c
libavcodec/wmaenc.c
libavdevice/timefilter.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/avienc.c
libavformat/flvenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4322d65..d7aad62 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1011,8 +1011,8 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg) if (pic_arg->linesize[2] != s->uvlinesize) direct = 0; - //av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], - // pic_arg->linesize[1], s->linesize, s->uvlinesize); + av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0], + pic_arg->linesize[1], s->linesize, s->uvlinesize); if (direct) { i = ff_find_unused_picture(s, 1); @@ -1291,10 +1291,6 @@ static int select_input_picture(MpegEncContext *s) if (s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)) { // FIXME check that te gop check above is +-1 correct - //av_log(NULL, AV_LOG_DEBUG, "skip %p %"PRId64"\n", - // s->input_picture[0]->f.data[0], - // s->input_picture[0]->pts); - if (s->input_picture[0]->f.type == FF_BUFFER_TYPE_SHARED) { for (i = 0; i < 4; i++) s->input_picture[0]->f.data[i] = NULL; @@ -1366,9 +1362,6 @@ static int select_input_picture(MpegEncContext *s) } emms_c(); - //static int b_count = 0; - //b_count += b_frames; - //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count); for (i = b_frames - 1; i >= 0; i--) { int type = s->input_picture[i]->f.pict_type; @@ -1462,7 +1455,6 @@ no_output_pic: ff_copy_picture(&s->current_picture, s->current_picture_ptr); s->picture_number = s->new_picture.f.display_picture_number; - //printf("dpn:%d\n", s->picture_number); } else { memset(&s->new_picture, 0, sizeof(Picture)); } @@ -1508,8 +1500,6 @@ int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt, s->pict_type = s->new_picture.f.pict_type; //emms_c(); - //printf("qs:%f %f %d\n", s->new_picture.quality, - // s->current_picture.quality, s->qscale); ff_MPV_frame_start(s, avctx); vbv_retry: if (encode_picture(s, s->picture_number) < 0) @@ -1558,7 +1548,6 @@ vbv_retry: s->time_base = s->last_time_base; s->last_non_b_time = s->time - s->pp_time; } - //av_log(NULL, AV_LOG_ERROR, "R:%d ", s->next_lambda); for (i = 0; i < context_count; i++) { PutBitContext *pb = &s->thread_context[i]->pb; init_put_bits(pb, pb->buf, pb->buf_end - pb->buf); @@ -2463,7 +2452,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ uint8_t bit_buf2[2][MAX_MB_BYTES]; uint8_t bit_buf_tex[2][MAX_MB_BYTES]; PutBitContext pb[2], pb2[2], tex_pb[2]; -//printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); ff_check_alignment(); @@ -2518,7 +2506,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->first_slice_line = 1; s->ptr_lastgob = s->pb.buf; for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { -// printf("row %d at %X\n", s->mb_y, (int)s); s->mb_x=0; s->mb_y= mb_y; @@ -2992,7 +2979,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 0; motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; -// printf(" %d %d ", motion_x, motion_y); break; case CANDIDATE_MB_TYPE_FORWARD_I: s->mv_dir = MV_DIR_FORWARD; @@ -3069,7 +3055,8 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(CONFIG_H263_ENCODER && s->out_format == FMT_H263) ff_h263_loop_filter(s); } -//printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); + av_dlog(s->avctx, "MB %d %d bits\n", + s->mb_x + s->mb_y * s->mb_stride, put_bits_count(&s->pb)); } } @@ -3162,7 +3149,6 @@ static int estimate_qp(MpegEncContext *s, int dry_run){ //FIXME broken }else s->lambda = s->current_picture.f.quality; -//printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); update_qscale(s); return 0; } @@ -3272,8 +3258,10 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->pict_type= AV_PICTURE_TYPE_I; for(i=0; i<s->mb_stride*s->mb_height; i++) s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; -//printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); - if(s->msmpeg4_version >= 3) s->no_rounding=1; + if(s->msmpeg4_version >= 3) + s->no_rounding=1; + av_dlog(s, "Scene change detected, encoding as I Frame %d %d\n", + s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); } if(!s->umvplus){ |