History

avcodec: Drop silly and/or broken printf debug output

Diego Biurrun committed 14 years ago

Commit 9c6cf7f1 parent 6f6b03121 files · +6 −94Browse files

Unified · Split

21 files
  1. avserver.c +0 −2
  2. libavcodec/error_resilience.c +0 −4
  3. libavcodec/ffv1.c +1 −6
  4. libavcodec/h263dec.c +0 −2
  5. libavcodec/h264.c +0 −3
  6. libavcodec/h264_loopfilter.c +0 −4
  7. libavcodec/h264_parser.c +0 −1
  8. libavcodec/ljpegenc.c +0 −1
  9. libavcodec/mjpegdec.c +0 −9
  10. libavcodec/mjpegenc.c +0 −1
  11. libavcodec/motion_est.c +0 −10
  12. libavcodec/motion_est_template.c +2 −12
  13. libavcodec/mpegvideo_enc.c +0 −7
  14. libavcodec/msmpeg4.c +1 −6
  15. libavcodec/msmpeg4enc.c +0 −3
  16. libavcodec/put_bits.h +0 −3
  17. libavcodec/ratecontrol.c +0 −12
  18. libavcodec/utils.c +0 −1
  19. libavcodec/wmadec.c +0 −1
  20. libavcodec/wmv2dec.c +0 −4
  21. libavcodec/x86/mpegvideo.c +2 −2
avserver.c+0−2
@@ -2663,8 +2663,6 @@ static int http_receive_data(HTTPContext *c) · 2662 unmodified lines
26632663 /* a packet has been received : write it in the store, except
26642664 if header */
26652665 if (c->data_count > FFM_PACKET_SIZE) {
2666−
2667− // printf("writing pos=0x%"PRIx64" size=0x%"PRIx64"\n", feed->feed_write_index, feed->feed_size);
26682666 /* XXX: use llseek or url_seek */
26692667 lseek(c->feed_fd, feed->feed_write_index, SEEK_SET);
26702668 if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) {
libavcodec/error_resilience.c+0−4
@@ -699,8 +699,6 @@ skip_last_mv: · 698 unmodified lines
699699 fixed[mb_xy] = MV_UNCHANGED;
700700 }
701701 }
702−
703− // printf(".%d/%d", changed, score_sum); fflush(stdout);
704702 }
705703
706704 if (none_left)
@@ -711,7 +709,6 @@ skip_last_mv: · 4 unmodified lines
711709 if (fixed[mb_xy])
712710 fixed[mb_xy] = MV_FROZEN;
713711 }
714− // printf(":"); fflush(stdout);
715712 }
716713 }
717714
@@ -789,7 +786,6 @@ static int is_intra_more_likely(MpegEncContext *s) · 71 unmodified lines
789786 }
790787 }
791788 }
792− // printf("is_intra_likely: %d type:%d\n", is_intra_likely, s->pict_type);
793789 return is_intra_likely > 0;
794790 }
795791
libavcodec/ffv1.c+1−6
@@ -383,7 +383,6 @@ static inline void update_vlc_state(VlcState * const state, const int v){ · 382 unmodified lines
383383
384384 static inline void put_vlc_symbol(PutBitContext *pb, VlcState * const state, int v, int bits){
385385 int i, k, code;
386−//printf("final: %d ", v);
387386 v = fold(v - state->bias, bits);
388387
389388 i= state->count;
@@ -432,7 +431,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state, int · 42 unmodified lines
432431 ret= fold(v + state->bias, bits);
433432
434433 update_vlc_state(state, v);
435−//printf("final: %d\n", ret);
434+
436435 return ret;
437436 }
438437
@@ -1117,7 +1116,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 678 unmodified lines
11171116
11181117 if(!f->ac){
11191118 used_count += ff_rac_terminate(c);
1120−//printf("pos=%d\n", used_count);
11211119 init_put_bits(&f->slice_context[0]->pb, pkt->data + used_count, pkt->size - used_count);
11221120 }else if (f->ac>1){
11231121 int i;
@@ -1432,8 +1430,6 @@ static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale){ · 308 unmodified lines
14321430 while(len--){
14331431 quant_table[i] = scale*v;
14341432 i++;
1435−//printf("%2d ",v);
1436−//if(i%16==0) printf("\n");
14371433 }
14381434 }
14391435
@@ -1704,7 +1700,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac · 264 unmodified lines
17041700 if(!f->ac){
17051701 bytes_read = c->bytestream - c->bytestream_start - 1;
17061702 if(bytes_read ==0) av_log(avctx, AV_LOG_ERROR, "error at end of AC stream\n"); //FIXME
1707−//printf("pos=%d\n", bytes_read);
17081703 init_get_bits(&f->slice_context[0]->gb, buf + bytes_read, (buf_size - bytes_read) * 8);
17091704 } else {
17101705 bytes_read = 0; /* avoid warning */
libavcodec/h263dec.c+0−2
@@ -228,7 +228,6 @@ static int decode_slice(MpegEncContext *s){ · 227 unmodified lines
228228 if(s->loop_filter)
229229 ff_h263_loop_filter(s);
230230
231−//printf("%d %d %d %06X\n", s->mb_x, s->mb_y, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24));
232231 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_END&part_mask);
233232
234233 s->padding_bug_score--;
@@ -510,7 +509,6 @@ retry: · 275 unmodified lines
510509
511510 if(s->divx_version>=0)
512511 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
513−//printf("padding_bug_score: %d\n", s->padding_bug_score);
514512 if(s->divx_version==501 && s->divx_build==20020416)
515513 s->padding_bug_score= 256*256*256*64;
516514
libavcodec/h264.c+0−3
@@ -235,7 +235,6 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, · 234 unmodified lines
235235 if (dst == NULL)
236236 return NULL;
237237
238− // printf("decoding esc\n");
239238 memcpy(dst, src, i);
240239 si = di = i;
241240 while (si + 2 < length) {
@@ -2134,7 +2133,6 @@ static int init_poc(H264Context *h) · 1892 unmodified lines
21342133 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
21352134 else
21362135 h->poc_msb = h->prev_poc_msb;
2137− // printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
21382136 field_poc[0] =
21392137 field_poc[1] = h->poc_msb + h->poc_lsb;
21402138 if (s->picture_structure == PICT_FRAME)
@@ -4049,7 +4047,6 @@ out: · 1908 unmodified lines
40494047
40504048 assert(pict->data[0] || !*data_size);
40514049 ff_print_debug_info(s, pict);
4052− // printf("out %d\n", (int)pict->data[0]);
40534050
40544051 return get_consumed_bytes(s, buf_index, buf_size);
40554052 }
libavcodec/h264_loopfilter.c+0−4
@@ -583,9 +583,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u · 582 unmodified lines
583583 // value in IPCM macroblocks.
584584 if(bS[0]+bS[1]+bS[2]+bS[3]){
585585 qp = (s->current_picture.f.qscale_table[mb_xy] + s->current_picture.f.qscale_table[mbm_xy] + 1) >> 1;
586− //tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp[0], s->current_picture.qscale_table[mbn_xy]);
587586 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
588− //{ int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
589587 chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mbm_xy]) + 1) >> 1;
590588 chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mbm_xy]) + 1) >> 1;
591589 if( dir == 0 ) {
@@ -668,9 +666,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u · 76 unmodified lines
668666 // Do not use s->qscale as luma quantizer because it has not the same
669667 // value in IPCM macroblocks.
670668 qp = s->current_picture.f.qscale_table[mb_xy];
671− //tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp[0], s->current_picture.qscale_table[mbn_xy]);
672669 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
673− //{ int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
674670 if( dir == 0 ) {
675671 filter_mb_edgev( &img_y[4*edge << h->pixel_shift], linesize, bS, qp, a, b, h, 0 );
676672 if (chroma) {
libavcodec/h264_parser.c+0−1
@@ -37,7 +37,6 @@ static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_si · 36 unmodified lines
3737 int i;
3838 uint32_t state;
3939 ParseContext *pc = &(h->s.parse_context);
40−//printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]);
4140 // mb_addr= pc->mb_addr - 1;
4241 state= pc->state;
4342 if(state>13)
libavcodec/ljpegenc.c+0−1
@@ -174,7 +174,6 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, · 173 unmodified lines
174174 int pred;
175175
176176 ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
177−//printf("%d %d %d %d %8X\n", mb_x, mb_y, x, y, ptr);
178177 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
179178
180179 if(i==0)
libavcodec/mjpegdec.c+0−9
@@ -1178,8 +1178,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) · 1177 unmodified lines
11781178 4bytes field_size_less_padding
11791179 */
11801180 s->buggy_avid = 1;
1181−// if (s->first_picture)
1182−// printf("mjpeg: workarounding buggy AVID\n");
11831181 i = get_bits(&s->gb, 8);
11841182 if (i == 2)
11851183 s->bottom_field = 1;
@@ -1191,8 +1189,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) · 5 unmodified lines
11911189 skip_bits(&s->gb, 32);
11921190 len -= 10;
11931191 #endif
1194−// if (s->interlace_polarity)
1195−// printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
11961192 goto out;
11971193 }
11981194
@@ -1314,8 +1310,6 @@ static int mjpeg_decode_com(MJpegDecodeContext *s) · 115 unmodified lines
13141310 /* buggy avid, it puts EOI only at every 10th frame */
13151311 if (!strcmp(cbuf, "AVID")) {
13161312 s->buggy_avid = 1;
1317− // if (s->first_picture)
1318− // printf("mjpeg: workarounding buggy AVID\n");
13191313 } else if (!strcmp(cbuf, "CS=ITU601"))
13201314 s->cs_itu601 = 1;
13211315 else if ((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)) ||
@@ -1605,9 +1599,6 @@ eoi_parser: · 283 unmodified lines
16051599 av_log(avctx, AV_LOG_ERROR,
16061600 "mjpeg: unsupported coding type (%x)\n", start_code);
16071601 break;
1608−// default:
1609−// printf("mjpeg: unsupported marker (%x)\n", start_code);
1610−// break;
16111602 }
16121603
16131604 not_the_end:
libavcodec/mjpegenc.c+0−1
@@ -320,7 +320,6 @@ static void escape_FF(MpegEncContext *s, int start) · 319 unmodified lines
320320 int v= buf[i];
321321
322322 if(v==0xFF){
323−//printf("%d %d\n", i, ff_count);
324323 buf[i+ff_count]= 0;
325324 ff_count--;
326325 }
libavcodec/motion_est.c+0−10
@@ -395,12 +395,10 @@ static int sad_hpel_motion_search(MpegEncContext * s, · 394 unmodified lines
395395 assert(flags == 0);
396396
397397 if(c->skip){
398−// printf("S");
399398 *mx_ptr = 0;
400399 *my_ptr = 0;
401400 return dmin;
402401 }
403−// printf("N");
404402
405403 pix = c->src[src_index][0];
406404
@@ -1314,7 +1312,6 @@ static int ff_estimate_motion_b(MpegEncContext * s, · 907 unmodified lines
13141312 if(c->avctx->me_sub_cmp != c->avctx->mb_cmp && !c->skip)
13151313 dmin= get_mb_score(s, mx, my, 0, ref_index, 0, 16, 1);
13161314
1317−//printf("%d %d %d %d//", s->mb_x, s->mb_y, mx, my);
13181315 // s->mb_type[mb_y*s->mb_width + mb_x]= mb_type;
13191316 mv_table[mot_xy][0]= mx;
13201317 mv_table[mot_xy][1]= my;
@@ -1837,15 +1834,9 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) · 516 unmodified lines
18371834 best_score= score[i];
18381835 best_fcode= i;
18391836 }
1840−// printf("%d %d\n", i, score[i]);
18411837 }
18421838
1843−// printf("fcode: %d type: %d\n", i, s->pict_type);
18441839 return best_fcode;
1845−/* for(i=0; i<=MAX_FCODE; i++){
1846− printf("%d ", mv_num[i]);
1847− }
1848− printf("\n");*/
18491840 }else{
18501841 return 1;
18511842 }
@@ -1865,7 +1856,6 @@ void ff_fix_long_p_mvs(MpegEncContext * s) · 13 unmodified lines
18651856
18661857 if(c->avctx->me_range && range > c->avctx->me_range) range= c->avctx->me_range;
18671858
1868−//printf("%d no:%d %d//\n", clip, noclip, f_code);
18691859 if(s->flags&CODEC_FLAG_4MV){
18701860 const int wrap= s->b8_stride;
18711861
libavcodec/motion_est_template.c+2−12
@@ -367,13 +367,11 @@ static int qpel_motion_search(MpegEncContext * s, · 366 unmodified lines
367367 assert((x) <= xmax);\
368368 assert((y) >= ymin);\
369369 assert((y) <= ymax);\
370−/*printf("check_mv %d %d\n", x, y);*/\
371370 if(map[index]!=key){\
372371 d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\
373372 map[index]= key;\
374373 score_map[index]= d;\
375374 d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\
376−/*printf("score:%d\n", d);*/\
377375 COPY3_IF_LT(dmin, d, best[0], x, best[1], y)\
378376 }\
379377 }
@@ -391,13 +389,11 @@ static int qpel_motion_search(MpegEncContext * s, · 11 unmodified lines
391389 {\
392390 const unsigned key = ((y)<<ME_MAP_MV_BITS) + (x) + map_generation;\
393391 const int index= (((y)<<ME_MAP_SHIFT) + (x))&(ME_MAP_SIZE-1);\
394−/*printf("check_mv_dir %d %d %d\n", x, y, new_dir);*/\
395392 if(map[index]!=key){\
396393 d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\
397394 map[index]= key;\
398395 score_map[index]= d;\
399396 d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\
400−/*printf("score:%d\n", d);*/\
401397 if(d<dmin){\
402398 best[0]=x;\
403399 best[1]=y;\
@@ -448,7 +444,6 @@ static av_always_inline int small_diamond_search(MpegEncContext * s, int *best, · 44 unmodified lines
448444 const int y= best[1];
449445 next_dir=-1;
450446
451−//printf("%d", dir);
452447 if(dir!=2 && x>xmin) CHECK_MV_DIR(x-1, y , 0)
453448 if(dir!=3 && y>ymin) CHECK_MV_DIR(x , y-1, 1)
454449 if(dir!=0 && x<xmax) CHECK_MV_DIR(x+1, y , 2)
@@ -660,13 +655,11 @@ static int full_search(MpegEncContext * s, int *best, int dmin, · 205 unmodified lines
660655 {\
661656 const unsigned key = ((ay)<<ME_MAP_MV_BITS) + (ax) + map_generation;\
662657 const int index= (((ay)<<ME_MAP_SHIFT) + (ax))&(ME_MAP_SIZE-1);\
663−/*printf("sab check %d %d\n", ax, ay);*/\
664658 if(map[index]!=key){\
665659 d= cmp(s, ax, ay, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\
666660 map[index]= key;\
667661 score_map[index]= d;\
668662 d += (mv_penalty[((ax)<<shift)-pred_x] + mv_penalty[((ay)<<shift)-pred_y])*penalty_factor;\
669−/*printf("score: %d\n", d);*/\
670663 if(d < minima[minima_count-1].height){\
671664 int j=0;\
672665 \
@@ -974,7 +967,6 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int · 301 unmodified lines
974967 *mx_ptr= best[0];
975968 *my_ptr= best[1];
976969
977−// printf("%d %d %d \n", best[0], best[1], dmin);
978970 return dmin;
979971 }
980972
@@ -1020,7 +1012,7 @@ static int epzs_motion_search4(MpegEncContext * s, · 39 unmodified lines
10201012 map_generation= update_map_generation(c);
10211013
10221014 dmin = 1000000;
1023−//printf("%d %d %d %d //",xmin, ymin, xmax, ymax);
1015+
10241016 /* first line */
10251017 if (s->first_slice_line) {
10261018 CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
@@ -1050,7 +1042,6 @@ static int epzs_motion_search4(MpegEncContext * s, · 23 unmodified lines
10501042 *mx_ptr= best[0];
10511043 *my_ptr= best[1];
10521044
1053−// printf("%d %d %d \n", best[0], best[1], dmin);
10541045 return dmin;
10551046 }
10561047
@@ -1080,7 +1071,7 @@ static int epzs_motion_search2(MpegEncContext * s, · 23 unmodified lines
10801071 map_generation= update_map_generation(c);
10811072
10821073 dmin = 1000000;
1083−//printf("%d %d %d %d //",xmin, ymin, xmax, ymax);
1074+
10841075 /* first line */
10851076 if (s->first_slice_line) {
10861077 CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
@@ -1110,6 +1101,5 @@ static int epzs_motion_search2(MpegEncContext * s, · 23 unmodified lines
11101101 *mx_ptr= best[0];
11111102 *my_ptr= best[1];
11121103
1113−// printf("%d %d %d \n", best[0], best[1], dmin);
11141104 return dmin;
11151105 }
libavcodec/mpegvideo_enc.c+0−7
@@ -1397,7 +1397,6 @@ no_output_pic: · 1396 unmodified lines
13971397 ff_copy_picture(&s->current_picture, s->current_picture_ptr);
13981398
13991399 s->picture_number = s->new_picture.f.display_picture_number;
1400− //printf("dpn:%d\n", s->picture_number);
14011400 } else {
14021401 memset(&s->new_picture, 0, sizeof(Picture));
14031402 }
@@ -1444,8 +1443,6 @@ int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt, · 40 unmodified lines
14441443
14451444 s->pict_type = s->new_picture.f.pict_type;
14461445 //emms_c();
1447− //printf("qs:%f %f %d\n", s->new_picture.quality,
1448− // s->current_picture.quality, s->qscale);
14491446 ff_MPV_frame_start(s, avctx);
14501447 vbv_retry:
14511448 if (encode_picture(s, s->picture_number) < 0)
@@ -2396,7 +2393,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 944 unmodified lines
23962393 uint8_t bit_buf2[2][MAX_MB_BYTES];
23972394 uint8_t bit_buf_tex[2][MAX_MB_BYTES];
23982395 PutBitContext pb[2], pb2[2], tex_pb[2];
2399−//printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
24002396
24012397 ff_check_alignment();
24022398
@@ -2446,7 +2442,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 43 unmodified lines
24462442 s->first_slice_line = 1;
24472443 s->ptr_lastgob = s->pb.buf;
24482444 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
2449−// printf("row %d at %X\n", s->mb_y, (int)s);
24502445 s->mb_x=0;
24512446 s->mb_y= mb_y;
24522447
@@ -2918,7 +2913,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 465 unmodified lines
29182913 s->mb_intra= 0;
29192914 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0];
29202915 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1];
2921−// printf(" %d %d ", motion_x, motion_y);
29222916 break;
29232917 case CANDIDATE_MB_TYPE_FORWARD_I:
29242918 s->mv_dir = MV_DIR_FORWARD;
@@ -3088,7 +3082,6 @@ static int estimate_qp(MpegEncContext *s, int dry_run){ · 163 unmodified lines
30883082 //FIXME broken
30893083 }else
30903084 s->lambda = s->current_picture.f.quality;
3091−//printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality);
30923085 update_qscale(s);
30933086 return 0;
30943087 }
libavcodec/msmpeg4.c+1−6
@@ -543,7 +543,6 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 542 unmodified lines
543543
544544 if (!s->mb_intra) {
545545 int mx, my;
546−//printf("P at %d %d\n", s->mb_x, s->mb_y);
547546 if(s->per_mb_rl_table && cbp){
548547 s->rl_table_index = decode012(&s->gb);
549548 s->rl_chroma_table_index = s->rl_table_index;
@@ -858,8 +857,6 @@ int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size) · 308 unmodified lines
858857 s->flipflop_rounding= get_bits1(&s->gb);
859858 else
860859 s->flipflop_rounding= 0;
861−
862−// printf("fps:%2d bps:%2d roundingType:%1d\n", fps, s->bit_rate/1024, s->flipflop_rounding);
863860 }
864861 else if(left<length+8)
865862 {
@@ -1043,7 +1040,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, · 177 unmodified lines
10431040
10441041 s->esc3_level_length= ll;
10451042 s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2);
1046−//printf("level length:%d, run length: %d\n", ll, s->esc3_run_length);
10471043 UPDATE_CACHE(re, &s->gb);
10481044 }
10491045 run= SHOW_UBITS(re, &s->gb, s->esc3_run_length);
@@ -1056,7 +1052,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, · 6 unmodified lines
10561052 SKIP_BITS(re, &s->gb, s->esc3_level_length);
10571053 if(sign) level= -level;
10581054 }
1059−//printf("level: %d, run: %d at %d %d\n", level, run, s->mb_x, s->mb_y);
1055+
10601056 #if 0 // waste of time / this will detect very few errors
10611057 {
10621058 const int abs_level= FFABS(level);
@@ -1182,7 +1178,6 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, · 119 unmodified lines
11821178 return -1;
11831179 }
11841180 if (code == mv->n) {
1185−//printf("MV ESC %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y);
11861181 mx = get_bits(&s->gb, 6);
11871182 my = get_bits(&s->gb, 6);
11881183 } else {
libavcodec/msmpeg4enc.c+0−3
@@ -193,9 +193,6 @@ static void find_best_tables(MpegEncContext * s) · 192 unmodified lines
193193 }
194194 }
195195
196−// printf("type:%d, best:%d, qp:%d, var:%d, mcvar:%d, size:%d //\n",
197−// s->pict_type, best, s->qscale, s->mb_var_sum, s->mc_mb_var_sum, best_size);
198−
199196 if(s->pict_type==AV_PICTURE_TYPE_P) chroma_best= best;
200197
201198 memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2);
libavcodec/put_bits.h+0−3
@@ -130,13 +130,11 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) · 129 unmodified lines
130130 unsigned int bit_buf;
131131 int bit_left;
132132
133− // printf("put_bits=%d %x\n", n, value);
134133 assert(n <= 31 && value < (1U << n));
135134
136135 bit_buf = s->bit_buf;
137136 bit_left = s->bit_left;
138137
139− // printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf);
140138 /* XXX: optimize */
141139 #ifdef BITSTREAM_WRITER_LE
142140 bit_buf |= value << (32 - bit_left);
@@ -155,7 +153,6 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) · 12 unmodified lines
155153 bit_buf<<=bit_left;
156154 bit_buf |= value >> (n - bit_left);
157155 AV_WB32(s->buf_ptr, bit_buf);
158− //printf("bitbuf = %08x\n", bit_buf);
159156 s->buf_ptr+=4;
160157 bit_left+=32 - n;
161158 bit_buf = value;
libavcodec/ratecontrol.c+0−12
@@ -444,7 +444,6 @@ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q, · 443 unmodified lines
444444 if(s->avctx->rc_qmod_freq && frame_num%s->avctx->rc_qmod_freq==0 && pict_type==AV_PICTURE_TYPE_P)
445445 q*= s->avctx->rc_qmod_amp;
446446
447−//printf("q:%f\n", q);
448447 /* buffer overflow/underflow protection */
449448 if(buffer_size){
450449 double expected_size= rcc->buffer_index;
@@ -623,8 +622,6 @@ static void adaptive_quantization(MpegEncContext *s, double q){ · 172 unmodified lines
623622
624623 if (intq > qmax) intq= qmax;
625624 else if(intq < qmin) intq= qmin;
626−//if(i%s->mb_width==0) printf("\n");
627−//printf("%2d%3d ", intq, ff_sqrt(s->mc_mb_var[i]));
628625 s->lambda_table[mb_xy]= intq;
629626 }
630627 }
@@ -669,7 +666,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) · 38 unmodified lines
669666 get_qminmax(&qmin, &qmax, s, pict_type);
670667
671668 fps= 1/av_q2d(s->avctx->time_base);
672−//printf("input_pic_num:%d pic_num:%d frame_rate:%d\n", s->input_picture_number, s->picture_number, s->frame_rate);
673669 /* update predictors */
674670 if(picture_number>2 && !dry_run){
675671 const int last_var= s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum : rcc->last_mc_mb_var_sum;
@@ -692,9 +688,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) · 16 unmodified lines
692688 else
693689 dts_pic= s->last_picture_ptr;
694690
695−//if(dts_pic)
696−// av_log(NULL, AV_LOG_ERROR, "%Ld %Ld %Ld %d\n", s->current_picture_ptr->pts, s->user_specified_pts, dts_pic->pts, picture_number);
697−
698691 if (!dts_pic || dts_pic->f.pts == AV_NOPTS_VALUE)
699692 wanted_bits= (uint64_t)(s->bit_rate*(double)picture_number/fps);
700693 else
@@ -750,9 +743,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) · 49 unmodified lines
750743 return -1;
751744
752745 assert(q>0.0);
753−//printf("%f ", q);
754746 q= get_diff_limited_q(s, rce, q);
755−//printf("%f ", q);
756747 assert(q>0.0);
757748
758749 if(pict_type==AV_PICTURE_TYPE_P || s->intra_only){ //FIXME type dependent blur like in 2-pass
@@ -761,9 +752,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) · 2 unmodified lines
761752
762753 rcc->short_term_qsum+= q;
763754 rcc->short_term_qcount++;
764−//printf("%f ", q);
765755 q= short_term_q= rcc->short_term_qsum/rcc->short_term_qcount;
766−//printf("%f ", q);
767756 }
768757 assert(q>0.0);
769758
@@ -888,7 +877,6 @@ static int init_pass2(MpegEncContext *s) · 118 unmodified lines
888877 double bits;
889878 rce->new_qscale= modify_qscale(s, rce, blurred_qscale[i], i);
890879 bits= qp2bits(rce, rce->new_qscale) + rce->mv_bits + rce->misc_bits;
891−//printf("%d %f\n", rce->new_bits, blurred_qscale[i]);
892880 bits += 8*ff_vbv_update(s, bits);
893881
894882 rce->expected_bits= expected_bits;
libavcodec/utils.c+0−1
@@ -551,7 +551,6 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) · 550 unmodified lines
551551 for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
552552 pic->data[i] = NULL;
553553 // pic->base[i]=NULL;
554− //printf("R%X\n", pic->opaque);
555554
556555 if (s->debug & FF_DEBUG_BUFFERS)
557556 av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d "
libavcodec/wmadec.c+0−1
@@ -851,7 +851,6 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, · 850 unmodified lines
851851 }
852852
853853 if (s->last_superframe_len > 0) {
854− // printf("skip=%d\n", s->last_bitoffset);
855854 /* add bit_offset bits to last frame */
856855 if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) >
857856 MAX_CODED_SUPERFRAME_SIZE)
libavcodec/wmv2dec.c+0−4
@@ -244,8 +244,6 @@ static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){ · 243 unmodified lines
244244 else
245245 w->hshift= 0;
246246
247−//printf("%d %d ", *mx_ptr, *my_ptr);
248−
249247 return 0;
250248 }
251249
@@ -314,7 +312,6 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, · 62 unmodified lines
314312 // const uint8_t *scantable= w->abt_type-1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable;
315313
316314 sub_cbp= sub_cbp_table[ decode012(&s->gb) ];
317−// printf("S%d", sub_cbp);
318315
319316 if(sub_cbp&1){
320317 if (ff_msmpeg4_decode_block(s, block, n, 1, scantable) < 0)
@@ -385,7 +382,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 64 unmodified lines
385382
386383 if (!s->mb_intra) {
387384 int mx, my;
388−//printf("P at %d %d\n", s->mb_x, s->mb_y);
389385 wmv2_pred_motion(w, &mx, &my);
390386
391387 if(cbp){
libavcodec/x86/mpegvideo.c+2−2
@@ -51,7 +51,7 @@ static void dct_unquantize_h263_intra_mmx(MpegEncContext *s, · 50 unmodified lines
5151 nCoeffs=63;
5252 else
5353 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
54−//printf("%d %d ", qmul, qadd);
54+
5555 __asm__ volatile(
5656 "movd %1, %%mm6 \n\t" //qmul
5757 "packssdw %%mm6, %%mm6 \n\t"
@@ -114,7 +114,7 @@ static void dct_unquantize_h263_inter_mmx(MpegEncContext *s, · 56 unmodified lines
114114 assert(s->block_last_index[n]>=0 || s->h263_aic);
115115
116116 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
117−//printf("%d %d ", qmul, qadd);
117+
118118 __asm__ volatile(
119119 "movd %1, %%mm6 \n\t" //qmul
120120 "packssdw %%mm6, %%mm6 \n\t"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t