sigrid/ffmpeg

ffserver.c+0−2

@@ -2689,8 +2689,6 @@ static int http_receive_data(HTTPContext *c) · 2688 unmodified lines
2689	/* a packet has been received : write it in the store, except	2689	/* a packet has been received : write it in the store, except
2690	if header */	2690	if header */
2691	if (c->data_count > FFM_PACKET_SIZE) {	2691	if (c->data_count > FFM_PACKET_SIZE) {
2692
2693	// printf("writing pos=0x%"PRIx64" size=0x%"PRIx64"\n", feed->feed_write_index, feed->feed_size);
2694	/* XXX: use llseek or url_seek */	2692	/* XXX: use llseek or url_seek */
2695	lseek(c->feed_fd, feed->feed_write_index, SEEK_SET);	2693	lseek(c->feed_fd, feed->feed_write_index, SEEK_SET);
2696	if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) {	2694	if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) {

libavcodec/aaccoder.c+0−3

     q0 = coef2minsf(q0f);
     //maximum scalefactor index is when maximum coefficient after quantizing is still not zero
     q1 = coef2maxsf(q1f);
-    //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1);
     if (q1 - q0 > 60) {
         int q0low  = q0;
         int q1high = q1;
         int qnrg = av_clip_uint8(log2f(sqrtf(qnrgf/qcnt))*4 - 31 + SCALE_ONE_POS - SCALE_DIV_512);
         q1 = qnrg + 30;
         q0 = qnrg - 30;
-        //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1);
         if (q0 < q0low) {
             q1 += q0low - q0;
             q0  = q0low;
             q1  = q1high;
         }
     }
-    //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1);
     for (i = 0; i < TRELLIS_STATES; i++) {
         paths[0][i].cost    = 0.0f;

libavcodec/ac3dec.c+1−0

@@ -1377,6 +1377,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, · 1376 unmodified lines
1377	avctx->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE;	1377	avctx->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE;
1378		1378
1379	/* get output buffer */	1379	/* get output buffer */
		1380	avctx->channels = s->out_channels;
1380	s->frame.nb_samples = s->num_blocks * 256;	1381	s->frame.nb_samples = s->num_blocks * 256;
1381	if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {	1382	if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {
1382	av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");	1383	av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");

libavcodec/adpcm.c+0−1

@@ -353,7 +353,6 @@ static void adpcm_swf_decode(AVCodecContext avctx, const uint8_t buf, int buf_ · 352 unmodified lines
353		353
354	//read bits & initial values	354	//read bits & initial values
355	nb_bits = get_bits(&gb, 2)+2;	355	nb_bits = get_bits(&gb, 2)+2;
356	//av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits);
357	table = swf_index_tables[nb_bits-2];	356	table = swf_index_tables[nb_bits-2];
358	k0 = 1 << (nb_bits-2);	357	k0 = 1 << (nb_bits-2);
359	signmask = 1 << (nb_bits-1);	358	signmask = 1 << (nb_bits-1);

libavcodec/cook.c+2−7

@@ -420,11 +420,9 @@ static void categorize(COOKContext q, COOKSubpacket p, const int *quant_index_ · 419 unmodified lines
420		420
421	bits_left = p->bits_per_subpacket - get_bits_count(&q->gb);	421	bits_left = p->bits_per_subpacket - get_bits_count(&q->gb);
422		422
423	if (bits_left > q->samples_per_channel) {	423	if (bits_left > q->samples_per_channel)
424	bits_left = q->samples_per_channel +	424	bits_left = q->samples_per_channel +
425	((bits_left - q->samples_per_channel) * 5) / 8;	425	((bits_left - q->samples_per_channel) * 5) / 8;
426	//av_log(q->avctx, AV_LOG_ERROR, "bits_left = %d\n",bits_left);
427	}
428		426
429	bias = -32;	427	bias = -32;
430		428
@@ -936,10 +934,7 @@ static int decode_subpacket(COOKContext q, COOKSubpacket p, · 505 unmodified lines
936	{	934	{
937	int sub_packet_size = p->size;	935	int sub_packet_size = p->size;
938	int res;	936	int res;
939	/* packet dump */	937
940	// for (i = 0; i < sub_packet_size ; i++)
941	// av_log(q->avctx, AV_LOG_ERROR, "%02x", inbuffer[i]);
942	// av_log(q->avctx, AV_LOG_ERROR, "\n");
943	memset(q->decode_buffer_1, 0, sizeof(q->decode_buffer_1));	938	memset(q->decode_buffer_1, 0, sizeof(q->decode_buffer_1));
944	decode_bytes_and_gain(q, p, inbuffer, &p->gains1);	939	decode_bytes_and_gain(q, p, inbuffer, &p->gains1);
945		940

libavcodec/dcadec.c+2−2

@@ -861,8 +861,8 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) · 860 unmodified lines
861	}	861	}
862		862
863	if (s->bitalloc[j][k] > 26) {	863	if (s->bitalloc[j][k] > 26) {
864	// av_log(s->avctx, AV_LOG_DEBUG, "bitalloc index [%i][%i] too big (%i)\n",	864	av_dlog(s->avctx, "bitalloc index [%i][%i] too big (%i)\n",
865	// j, k, s->bitalloc[j][k]);	865	j, k, s->bitalloc[j][k]);
866	return AVERROR_INVALIDDATA;	866	return AVERROR_INVALIDDATA;
867	}	867	}
868	}	868	}

libavcodec/dnxhddec.c+0−5

         ctx->last_dc[component] += level;
     }
     block[0] = ctx->last_dc[component];
-    //av_log(ctx->avctx, AV_LOG_DEBUG, "dc %d\n", block[0]);
     i = 0;
         }
         j = ctx->scantable.permutated[i];
-        //av_log(ctx->avctx, AV_LOG_DEBUG, "j %d\n", j);
-        //av_log(ctx->avctx, AV_LOG_DEBUG, "level %d, weight %d\n", level, weight_matrix[i]);
         level *= scale[i];
         if (level_bias < 32 || weight_matrix[i] != level_bias)
             level += level_bias;
         level >>= level_shift;
-        //av_log(NULL, AV_LOG_DEBUG, "i %d, j %d, end level %d\n", i, j, level);
         block[j] = (level^sign) - sign;
         UPDATE_CACHE(bs, &ctx->gb);
     qscale = get_bits(&ctx->gb, 11);
     skip_bits1(&ctx->gb);
-    //av_log(ctx->avctx, AV_LOG_DEBUG, "qscale %d\n", qscale);
     if (qscale != ctx->last_qscale) {
         for (i = 0; i < 64; i++) {

libavcodec/error_resilience.c+0−3

                         fixed[mb_xy] = MV_UNCHANGED;
                 }
             }
-            // printf(".%d/%d", changed, score_sum); fflush(stdout);
         }
         if (none_left)
             if (fixed[mb_xy])
                 fixed[mb_xy] = MV_FROZEN;
         }
-        // printf(":"); fflush(stdout);
     }
 }

libavcodec/ffv1.c+12−9

@@ -405,7 +405,6 @@ static inline void update_vlc_state(VlcState * const state, const int v){ · 404 unmodified lines
405		405
406	static inline void put_vlc_symbol(PutBitContext pb, VlcState const state, int v, int bits){	406	static inline void put_vlc_symbol(PutBitContext pb, VlcState const state, int v, int bits){
407	int i, k, code;	407	int i, k, code;
408	//printf("final: %d ", v);
409	v = fold(v - state->bias, bits);	408	v = fold(v - state->bias, bits);
410		409
411	i= state->count;	410	i= state->count;
@@ -424,7 +423,8 @@ static inline void put_vlc_symbol(PutBitContext pb, VlcState const state, int · 12 unmodified lines
424	code= v ^ ((2*state->drift + state->count)>>31);	423	code= v ^ ((2*state->drift + state->count)>>31);
425	#endif	424	#endif
426		425
427	//printf("v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code, state->bias, state->error_sum, state->drift, state->count, k);	426	av_dlog(NULL, "v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code,
		427	state->bias, state->error_sum, state->drift, state->count, k);
428	set_sr_golomb(pb, code, k, 12, bits);	428	set_sr_golomb(pb, code, k, 12, bits);
429		429
430	update_vlc_state(state, v);	430	update_vlc_state(state, v);
@@ -443,7 +443,8 @@ static inline int get_vlc_symbol(GetBitContext gb, VlcState const state, int · 12 unmodified lines
443	assert(k<=8);	443	assert(k<=8);
444		444
445	v= get_sr_golomb(gb, k, 12, bits);	445	v= get_sr_golomb(gb, k, 12, bits);
446	//printf("v:%d bias:%d error:%d drift:%d count:%d k:%d", v, state->bias, state->error_sum, state->drift, state->count, k);	446	av_dlog(NULL, "v:%d bias:%d error:%d drift:%d count:%d k:%d",
		447	v, state->bias, state->error_sum, state->drift, state->count, k);
447		448
448	#if 0 // JPEG LS	449	#if 0 // JPEG LS
449	if(k==0 && 2*state->drift <= - state->count) v ^= (-1);	450	if(k==0 && 2*state->drift <= - state->count) v ^= (-1);
@@ -454,7 +455,7 @@ static inline int get_vlc_symbol(GetBitContext gb, VlcState const state, int · 4 unmodified lines
454	ret= fold(v + state->bias, bits);	455	ret= fold(v + state->bias, bits);
455		456
456	update_vlc_state(state, v);	457	update_vlc_state(state, v);
457	//printf("final: %d\n", ret);	458
458	return ret;	459	return ret;
459	}	460	}
460		461
@@ -523,7 +524,9 @@ static av_always_inline int encode_line(FFV1Context *s, int w, · 62 unmodified lines
523	}	524	}
524	}	525	}
525		526
526	// printf("count:%d index:%d, mode:%d, x:%d y:%d pos:%d\n", run_count, run_index, run_mode, x, y, (int)put_bits_count(&s->pb));	527	av_dlog(s->avctx, "count:%d index:%d, mode:%d, x:%d pos:%d\n",
		528	run_count, run_index, run_mode, x,
		529	(int)put_bits_count(&s->pb));
527		530
528	if(run_mode == 0)	531	if(run_mode == 0)
529	put_vlc_symbol(&s->pb, &p->vlc_state[context], diff, bits);	532	put_vlc_symbol(&s->pb, &p->vlc_state[context], diff, bits);
@@ -1488,7 +1491,8 @@ static av_always_inline void decode_line(FFV1Context *s, int w, · 958 unmodified lines
1488	}else	1491	}else
1489	diff= get_vlc_symbol(&s->gb, &p->vlc_state[context], bits);	1492	diff= get_vlc_symbol(&s->gb, &p->vlc_state[context], bits);
1490		1493
1491	// printf("count:%d index:%d, mode:%d, x:%d y:%d pos:%d\n", run_count, run_index, run_mode, x, y, get_bits_count(&s->gb));	1494	av_dlog(s->avctx, "count:%d index:%d, mode:%d, x:%d pos:%d\n",
		1495	run_count, run_index, run_mode, x, get_bits_count(&s->gb));
1492	}	1496	}
1493		1497
1494	if(sign) diff= -diff;	1498	if(sign) diff= -diff;
@@ -1734,8 +1738,6 @@ static int read_quant_table(RangeCoder c, int16_t quant_table, int scale){ · 239 unmodified lines
1734	while(len--){	1738	while(len--){
1735	quant_table[i] = scale*v;	1739	quant_table[i] = scale*v;
1736	i++;	1740	i++;
1737	//printf("%2d ",v);
1738	//if(i%16==0) printf("\n");
1739	}	1741	}
1740	}	1742	}
1741		1743
@@ -1945,7 +1947,8 @@ static int read_header(FFV1Context *f){ · 203 unmodified lines
1945	return -1;	1947	return -1;
1946	}	1948	}
1947		1949
1948	//printf("%d %d %d\n", f->chroma_h_shift, f->chroma_v_shift,f->avctx->pix_fmt);	1950	av_dlog(f->avctx, "%d %d %d\n",
		1951	f->chroma_h_shift, f->chroma_v_shift, f->avctx->pix_fmt);
1949	if(f->version < 2){	1952	if(f->version < 2){
1950	context_count= read_quant_tables(c, f->quant_table);	1953	context_count= read_quant_tables(c, f->quant_table);
1951	if(context_count < 0){	1954	if(context_count < 0){

libavcodec/flicvideo.c+3−1

             /* For some reason, it seems that non-palettized flics do
              * include one of these chunks in their first frame.
              * Why I do not know, it seems rather extraneous. */
-/*            av_log(avctx, AV_LOG_ERROR, "Unexpected Palette chunk %d in non-paletised FLC\n",chunk_type);*/
+            av_dlog(avctx,
+                    "Unexpected Palette chunk %d in non-palettized FLC\n",
+                    chunk_type);
             bytestream2_skip(&g2, chunk_size - 6);
             break;

libavcodec/golomb.h+0−2

  * write signed exp golomb code. 16 bits at most.
  */
 static inline void set_se_golomb(PutBitContext *pb, int i){
-//    if (i>32767 || i<-32767)
-//        av_log(NULL,AV_LOG_ERROR,"value out of range %d\n", i);
 #if 0
     if(i<=0) i= -2*i;
     else     i=  2*i-1;

libavcodec/h263dec.c+2−3

             s->mv_dir = MV_DIR_FORWARD;
             s->mv_type = MV_TYPE_16X16;
 //            s->mb_skipped = 0;
-//printf("%d %d %06X\n", ret, get_bits_count(&s->gb), show_bits(&s->gb, 24));
+            av_dlog(s, "%d %d %06X\n",
+                    ret, get_bits_count(&s->gb), show_bits(&s->gb, 24));
             ret= s->decode_mb(s, s->block);
             if (s->pict_type!=AV_PICTURE_TYPE_B)
                     if(s->loop_filter)
                         ff_h263_loop_filter(s);
-//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));
                     ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_END&part_mask);
                     s->padding_bug_score--;
         if(s->divx_version>=0)
             s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
-//printf("padding_bug_score: %d\n", s->padding_bug_score);
         if(s->divx_version==501 && s->divx_build==20020416)
             s->padding_bug_score= 256*256*256*64;

libavcodec/h264.c+0−3

         }
     }
-    // printf("decoding esc\n");
     memcpy(dst, src, i);
     si = di = i;
     while (si + 2 < length) {
             h->poc_msb = h->prev_poc_msb - max_poc_lsb;
         else
             h->poc_msb = h->prev_poc_msb;
-        // printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
         field_poc[0] =
         field_poc[1] = h->poc_msb + h->poc_lsb;
         if (s->picture_structure == PICT_FRAME)
     assert(pict->data[0] || !*data_size);
     ff_print_debug_info(s, pict);
-    // printf("out %d\n", (int)pict->data[0]);
     return get_consumed_bytes(s, buf_index, buf_size);
 }

libavcodec/h264_cabac.c+4−12

     MpegEncContext * const s = &h->s;
     int qscale = p == 0 ? s->qscale : h->chroma_qp[p-1];
     if( IS_INTRA16x16( mb_type ) ) {
-        //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" );
         AV_ZERO128(h->mb_luma_dc[p]+0);
         AV_ZERO128(h->mb_luma_dc[p]+8);
         AV_ZERO128(h->mb_luma_dc[p]+16);
             qmul = h->dequant4_coeff[p][qscale];
             for( i4x4 = 0; i4x4 < 16; i4x4++ ) {
                 const int index = 16*p + i4x4;
-                //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", index );
                 decode_cabac_residual_nondc(h, h->mb + (16*index << pixel_shift), ctx_cat[1][p], index, scan + 1, qmul, 15);
             }
         } else {
                     qmul = h->dequant4_coeff[cqm][qscale];
                     for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
                         const int index = 16*p + 4*i8x8 + i4x4;
-                        //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
 //START_TIMER
                         decode_cabac_residual_nondc(h, h->mb + (16*index << pixel_shift), ctx_cat[2][p], index, scan, qmul, 16);
 //STOP_TIMER("decode_residual")
                     int pred = pred_intra_mode( h, i );
                     h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
-                //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] );
+                    av_dlog(s->avctx, "i4x4 pred=%d mode=%d\n", pred,
+                            h->intra4x4_pred_mode_cache[scan8[i]]);
                 }
             }
             write_back_intra_pred_mode(h);
         } else if (CHROMA422) {
             if( cbp&0x30 ){
                 int c;
-                for( c = 0; c < 2; c++ ) {
+                for (c = 0; c < 2; c++)
-                    //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c );
                     decode_cabac_residual_dc_422(h, h->mb + ((256 + 16*16*c) << pixel_shift), 3,
                                                  CHROMA_DC_BLOCK_INDEX + c,
                                                  chroma422_dc_scan, 8);
-                }
             }
             if( cbp&0x20 ) {
                     for (i8x8 = 0; i8x8 < 2; i8x8++) {
                         for (i = 0; i < 4; i++) {
                             const int index = 16 + 16 * c + 8*i8x8 + i;
-                            //av_log(s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16);
                             decode_cabac_residual_nondc(h, mb, 4, index, scan + 1, qmul, 15);
                             mb += 16<<pixel_shift;
                         }
         } else /* yuv420 */ {
             if( cbp&0x30 ){
                 int c;
-                for( c = 0; c < 2; c++ ) {
+                for (c = 0; c < 2; c++)
-                    //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c );
                     decode_cabac_residual_dc(h, h->mb + ((256 + 16*16*c) << pixel_shift), 3, CHROMA_DC_BLOCK_INDEX+c, chroma_dc_scan, 4);
-                }
             }
             if( cbp&0x20 ) {
                     qmul = h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[c]];
                     for( i = 0; i < 4; i++ ) {
                         const int index = 16 + 16 * c + i;
-                        //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
                         decode_cabac_residual_nondc(h, h->mb + (16*index << pixel_shift), 4, index, scan + 1, qmul, 15);
                     }
                 }

libavcodec/h264_parser.c+0−1

@@ -39,7 +39,6 @@ static int ff_h264_find_frame_end(H264Context h, const uint8_t buf, int buf_si · 38 unmodified lines
39	ParseContext *pc = &(h->s.parse_context);	39	ParseContext *pc = &(h->s.parse_context);
40	int next_avc= h->is_avc ? 0 : buf_size;	40	int next_avc= h->is_avc ? 0 : buf_size;
41		41
42	//printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]);
43	// mb_addr= pc->mb_addr - 1;	42	// mb_addr= pc->mb_addr - 1;
44	state= pc->state;	43	state= pc->state;
45	if(state>13)	44	if(state>13)

libavcodec/imc.c+1−3

                 cw = 0;
                 if (get_bits_count(&q->gb) + cw_len > 512) {
-                    // av_log(NULL, 0, "Band %i coeff %i cw_len %i\n", i, j, cw_len);
+                    av_dlog(NULL, "Band %i coeff %i cw_len %i\n", i, j, cw_len);
                     return AVERROR_INVALIDDATA;
                 }
         return AVERROR_PATCHWELCOME;
     }
-//    av_log(avctx, AV_LOG_DEBUG, "stream_format_code = %d\n", stream_format_code);
     if (stream_format_code & 0x04)
         chctx->decoder_reset = 1;

libavcodec/jpegls.c+1−1

@@ -83,5 +83,5 @@ void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all){ · 82 unmodified lines
83	}	83	}
84		84
85	if(s->reset==0 \|\| reset_all) s->reset= 64;	85	if(s->reset==0 \|\| reset_all) s->reset= 64;
86	// av_log(NULL, AV_LOG_DEBUG, "[JPEG-LS RESET] T=%i,%i,%i\n", s->T1, s->T2, s->T3);	86	av_dlog(NULL, "[JPEG-LS RESET] T=%i,%i,%i\n", s->T1, s->T2, s->T3);
87	}	87	}

libavcodec/jpeglsdec.c+7−3

         av_log(s->avctx, AV_LOG_ERROR, "invalid id %d\n", id);
         return -1;
     }
-//    av_log(s->avctx, AV_LOG_DEBUG, "ID=%i, T=%i,%i,%i\n", id, s->t1, s->t2, s->t3);
+    av_dlog(s->avctx, "ID=%i, T=%i,%i,%i\n", id, s->t1, s->t2, s->t3);
     return 0;
 }
     else
         shift = point_transform + (16 - s->bits);
-//    av_log(s->avctx, AV_LOG_DEBUG, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",s->width,s->height,state->near,state->maxval,state->T1,state->T2,state->T3,state->reset,state->limit,state->qbpp, state->range);
+    av_dlog(s->avctx, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
-//    av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n", ilv, point_transform, s->bits, s->cur_scan);
+            s->width, s->height, state->near, state->maxval,
+            state->T1, state->T2, state->T3,
+            state->reset, state->limit, state->qbpp, state->range);
+    av_dlog(s->avctx, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
+            ilv, point_transform, s->bits, s->cur_scan);
     if(ilv == 0) { /* separate planes */
         stride = (s->nb_components > 1) ? 3 : 1;
         off = av_clip(s->cur_scan - 1, 0, stride);

libavcodec/ljpegenc.c+0−1

@@ -180,7 +180,6 @@ static int encode_picture_lossless(AVCodecContext avctx, AVPacket pkt, · 179 unmodified lines
180	int pred;	180	int pred;
181		181
182	ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap	182	ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
183	//printf("%d %d %d %d %8X\n", mb_x, mb_y, x, y, ptr);
184	PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);	183	PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
185		184
186	if(i==0)	185	if(i==0)

libavcodec/mjpegdec.c+7−17

     for (i = 0; i < 3; i++)
         s->linesize[i] = s->picture_ptr->linesize[i] << s->interlaced;
-//    printf("%d %d %d %d %d %d\n",
+    av_dlog(s->avctx, "%d %d %d %d %d %d\n",
-//           s->width, s->height, s->linesize[0], s->linesize[1],
+            s->width, s->height, s->linesize[0], s->linesize[1],
-//           s->interlaced, s->avctx->height);
+            s->interlaced, s->avctx->height);
     if (len != (8 + (3 * nb_components)))
         av_log(s->avctx, AV_LOG_DEBUG, "decode_sof0: error, len(%d) mismatch\n", len);
                             return AVERROR_INVALIDDATA;
                         }
                     }
-                    // av_log(s->avctx, AV_LOG_DEBUG, "mb: %d %d processed\n",
+                    av_dlog(s->avctx, "mb: %d %d processed\n", mb_y, mb_x);
-                    //        mb_y, mb_x);
+                    av_dlog(s->avctx, "%d %d %d %d %d %d %d %d \n",
-                    // av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d %d %d %d %d \n",
+                            mb_x, mb_y, x, y, c, s->bottom_field,
-                    //        mb_x, mb_y, x, y, c, s->bottom_field,
+                            (v * mb_y + y) * 8, (h * mb_x + x) * 8);
-                    //        (v * mb_y + y) * 8, (h * mb_x + x) * 8);
                     if (++x == h) {
                         x = 0;
                         y++;
             4bytes      field_size_less_padding
         */
             s->buggy_avid = 1;
-//        if (s->first_picture)
-//            printf("mjpeg: workarounding buggy AVID\n");
         i = get_bits(&s->gb, 8); len--;
         av_log(s->avctx, AV_LOG_DEBUG, "polarity %d\n", i);
 #if 0
         skip_bits(&s->gb, 32);
         len -= 10;
 #endif
-//        if (s->interlace_polarity)
-//            printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
         goto out;
     }
             /* buggy avid, it puts EOI only at every 10th frame */
             if (!strcmp(cbuf, "AVID")) {
                 s->buggy_avid = 1;
-                // if (s->first_picture)
-                // printf("mjpeg: workarounding buggy AVID\n");
             } else if (!strcmp(cbuf, "CS=ITU601"))
                 s->cs_itu601 = 1;
             else if ((len > 31 && !strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) ||
                 av_log(avctx, AV_LOG_ERROR,
                        "mjpeg: unsupported coding type (%x)\n", start_code);
                 break;
-//              default:
-//              printf("mjpeg: unsupported marker (%x)\n", start_code);
-//              break;
             }
             /* eof process start code */

libavcodec/mjpegenc.c+0−1

@@ -339,7 +339,6 @@ static void escape_FF(MpegEncContext *s, int start) · 338 unmodified lines
339	int v= buf[i];	339	int v= buf[i];
340		340
341	if(v==0xFF){	341	if(v==0xFF){
342	//printf("%d %d\n", i, ff_count);
343	buf[i+ff_count]= 0;	342	buf[i+ff_count]= 0;
344	ff_count--;	343	ff_count--;
345	}	344	}

libavcodec/motion_est.c+2−12

     assert(flags == 0);
     if(c->skip){
-//    printf("S");
         *mx_ptr = 0;
         *my_ptr = 0;
         return dmin;
     }
-//    printf("N");
     pix = c->src[src_index][0];
     if(c->avctx->me_sub_cmp != c->avctx->mb_cmp && !c->skip)
         dmin= get_mb_score(s, mx, my, 0, ref_index, 0, 16, 1);
-//printf("%d %d %d %d//", s->mb_x, s->mb_y, mx, my);
 //    s->mb_type[mb_y*s->mb_width + mb_x]= mb_type;
     mv_table[mot_xy][0]= mx;
     mv_table[mot_xy][1]= my;
     c->skip=0;
     bmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) + 2*penalty_factor;
-//printf(" %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]);
+    av_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]);
     c->skip=0;
     fbmin= bidir_refine(s, mb_x, mb_y) + penalty_factor;
-//printf("%d %d %d %d\n", dmin, fmin, bmin, fbmin);
+    av_dlog(s, "%d %d %d %d\n", dmin, fmin, bmin, fbmin);
     if(s->flags & CODEC_FLAG_INTERLACED_ME){
 //FIXME mb type penalty
                 best_score= score[i];
                 best_fcode= i;
             }
-//            printf("%d %d\n", i, score[i]);
         }
-//    printf("fcode: %d type: %d\n", i, s->pict_type);
         return best_fcode;
-/*        for(i=0; i<=MAX_FCODE; i++){
-            printf("%d ", mv_num[i]);
-        }
-        printf("\n");*/
     }else{
         return 1;
     }
     if(c->avctx->me_range && range > c->avctx->me_range) range= c->avctx->me_range;
-//printf("%d no:%d %d//\n", clip, noclip, f_code);
     if(s->flags&CODEC_FLAG_4MV){
         const int wrap= s->b8_stride;

libavcodec/motion_est_template.c+2−12

@@ -363,13 +363,11 @@ static int qpel_motion_search(MpegEncContext * s, · 362 unmodified lines
363	av_assert2((x) <= xmax);\	363	av_assert2((x) <= xmax);\
364	av_assert2((y) >= ymin);\	364	av_assert2((y) >= ymin);\
365	av_assert2((y) <= ymax);\	365	av_assert2((y) <= ymax);\
366	/printf("check_mv %d %d\n", x, y);/\
367	if(map[index]!=key){\	366	if(map[index]!=key){\
368	d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\	367	d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\
369	map[index]= key;\	368	map[index]= key;\
370	score_map[index]= d;\	369	score_map[index]= d;\
371	d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\	370	d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\
372	/printf("score:%d\n", d);/\
373	COPY3_IF_LT(dmin, d, best[0], x, best[1], y)\	371	COPY3_IF_LT(dmin, d, best[0], x, best[1], y)\
374	}\	372	}\
375	}	373	}
@@ -387,13 +385,11 @@ static int qpel_motion_search(MpegEncContext * s, · 11 unmodified lines
387	{\	385	{\
388	const unsigned key = ((y)<<ME_MAP_MV_BITS) + (x) + map_generation;\	386	const unsigned key = ((y)<<ME_MAP_MV_BITS) + (x) + map_generation;\
389	const int index= (((y)<<ME_MAP_SHIFT) + (x))&(ME_MAP_SIZE-1);\	387	const int index= (((y)<<ME_MAP_SHIFT) + (x))&(ME_MAP_SIZE-1);\
390	/printf("check_mv_dir %d %d %d\n", x, y, new_dir);/\
391	if(map[index]!=key){\	388	if(map[index]!=key){\
392	d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\	389	d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\
393	map[index]= key;\	390	map[index]= key;\
394	score_map[index]= d;\	391	score_map[index]= d;\
395	d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\	392	d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\
396	/printf("score:%d\n", d);/\
397	if(d<dmin){\	393	if(d<dmin){\
398	best[0]=x;\	394	best[0]=x;\
399	best[1]=y;\	395	best[1]=y;\
@@ -444,7 +440,6 @@ static av_always_inline int small_diamond_search(MpegEncContext * s, int *best, · 44 unmodified lines
444	const int y= best[1];	440	const int y= best[1];
445	next_dir=-1;	441	next_dir=-1;
446		442
447	//printf("%d", dir);
448	if(dir!=2 && x>xmin) CHECK_MV_DIR(x-1, y , 0)	443	if(dir!=2 && x>xmin) CHECK_MV_DIR(x-1, y , 0)
449	if(dir!=3 && y>ymin) CHECK_MV_DIR(x , y-1, 1)	444	if(dir!=3 && y>ymin) CHECK_MV_DIR(x , y-1, 1)
450	if(dir!=0 && x<xmax) CHECK_MV_DIR(x+1, y , 2)	445	if(dir!=0 && x<xmax) CHECK_MV_DIR(x+1, y , 2)
@@ -656,13 +651,11 @@ static int full_search(MpegEncContext * s, int *best, int dmin, · 205 unmodified lines
656	{\	651	{\
657	const unsigned key = ((ay)<<ME_MAP_MV_BITS) + (ax) + map_generation;\	652	const unsigned key = ((ay)<<ME_MAP_MV_BITS) + (ax) + map_generation;\
658	const int index= (((ay)<<ME_MAP_SHIFT) + (ax))&(ME_MAP_SIZE-1);\	653	const int index= (((ay)<<ME_MAP_SHIFT) + (ax))&(ME_MAP_SIZE-1);\
659	/printf("sab check %d %d\n", ax, ay);/\
660	if(map[index]!=key){\	654	if(map[index]!=key){\
661	d= cmp(s, ax, ay, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\	655	d= cmp(s, ax, ay, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\
662	map[index]= key;\	656	map[index]= key;\
663	score_map[index]= d;\	657	score_map[index]= d;\
664	d += (mv_penalty[((ax)<<shift)-pred_x] + mv_penalty[((ay)<<shift)-pred_y])*penalty_factor;\	658	d += (mv_penalty[((ax)<<shift)-pred_x] + mv_penalty[((ay)<<shift)-pred_y])*penalty_factor;\
665	/printf("score: %d\n", d);/\
666	if(d < minima[minima_count-1].height){\	659	if(d < minima[minima_count-1].height){\
667	int j=0;\	660	int j=0;\
668	\	661	\
@@ -970,7 +963,6 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int · 301 unmodified lines
970	*mx_ptr= best[0];	963	*mx_ptr= best[0];
971	*my_ptr= best[1];	964	*my_ptr= best[1];
972		965
973	// printf("%d %d %d \n", best[0], best[1], dmin);
974	return dmin;	966	return dmin;
975	}	967	}
976		968
@@ -1016,7 +1008,7 @@ static int epzs_motion_search4(MpegEncContext * s, · 39 unmodified lines
1016	map_generation= update_map_generation(c);	1008	map_generation= update_map_generation(c);
1017		1009
1018	dmin = 1000000;	1010	dmin = 1000000;
1019	//printf("%d %d %d %d //",xmin, ymin, xmax, ymax);	1011
1020	/* first line */	1012	/* first line */
1021	if (s->first_slice_line) {	1013	if (s->first_slice_line) {
1022	CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)	1014	CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
@@ -1046,7 +1038,6 @@ static int epzs_motion_search4(MpegEncContext * s, · 23 unmodified lines
1046	*mx_ptr= best[0];	1038	*mx_ptr= best[0];
1047	*my_ptr= best[1];	1039	*my_ptr= best[1];
1048		1040
1049	// printf("%d %d %d \n", best[0], best[1], dmin);
1050	return dmin;	1041	return dmin;
1051	}	1042	}
1052		1043
@@ -1076,7 +1067,7 @@ static int epzs_motion_search2(MpegEncContext * s, · 23 unmodified lines
1076	map_generation= update_map_generation(c);	1067	map_generation= update_map_generation(c);
1077		1068
1078	dmin = 1000000;	1069	dmin = 1000000;
1079	//printf("%d %d %d %d //",xmin, ymin, xmax, ymax);	1070
1080	/* first line */	1071	/* first line */
1081	if (s->first_slice_line) {	1072	if (s->first_slice_line) {
1082	CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)	1073	CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
@@ -1106,6 +1097,5 @@ static int epzs_motion_search2(MpegEncContext * s, · 23 unmodified lines
1106	*mx_ptr= best[0];	1097	*mx_ptr= best[0];
1107	*my_ptr= best[1];	1098	*my_ptr= best[1];
1108		1099
1109	// printf("%d %d %d \n", best[0], best[1], dmin);
1110	return dmin;	1100	return dmin;
1111	}	1101	}

libavcodec/mpeg12.c+8−5

 //res_change_ffmpeg_aspect.ts 4/3 225/44 ->4/3
 //widescreen-issue562.mpg 4/3 16/9 -> 16/9
 //                    s->avctx->sample_aspect_ratio = av_mul_q(s->avctx->sample_aspect_ratio, (AVRational) {s->width, s->height});
-//av_log(NULL, AV_LOG_ERROR, "A %d/%d\n", ff_mpeg2_aspect[s->aspect_ratio_info].num, ff_mpeg2_aspect[s->aspect_ratio_info].den);
+                    av_dlog(avctx, "A %d/%d\n",
-//av_log(NULL, AV_LOG_ERROR, "B %d/%d\n", s->avctx->sample_aspect_ratio.num, s->avctx->sample_aspect_ratio.den);
+                            ff_mpeg2_aspect[s->aspect_ratio_info].num, ff_mpeg2_aspect[s->aspect_ratio_info].den);
+                    av_dlog(avctx, "B %d/%d\n", s->avctx->sample_aspect_ratio.num,
+                            s->avctx->sample_aspect_ratio.den);
                 }
             } else {
                 s->avctx->sample_aspect_ratio =
     }
 eos: // end of slice
     *buf += (get_bits_count(&s->gb)-1)/8;
-//printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
+    av_dlog(s, "y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
     return 0;
 }
         ret = mpeg_decode_slice(s, mb_y, &buf, s->gb.buffer_end - buf);
         emms_c();
-//av_log(c, AV_LOG_DEBUG, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n",
+        av_dlog(c, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n",
-//ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, s->start_mb_y, s->end_mb_y, s->error_count);
+                ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y,
+                s->start_mb_y, s->end_mb_y, s->error_count);
         if (ret < 0) {
             if (c->err_recognition & AV_EF_EXPLODE)
                 return ret;

libavcodec/mpegaudiodec.c+2−7

             int pos = get_bits_count(&s->gb);
             if (pos >= end_pos){
-//                av_log(NULL, AV_LOG_ERROR, "pos: %d %d %d %d\n", pos, end_pos, end_pos2, s_index);
                 switch_buffer(s, &pos, &end_pos, &end_pos2);
-//                av_log(NULL, AV_LOG_ERROR, "new pos: %d %d\n", pos, end_pos);
                 if (pos >= end_pos)
                     break;
             }
                     s_index=0;
                 break;
             }
-//                av_log(NULL, AV_LOG_ERROR, "pos2: %d %d %d %d\n", pos, end_pos, end_pos2, s_index);
             switch_buffer(s, &pos, &end_pos, &end_pos2);
-//                av_log(NULL, AV_LOG_ERROR, "new pos2: %d %d %d\n", pos, end_pos, s_index);
             if (pos >= end_pos)
                 break;
         }
     }
     /* skip extension bits */
     bits_left = end_pos2 - get_bits_count(&s->gb);
-//av_log(NULL, AV_LOG_ERROR, "left:%d buf:%p\n", bits_left, s->in_gb.buffer);
     if (bits_left < 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_COMPLIANT))) {
         av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
         s_index=0;
         int extrasize = av_clip(get_bits_left(&s->gb) >> 3, 0, EXTRABYTES);
         av_assert1((get_bits_count(&s->gb) & 7) == 0);
         /* now we get bits from the main_data_begin offset */
-        av_dlog(s->avctx, "seekback: %d\n", main_data_begin);
+        av_dlog(s->avctx, "seekback:%d, lastbuf:%d\n",
-    //av_log(NULL, AV_LOG_ERROR, "backstep:%d, lastbuf:%d\n", main_data_begin, s->last_buf_size);
+                main_data_begin, s->last_buf_size);
         memcpy(s->last_buf + s->last_buf_size, ptr, extrasize);
         s->in_gb = s->gb;

libavcodec/mpegvideo.c+6−7

         if (!s->dropable)
             s->next_picture_ptr = s->current_picture_ptr;
     }
-    /* av_log(s->avctx, AV_LOG_DEBUG, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n",
+    av_dlog(s->avctx, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n",
-           s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr,
+            s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr,
-           s->last_picture_ptr    ? s->last_picture_ptr->f.data[0]    : NULL,
+            s->last_picture_ptr    ? s->last_picture_ptr->f.data[0]    : NULL,
-           s->next_picture_ptr    ? s->next_picture_ptr->f.data[0]    : NULL,
+            s->next_picture_ptr    ? s->next_picture_ptr->f.data[0]    : NULL,
-           s->current_picture_ptr ? s->current_picture_ptr->f.data[0] : NULL,
+            s->current_picture_ptr ? s->current_picture_ptr->f.data[0] : NULL,
-           s->pict_type, s->dropable); */
+            s->pict_type, s->dropable);
     if (s->codec_id != AV_CODEC_ID_H264) {
         if ((s->last_picture_ptr == NULL ||
                     else
                         av_log(s->avctx, AV_LOG_DEBUG, " ");
                 }
-                // av_log(s->avctx, AV_LOG_DEBUG, " ");
             }
             av_log(s->avctx, AV_LOG_DEBUG, "\n");
         }

libavcodec/mpegvideo_enc.c+8−20

     if (pic_arg->linesize[2] != s->uvlinesize)
         direct = 0;
-    //av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0],
+    av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0],
-    //       pic_arg->linesize[1], s->linesize, s->uvlinesize);
+            pic_arg->linesize[1], s->linesize, s->uvlinesize);
     if (direct) {
         i = ff_find_unused_picture(s, 1);
                 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;
             }
             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;
         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));
     }
         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)
                     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);
     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();
     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;
                     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;
                 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));
         }
     }
         //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;
 }
         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)
-        if(s->msmpeg4_version >= 3) s->no_rounding=1;
+            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){

libavcodec/msmpeg4.c+11−11

@@ -380,7 +380,7 @@ static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) · 379 unmodified lines
380	int code, val, sign, shift;	380	int code, val, sign, shift;
381		381
382	code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2);	382	code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2);
383	// printf("MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred);	383	av_dlog(s, "MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred);
384	if (code < 0)	384	if (code < 0)
385	return 0xffff;	385	return 0xffff;
386		386
@@ -547,7 +547,6 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 160 unmodified lines
547		547
548	if (!s->mb_intra) {	548	if (!s->mb_intra) {
549	int mx, my;	549	int mx, my;
550	//printf("P at %d %d\n", s->mb_x, s->mb_y);
551	if(s->per_mb_rl_table && cbp){	550	if(s->per_mb_rl_table && cbp){
552	s->rl_table_index = decode012(&s->gb);	551	s->rl_table_index = decode012(&s->gb);
553	s->rl_chroma_table_index = s->rl_table_index;	552	s->rl_chroma_table_index = s->rl_table_index;
@@ -561,12 +560,15 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 7 unmodified lines
561	s->mv[0][0][1] = my;	560	s->mv[0][0][1] = my;
562	*mb_type_ptr = MB_TYPE_L0 \| MB_TYPE_16x16;	561	*mb_type_ptr = MB_TYPE_L0 \| MB_TYPE_16x16;
563	} else {	562	} else {
564	//printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24));	563	av_dlog(s, "I at %d %d %d %06X\n", s->mb_x, s->mb_y,
		564	((cbp & 3) ? 1 : 0) +((cbp & 0x3C)? 2 : 0),
		565	show_bits(&s->gb, 24));
565	s->ac_pred = get_bits1(&s->gb);	566	s->ac_pred = get_bits1(&s->gb);
566	*mb_type_ptr = MB_TYPE_INTRA;	567	*mb_type_ptr = MB_TYPE_INTRA;
567	if(s->inter_intra_pred){	568	if(s->inter_intra_pred){
568	s->h263_aic_dir= get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);	569	s->h263_aic_dir= get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
569	// printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);	570	av_dlog(s, "%d%d %d %d/",
		571	s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
570	}	572	}
571	if(s->per_mb_rl_table && cbp){	573	if(s->per_mb_rl_table && cbp){
572	s->rl_table_index = decode012(&s->gb);	574	s->rl_table_index = decode012(&s->gb);
@@ -841,7 +843,8 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s) · 268 unmodified lines
841	s->no_rounding = 0;	843	s->no_rounding = 0;
842	}	844	}
843	}	845	}
844	//printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height);	846	av_dlog(s->avctx, "%d %d %d %d %d\n", s->pict_type, s->bit_rate,
		847	s->inter_intra_pred, s->width, s->height);
845		848
846	s->esc3_level_length= 0;	849	s->esc3_level_length= 0;
847	s->esc3_run_length= 0;	850	s->esc3_run_length= 0;
@@ -862,8 +865,6 @@ int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size) · 14 unmodified lines
862	s->flipflop_rounding= get_bits1(&s->gb);	865	s->flipflop_rounding= get_bits1(&s->gb);
863	else	866	else
864	s->flipflop_rounding= 0;	867	s->flipflop_rounding= 0;
865
866	// printf("fps:%2d bps:%2d roundingType:%1d\n", fps, s->bit_rate/1024, s->flipflop_rounding);
867	}	868	}
868	else if(left<length+8)	869	else if(left<length+8)
869	{	870	{
@@ -1030,7 +1031,8 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, · 160 unmodified lines
1030	last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);	1031	last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
1031	if(!s->esc3_level_length){	1032	if(!s->esc3_level_length){
1032	int ll;	1033	int ll;
1033	//printf("ESC-3 %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y);	1034	av_dlog(s->avctx, "ESC-3 %X at %d %d\n",
		1035	show_bits(&s->gb, 24), s->mb_x, s->mb_y);
1034	if(s->qscale<8){	1036	if(s->qscale<8){
1035	ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3);	1037	ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3);
1036	if(ll==0){	1038	if(ll==0){
@@ -1047,7 +1049,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, · 10 unmodified lines
1047		1049
1048	s->esc3_level_length= ll;	1050	s->esc3_level_length= ll;
1049	s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2);	1051	s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2);
1050	//printf("level length:%d, run length: %d\n", ll, s->esc3_run_length);
1051	UPDATE_CACHE(re, &s->gb);	1052	UPDATE_CACHE(re, &s->gb);
1052	}	1053	}
1053	run= SHOW_UBITS(re, &s->gb, s->esc3_run_length);	1054	run= SHOW_UBITS(re, &s->gb, s->esc3_run_length);
@@ -1060,7 +1061,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, · 6 unmodified lines
1060	SKIP_BITS(re, &s->gb, s->esc3_level_length);	1061	SKIP_BITS(re, &s->gb, s->esc3_level_length);
1061	if(sign) level= -level;	1062	if(sign) level= -level;
1062	}	1063	}
1063	//printf("level: %d, run: %d at %d %d\n", level, run, s->mb_x, s->mb_y);	1064
1064	#if 0 // waste of time / this will detect very few errors	1065	#if 0 // waste of time / this will detect very few errors
1065	{	1066	{
1066	const int abs_level= FFABS(level);	1067	const int abs_level= FFABS(level);
@@ -1186,7 +1187,6 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, · 119 unmodified lines
1186	return -1;	1187	return -1;
1187	}	1188	}
1188	if (code == mv->n) {	1189	if (code == mv->n) {
1189	//printf("MV ESC %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y);
1190	mx = get_bits(&s->gb, 6);	1190	mx = get_bits(&s->gb, 6);
1191	my = get_bits(&s->gb, 6);	1191	my = get_bits(&s->gb, 6);
1192	} else {	1192	} else {

libavcodec/msmpeg4enc.c+2−4

         }
     }
-//    printf("type:%d, best:%d, qp:%d, var:%d, mcvar:%d, size:%d //\n",
-//           s->pict_type, best, s->qscale, s->mb_var_sum, s->mc_mb_var_sum, best_size);
     if(s->pict_type==AV_PICTURE_TYPE_P) chroma_best= best;
     memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2);
     s->per_mb_rl_table = 0;
     if(s->msmpeg4_version==4)
         s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==AV_PICTURE_TYPE_P);
-//printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height);
+    av_dlog(s, "%d %d %d %d %d\n", s->pict_type, s->bit_rate,
+            s->inter_intra_pred, s->width, s->height);
     if (s->pict_type == AV_PICTURE_TYPE_I) {
         s->slice_height= s->mb_height/1;

libavcodec/parser.c+0−1

@@ -150,7 +150,6 @@ int av_parser_parse2(AVCodecParserContext *s, · 149 unmodified lines
150		150
151	/* WARNING: the returned index can be negative */	151	/* WARNING: the returned index can be negative */
152	index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);	152	index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);
153	//av_log(NULL, AV_LOG_DEBUG, "parser: in:%"PRId64", %"PRId64", out:%"PRId64", %"PRId64", in:%d out:%d id:%d\n", pts, dts, s->last_pts, s->last_dts, buf_size, *poutbuf_size, avctx->codec_id);
154	/* update the file pointer */	153	/* update the file pointer */
155	if (*poutbuf_size) {	154	if (*poutbuf_size) {
156	/* fill the data for the current frame */	155	/* fill the data for the current frame */

libavcodec/put_bits.h+0−3

     unsigned int bit_buf;
     int bit_left;
-    //    printf("put_bits=%d %x\n", n, value);
     av_assert2(n <= 31 && value < (1U << n));
     bit_buf = s->bit_buf;
     bit_left = s->bit_left;
-    //    printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf);
     /* XXX: optimize */
 #ifdef BITSTREAM_WRITER_LE
     bit_buf |= value << (32 - bit_left);
         bit_buf |= value >> (n - bit_left);
         av_assert2(s->buf_ptr+3<s->buf_end);
         AV_WB32(s->buf_ptr, bit_buf);
-        //printf("bitbuf = %08x\n", bit_buf);
         s->buf_ptr+=4;
         bit_left+=32 - n;
         bit_buf = value;

libavcodec/ratecontrol.c+14−22

     const double min_rate= s->avctx->rc_min_rate/fps;
     const double max_rate= s->avctx->rc_max_rate/fps;
-//av_log(0,0, "%d %f %d %f %f\n", buffer_size, rcc->buffer_index, frame_size, min_rate, max_rate);
+    av_dlog(s, "%d %f %d %f %f\n",
+            buffer_size, rcc->buffer_index, frame_size, min_rate, max_rate);
     if(buffer_size){
         int left;
     if(s->avctx->rc_qmod_freq && frame_num%s->avctx->rc_qmod_freq==0 && pict_type==AV_PICTURE_TYPE_P)
         q*= s->avctx->rc_qmod_amp;
-//printf("q:%f\n", q);
     /* buffer overflow/underflow protection */
     if(buffer_size){
         double expected_size= rcc->buffer_index;
             }
         }
     }
-//printf("q:%f max:%f min:%f size:%f index:%d bits:%f agr:%f\n", q,max_rate, min_rate, buffer_size, rcc->buffer_index, bits, s->avctx->rc_buffer_aggressivity);
+    av_dlog(s, "q:%f max:%f min:%f size:%f index:%f agr:%f\n",
+            q, max_rate, min_rate, buffer_size, rcc->buffer_index,
+            s->avctx->rc_buffer_aggressivity);
     if(s->avctx->rc_qsquish==0.0 || qmin==qmax){
         if     (q<qmin) q=qmin;
         else if(q>qmax) q=qmax;
         if     (intq > qmax) intq= qmax;
         else if(intq < qmin) intq= qmin;
-//if(i%s->mb_width==0) printf("\n");
-//printf("%2d%3d ", intq, ff_sqrt(s->mc_mb_var[i]));
         s->lambda_table[mb_xy]= intq;
     }
 }
     get_qminmax(&qmin, &qmax, s, pict_type);
     fps= get_fps(s->avctx);
-//printf("input_pic_num:%d pic_num:%d frame_rate:%d\n", s->input_picture_number, s->picture_number, s->frame_rate);
         /* update predictors */
     if(picture_number>2 && !dry_run){
         const int last_var= s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum : rcc->last_mc_mb_var_sum;
         else
             dts_pic= s->last_picture_ptr;
-//if(dts_pic)
-//            av_log(NULL, AV_LOG_ERROR, "%"PRId64" %"PRId64" %"PRId64" %d\n", s->current_picture_ptr->pts, s->user_specified_pts, dts_pic->pts, picture_number);
         if (!dts_pic || dts_pic->f.pts == AV_NOPTS_VALUE)
             wanted_bits= (uint64_t)(s->bit_rate*(double)picture_number/fps);
         else
             assert(pict_type == rce->new_pict_type);
         q= rce->new_qscale / br_compensation;
-//printf("%f %f %f last:%d var:%d type:%d//\n", q, rce->new_qscale, br_compensation, s->frame_bits, var, pict_type);
+        av_dlog(s, "%f %f %f last:%d var:%d type:%d//\n", q, rce->new_qscale,
+                br_compensation, s->frame_bits, var, pict_type);
     }else{
         rce->pict_type=
         rce->new_pict_type= pict_type;
             return -1;
         assert(q>0.0);
-//printf("%f ", q);
         q= get_diff_limited_q(s, rce, q);
-//printf("%f ", q);
         assert(q>0.0);
         if(pict_type==AV_PICTURE_TYPE_P || s->intra_only){ //FIXME type dependent blur like in 2-pass
             rcc->short_term_qsum+= q;
             rcc->short_term_qcount++;
-//printf("%f ", q);
             q= short_term_q= rcc->short_term_qsum/rcc->short_term_qcount;
-//printf("%f ", q);
         }
         assert(q>0.0);
             double bits;
             rce->new_qscale= modify_qscale(s, rce, blurred_qscale[i], i);
             bits= qp2bits(rce, rce->new_qscale) + rce->mv_bits + rce->misc_bits;
-//printf("%d %f\n", rce->new_bits, blurred_qscale[i]);
             bits += 8*ff_vbv_update(s, bits);
             rce->expected_bits= expected_bits;
             expected_bits += bits;
         }
-        /*
+        av_dlog(s->avctx,
-        av_log(s->avctx, AV_LOG_INFO,
+                "expected_bits: %f all_available_bits: %d rate_factor: %f\n",
-            "expected_bits: %f all_available_bits: %d rate_factor: %f\n",
+                expected_bits, (int)all_available_bits, rate_factor);
-            expected_bits, (int)all_available_bits, rate_factor);
-        */
         if(expected_bits > all_available_bits) {
             rate_factor-= step;
             ++toobig;
     /* check bitrate calculations and print info */
     qscale_sum = 0.0;
     for(i=0; i<rcc->num_entries; i++){
-        /* av_log(s->avctx, AV_LOG_DEBUG, "[lavc rc] entry[%d].new_qscale = %.3f  qp = %.3f\n",
+        av_dlog(s, "[lavc rc] entry[%d].new_qscale = %.3f  qp = %.3f\n",
-            i, rcc->entry[i].new_qscale, rcc->entry[i].new_qscale / FF_QP2LAMBDA); */
+                i,
+                rcc->entry[i].new_qscale,
+                rcc->entry[i].new_qscale / FF_QP2LAMBDA);
         qscale_sum += av_clip(rcc->entry[i].new_qscale / FF_QP2LAMBDA, s->avctx->qmin, s->avctx->qmax);
     }
     assert(toobig <= 40);

libavcodec/rv10.c+1−6

@@ -399,7 +399,6 @@ static int rv20_decode_picture_header(RVDecContext *rv) · 398 unmodified lines
399		399
400	mb_pos = ff_h263_decode_mba(s);	400	mb_pos = ff_h263_decode_mba(s);
401		401
402	//av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq);
403	seq \|= s->time &~0x7FFF;	402	seq \|= s->time &~0x7FFF;
404	if(seq - s->time > 0x4000) seq -= 0x8000;	403	if(seq - s->time > 0x4000) seq -= 0x8000;
405	if(seq - s->time < -0x4000) seq += 0x8000;	404	if(seq - s->time < -0x4000) seq += 0x8000;
@@ -418,11 +417,7 @@ static int rv20_decode_picture_header(RVDecContext *rv) · 12 unmodified lines
418	ff_mpeg4_init_direct_mv(s);	417	ff_mpeg4_init_direct_mv(s);
419	}	418	}
420	}	419	}
421	// printf("%d %d %d %d %d\n", seq, (int)s->time, (int)s->last_non_b_time, s->pp_time, s->pb_time);	420
422	/*for(i=0; i<32; i++){
423	av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb));
424	}
425	av_log(s->avctx, AV_LOG_DEBUG, "\n");*/
426	s->no_rounding= get_bits1(&s->gb);	421	s->no_rounding= get_bits1(&s->gb);
427		422
428	if(RV_GET_MINOR_VER(rv->sub_id) <= 1 && s->pict_type == AV_PICTURE_TYPE_B)	423	if(RV_GET_MINOR_VER(rv->sub_id) <= 1 && s->pict_type == AV_PICTURE_TYPE_B)

libavcodec/svq1dec.c+2−2

@@ -521,8 +521,8 @@ static int svq1_decode_frame_header (GetBitContext bitbuf,MpegEncContext s) { · 520 unmodified lines
521		521
522	csum = ff_svq1_packet_checksum (bitbuf->buffer, bitbuf->size_in_bits>>3, csum);	522	csum = ff_svq1_packet_checksum (bitbuf->buffer, bitbuf->size_in_bits>>3, csum);
523		523
524	// av_log(s->avctx, AV_LOG_INFO, "%s checksum (%02x) for packet data\n",	524	av_dlog(s->avctx, "%s checksum (%02x) for packet data\n",
525	// (csum == 0) ? "correct" : "incorrect", csum);	525	(csum == 0) ? "correct" : "incorrect", csum);
526	}	526	}
527		527
528	if ((s->f_code ^ 0x10) >= 0x50) {	528	if ((s->f_code ^ 0x10) >= 0x50) {

libavcodec/utils.c+0−1

@@ -610,7 +610,6 @@ void avcodec_default_release_buffer(AVCodecContext s, AVFrame pic) · 609 unmodified lines
610	for (i = 0; i < AV_NUM_DATA_POINTERS; i++)	610	for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
611	pic->data[i] = NULL;	611	pic->data[i] = NULL;
612	// pic->base[i]=NULL;	612	// pic->base[i]=NULL;
613	//printf("R%X\n", pic->opaque);
614		613
615	if (s->debug & FF_DEBUG_BUFFERS)	614	if (s->debug & FF_DEBUG_BUFFERS)
616	av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d "	615	av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d "

libavcodec/vc1.c+3−4

         v->res_rtm_flag = get_bits1(gb); //reserved
     }
     if (!v->res_rtm_flag) {
-//            av_log(avctx, AV_LOG_ERROR,
-//                   "0 for reserved RES_RTM_FLAG is forbidden\n");
         av_log(avctx, AV_LOG_ERROR,
                "Old WMV3 version detected, some frames may be decoded incorrectly\n");
         //return -1;
         v->x8_type = get_bits1(gb);
     } else
         v->x8_type = 0;
-//av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n",
+    av_dlog(v->s.avctx, "%c Frame: QP=[%i]%i (+%i/2) %i\n",
-//        (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm);
+            (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'),
+            pqindex, v->pq, v->halfpq, v->rangeredfrm);
     if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P)
         v->use_ic = 0;

libavcodec/vc1dec.c+2−1

             s->linesize                      >>= 1;
             s->uvlinesize                    >>= 1;
         }
-//av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), s->gb.size_in_bits);
+        av_dlog(s->avctx, "Consumed %i/%i bits\n",
+                get_bits_count(&s->gb), s->gb.size_in_bits);
 //  if (get_bits_count(&s->gb) > buf_size * 8)
 //      return -1;
         if(s->error_occurred && s->pict_type == AV_PICTURE_TYPE_B)

libavcodec/vorbis.c+1−3

     for (p = 0; (bits[p] == 0) && (p < num); ++p)
         ;
-    if (p == num) {
+    if (p == num)
-//        av_log(vc->avccontext, AV_LOG_INFO, "An empty codebook. Heh?! \n");
         return 0;
-    }
     codes[p] = 0;
     if (bits[p] > 32)

libavcodec/vp3.c+2−1

             return -1;
         }
         token = get_bits(gb, 5);
-        //av_log(avctx, AV_LOG_DEBUG, "hti %d hbits %x token %d entry : %d size %d\n", s->hti, s->hbits, token, s->entries, s->huff_code_size);
+        av_dlog(avctx, "hti %d hbits %x token %d entry : %d size %d\n",
+                s->hti, s->hbits, token, s->entries, s->huff_code_size);
         s->huffman_table[s->hti][token][0] = s->hbits;
         s->huffman_table[s->hti][token][1] = s->huff_code_size;
         s->entries++;

libavcodec/wmadec.c+3−4

     } else if (avctx->codec->id == AV_CODEC_ID_WMAV2 && avctx->extradata_size >= 6) {
         flags2 = AV_RL16(extradata+4);
     }
-// for(i=0; i<avctx->extradata_size; i++)
-//     av_log(NULL, AV_LOG_ERROR, "%02X ", extradata[i]);
     s->use_exp_vlc = flags2 & 0x0001;
     s->use_bit_reservoir = flags2 & 0x0002;
         }
         if (s->last_superframe_len > 0) {
-            //        printf("skip=%d\n", s->last_bitoffset);
             /* add bit_offset bits to last frame */
             if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) >
                 MAX_CODED_SUPERFRAME_SIZE)
         samples += s->nb_channels * s->frame_len;
     }
-//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d outbytes:%d eaten:%d\n", s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len,        (int8_t *)samples - (int8_t *)data, s->block_align);
+    av_dlog(s->avctx, "%d %d %d %d outbytes:%d eaten:%d\n",
+            s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len,
+            (int8_t *)samples - (int8_t *)data, s->block_align);
     *got_frame_ptr   = 1;
     *(AVFrame *)data = s->frame;

libavcodec/wmaenc.c+0−1

@@ -82,7 +82,6 @@ static int encode_init(AVCodecContext * avctx){ · 81 unmodified lines
82	(avctx->sample_rate * 8);	82	(avctx->sample_rate * 8);
83	s->block_align = FFMIN(s->block_align, MAX_CODED_SUPERFRAME_SIZE);	83	s->block_align = FFMIN(s->block_align, MAX_CODED_SUPERFRAME_SIZE);
84	avctx->block_align = s->block_align;	84	avctx->block_align = s->block_align;
85	//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", s->block_align, avctx->bit_rate, s->frame_len, avctx->sample_rate);
86	avctx->frame_size = avctx->delay = s->frame_len;	85	avctx->frame_size = avctx->delay = s->frame_len;
87		86
88	#if FF_API_OLD_ENCODE_AUDIO	87	#if FF_API_OLD_ENCODE_AUDIO

libavcodec/wmv2dec.c+7−8

     else
         w->hshift= 0;
-//printf("%d %d  ", *mx_ptr, *my_ptr);
     return 0;
 }
 //        const uint8_t *scantable= w->abt_type-1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable;
         sub_cbp= sub_cbp_table[ decode012(&s->gb) ];
-//        printf("S%d", sub_cbp);
         if(sub_cbp&1){
             if (ff_msmpeg4_decode_block(s, block, n, 1, scantable) < 0)
     if (!s->mb_intra) {
         int mx, my;
-//printf("P at %d %d\n", s->mb_x, s->mb_y);
         wmv2_pred_motion(w, &mx, &my);
         if(cbp){
             }
         }
     } else {
-//if(s->pict_type==AV_PICTURE_TYPE_P)
+        if (s->pict_type==AV_PICTURE_TYPE_P)
-//   printf("%d%d ", s->inter_intra_pred, cbp);
+            av_dlog(s->avctx, "%d%d ", s->inter_intra_pred, cbp);
-//printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24));
+        av_dlog(s->avctx, "I at %d %d %d %06X\n", s->mb_x, s->mb_y,
+                ((cbp & 3) ? 1 : 0) +((cbp & 0x3C)? 2 : 0),
+                show_bits(&s->gb, 24));
         s->ac_pred = get_bits1(&s->gb);
         if(s->inter_intra_pred){
             s->h263_aic_dir= get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
-//            printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
+            av_dlog(s->avctx, "%d%d %d %d/",
+                    s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
         }
         if(s->per_mb_rl_table && cbp){
             s->rl_table_index = decode012(&s->gb);

libavcodec/x86/mpegvideo.c+2−2

@@ -51,7 +51,7 @@ static void dct_unquantize_h263_intra_mmx(MpegEncContext *s, · 50 unmodified lines
51	nCoeffs=63;	51	nCoeffs=63;
52	else	52	else
53	nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];	53	nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
54	//printf("%d %d ", qmul, qadd);	54
55	__asm__ volatile(	55	__asm__ volatile(
56	"movd %1, %%mm6 \n\t" //qmul	56	"movd %1, %%mm6 \n\t" //qmul
57	"packssdw %%mm6, %%mm6 \n\t"	57	"packssdw %%mm6, %%mm6 \n\t"
@@ -114,7 +114,7 @@ static void dct_unquantize_h263_inter_mmx(MpegEncContext *s, · 56 unmodified lines
114	assert(s->block_last_index[n]>=0 \|\| s->h263_aic);	114	assert(s->block_last_index[n]>=0 \|\| s->h263_aic);
115		115
116	nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];	116	nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
117	//printf("%d %d ", qmul, qadd);	117
118	__asm__ volatile(	118	__asm__ volatile(
119	"movd %1, %%mm6 \n\t" //qmul	119	"movd %1, %%mm6 \n\t" //qmul
120	"packssdw %%mm6, %%mm6 \n\t"	120	"packssdw %%mm6, %%mm6 \n\t"

libavdevice/timefilter.c+0−7

     double ideal[SAMPLES];
     double samples[SAMPLES];
     double samplet[SAMPLES];
-#if 1
     for (n0 = 0; n0 < 40; n0 = 2 * n0 + 1) {
         for (n1 = 0; n1 < 10; n1 = 2 * n1 + 1) {
-#else
-    {
-        {
-            n0 = 7;
-            n1 = 1;
-#endif
             double best_error = 1000000000;
             double bestpar0   = 1;
             double bestpar1   = 1;

libavformat/asfdec.c+19−30

 //#define DEBUG
+#include "libavutil/attributes.h"
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
 #include "libavutil/avstring.h"
             avio_rl16(pb); //ds_data_size
             avio_r8(pb);   //ds_silence_data
         }
-        //printf("Descrambling: ps:%d cs:%d ds:%d s:%d  sd:%d\n",
-        //       asf_st->ds_packet_size, asf_st->ds_chunk_size,
-        //       asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data);
         if (asf_st->ds_span > 1) {
             if (!asf_st->ds_chunk_size
                     || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)
         st->codec->bits_per_coded_sample = avio_rl16(pb); /* depth */
         tag1 = avio_rl32(pb);
         avio_skip(pb, 20);
-        //                av_log(s, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX);
         if (sizeX > 40) {
             st->codec->extradata_size = sizeX - 40;
             st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
     for(i=0;i<n;i++) {
         char name[1024];
+        int av_unused value_type;
         avio_rl16(pb); //lang_list_index
         stream_num= avio_rl16(pb);
         name_len=   avio_rl16(pb);
-        avio_skip(pb, 2); /* value_type */
+        value_type = avio_rl16(pb); /* value_type */
         value_len=  avio_rl32(pb);
         if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len)
             avio_skip(pb, name_len - ret);
-        //av_log(s, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name);
+        av_dlog(s, "%d %d %d %d %d <%s>\n",
+                i, stream_num, name_len, value_type, value_len, name);
         value_num= avio_rl16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere
         avio_skip(pb, value_len - 2);
         uint64_t gpos= avio_tell(pb);
         ff_get_guid(pb, &g);
         gsize = avio_rl64(pb);
-        av_dlog(s, "%08"PRIx64": ", gpos);
         print_guid(&g);
-        av_dlog(s, "  size=0x%"PRIx64"\n", gsize);
         if (!ff_guidcmp(&g, &ff_asf_data_header)) {
             asf->data_object_offset = avio_tell(pb);
             // if not streaming, gsize is not unlimited (how?), and there is enough space in the file..
                           &st->sample_aspect_ratio.num,
                           asf->dar[0].num, asf->dar[0].den, INT_MAX);
-//av_log(s, AV_LOG_INFO, "i=%d, st->codec->codec_type:%d, dar %d:%d sar=%d:%d\n", i, st->codec->codec_type, dar[i].num, dar[i].den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
+            av_dlog(s, "i=%d, st->codec->codec_type:%d, asf->dar %d:%d sar=%d:%d\n",
+                    i, st->codec->codec_type, asf->dar[i].num, asf->dar[i].den,
+                    st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
             // copy and convert language codes to the frontend
             if (asf->streams[i].stream_language_index < 128) {
     DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
     DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
     DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
-//printf("key:%d stream:%d seq:%d offset:%d replic_size:%d\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, //asf->packet_frag_offset, asf->packet_replic_size);
+    av_dlog(asf, "key:%d stream:%d seq:%d offset:%d replic_size:%d\n",
+            asf->packet_key_frame, asf->stream_index, asf->packet_seq,
+            asf->packet_frag_offset, asf->packet_replic_size);
     if (rsize+asf->packet_replic_size > asf->packet_size_left) {
         av_log(s, AV_LOG_ERROR, "packet_replic_size %d is invalid\n", asf->packet_replic_size);
         return AVERROR_INVALIDDATA;
         }
         asf->packet_frag_timestamp = avio_rl32(pb); // timestamp
         if(asf->packet_replic_size >= 8+38+4){
-//            for(i=0; i<asf->packet_replic_size-8; i++)
-//                av_log(s, AV_LOG_DEBUG, "%02X ",avio_r8(pb));
-//            av_log(s, AV_LOG_DEBUG, "\n");
             avio_skip(pb, 10);
             ts0= avio_rl64(pb);
             ts1= avio_rl64(pb);
                 asf->packet_padsize   -= diff;
             }
         }
-        //printf("Fragsize %d\n", asf->packet_frag_size);
     } else {
         asf->packet_frag_size = asf->packet_size_left - rsize;
-        //printf("Using rest  %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize);
     }
     if (asf->packet_replic_size == 1) {
         asf->packet_multi_size = asf->packet_frag_size;
             return AVERROR_INVALIDDATA;
     }
     asf->packet_size_left -= rsize;
-    //printf("___objsize____  %d   %d    rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize);
     return 0;
 }
             || asf->packet_segments < 1) {
             //asf->packet_size_left <= asf->packet_padsize) {
             int ret = asf->packet_size_left + asf->packet_padsize;
-            //printf("PacketLeftSize:%d  Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, avio_tell(pb));
             assert(ret>=0);
             /* fail safe */
             avio_skip(pb, ret);
                 continue;
             }
             asf->packet_multi_size -= asf->packet_obj_size;
-            //printf("COMPRESS size  %d  %d  %d   ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size);
         }
         if(   /*asf->packet_frag_size == asf->packet_obj_size*/
               asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size
                     asf_st->palette_changed = 0;
                 }
             }
-//printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n",
+            av_dlog(asf, "new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n",
-//asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & AV_PKT_FLAG_KEY,
+                    asf->stream_index, asf->packet_key_frame,
-//s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO, asf->packet_obj_size);
+                    asf_st->pkt.flags & AV_PKT_FLAG_KEY,
+                    s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO,
+                    asf->packet_obj_size);
             if (s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
                 asf->packet_key_frame = 1;
             if (asf->packet_key_frame)
         }
         /* read data */
-        //printf("READ PACKET s:%d  os:%d  o:%d,%d  l:%d   DATA:%p\n",
+        av_dlog(asf, "READ PACKET s:%d  os:%d  o:%d,%d  l:%d   DATA:%p\n",
-        //       s->packet_size, asf_st->pkt.size, asf->packet_frag_offset,
+                s->packet_size, asf_st->pkt.size, asf->packet_frag_offset,
-        //       asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data);
+                asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data);
         asf->packet_size_left -= asf->packet_frag_size;
         if (asf->packet_size_left < 0)
             continue;
                         int row = off / asf_st->ds_span;
                         int col = off % asf_st->ds_span;
                         int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size;
-                        //printf("off:%d  row:%d  col:%d  idx:%d\n", off, row, col, idx);
                         assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size);
                         assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size);
                         memcpy(newdata + offset,
             }
             asf_st->frag_offset = 0;
             *pkt= asf_st->pkt;
-            //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size);
             asf_st->pkt.size = 0;
             asf_st->pkt.data = 0;
             asf_st->pkt.side_data_elems = 0;
     if (avio_seek(s->pb, pos, SEEK_SET) < 0)
         return AV_NOPTS_VALUE;
-//printf("asf_read_pts\n");
     asf_reset_header(s);
     for(;;){
         if (av_read_frame(s, pkt) < 0){
     }
     *ppos= pos;
-//printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts);
     return pts;
 }

libavformat/assdec.c+1−1

@@ -60,7 +60,7 @@ static int64_t get_pts(const uint8_t *p) · 59 unmodified lines
60	if(sscanf(p, "%[^,],%d:%d:%d%c%d", &hour, &min, &sec, &hsec) != 4)	60	if(sscanf(p, "%[^,],%d:%d:%d%c%d", &hour, &min, &sec, &hsec) != 4)
61	return AV_NOPTS_VALUE;	61	return AV_NOPTS_VALUE;
62		62
63	// av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d [%s]\n", i, hour, min, sec, hsec, p);	63	av_dlog(NULL, "%d %d %d %d [%s]\n", hour, min, sec, hsec, p);
64		64
65	min+= 60*hour;	65	min+= 60*hour;
66	sec+= 60*min;	66	sec+= 60*min;

libavformat/avidec.c+14−10

             }
             ast->sample_size = avio_rl32(pb); /* sample ssize */
             ast->cum_len *= FFMAX(1, ast->sample_size);
-//            av_log(s, AV_LOG_DEBUG, "%d %d %d %d\n", ast->rate, ast->scale, ast->start, ast->sample_size);
+            av_dlog(s, "%"PRIu32" %"PRIu32" %d\n",
+                    ast->rate, ast->scale, ast->sample_size);
             switch(tag1) {
             case MKTAG('v', 'i', 'd', 's'):
                 if(active_aspect.num && active_aspect.den && active.num && active.den){
                     st->sample_aspect_ratio= av_div_q(active_aspect, active);
-//av_log(s, AV_LOG_ERROR, "vprp %d/%d %d/%d\n", active_aspect.num, active_aspect.den, active.num, active.den);
+                    av_dlog(s, "vprp %d/%d %d/%d\n",
+                            active_aspect.num, active_aspect.den,
+                            active.num, active.den);
                 }
                 size -= 9*4;
             }
         size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
         n= get_stream_idx(d+2);
-//av_log(s, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
+        av_dlog(s, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n",
+                d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
         if(i + (uint64_t)size > avi->fsize || d[0] > 127)
             continue;
            ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')
            ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){
             avio_skip(pb, size);
-//av_log(s, AV_LOG_DEBUG, "SKIP\n");
             goto start_sync;
         }
                 if (exit_early)
                     return 0;
-//av_log(s, AV_LOG_DEBUG, "OK\n");
                 if(d[2]*256+d[3] == ast->prefix)
                     ast->prefix_count++;
                 else{
             ts = av_rescale_q(ts, st->time_base, (AVRational){FFMAX(1, ast->sample_size), AV_TIME_BASE});
-//            av_log(s, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset);
+            av_dlog(s, "%"PRId64" %d/%d %"PRId64"\n", ts,
+                    st->time_base.num, st->time_base.den, ast->frame_offset);
             if(ts < best_ts){
                 best_ts= ts;
                 best_st= st;
                 best_ast->frame_offset= best_st->index_entries[i].timestamp;
         }
-//        av_log(s, AV_LOG_DEBUG, "%d\n", i);
         if(i>=0){
             int64_t pos= best_st->index_entries[i].pos;
             pos += best_ast->packet_size - best_ast->remaining;
             if(avio_seek(s->pb, pos + 8, SEEK_SET) < 0)
               return AVERROR_EOF;
-//        av_log(s, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos);
             av_assert0(best_ast->remaining <= best_ast->packet_size);
 //                pkt->dts += ast->start;
             if(ast->sample_size)
                 pkt->dts /= ast->sample_size;
-//av_log(s, AV_LOG_DEBUG, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, avi->stream_index, size);
+            av_dlog(s, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d base:%d st:%d size:%d\n",
+                    pkt->dts, ast->frame_offset, ast->scale, ast->rate,
+                    ast->sample_size, AV_TIME_BASE, avi->stream_index, size);
             pkt->stream_index = avi->stream_index;
             if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
     pos = st->index_entries[index].pos;
     timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1);
-//    av_log(s, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp);
+    av_dlog(s, "XX %"PRId64" %d %"PRId64"\n",
+            timestamp, index, st->index_entries[index].timestamp);
     if (CONFIG_DV_DEMUXER && avi->dv_demux) {
         /* One and only one real stream for DV in AVI, and it has video  */

libavformat/ffmdec.c+0−3

@@ -246,9 +246,6 @@ static void adjust_write_index(AVFormatContext *s) · 245 unmodified lines
246	ffm->write_index += pos_max;	246	ffm->write_index += pos_max;
247	}	247	}
248		248
249	//printf("Adjusted write index from %"PRId64" to %"PRId64": pts=%0.6f\n", orig_write_index, ffm->write_index, pts / 1000000.);
250	//printf("pts range %0.6f - %0.6f\n", get_dts(s, 0) / 1000000. , get_dts(s, ffm->file_size - 2 * FFM_PACKET_SIZE) / 1000000. );
251
252	end:	249	end:
253	avio_seek(pb, ptr, SEEK_SET);	250	avio_seek(pb, ptr, SEEK_SET);
254	}	251	}

libavformat/flvenc.c+0−3

@@ -446,9 +446,6 @@ static int flv_write_packet(AVFormatContext s, AVPacket pkt) · 445 unmodified lines
446	uint8_t *data = NULL;	446	uint8_t *data = NULL;
447	int flags = -1, flags_size, ret;	447	int flags = -1, flags_size, ret;
448		448
449	av_dlog(s, "type:%s pts:%"PRId64" dts:%"PRId64" size:%d\n",
450	av_get_media_type_string(enc->codec_type), pkt->pts, pkt->dts, size);
451
452	if (enc->codec_id == AV_CODEC_ID_VP6 \|\| enc->codec_id == AV_CODEC_ID_VP6F \|\|	449	if (enc->codec_id == AV_CODEC_ID_VP6 \|\| enc->codec_id == AV_CODEC_ID_VP6F \|\|
453	enc->codec_id == AV_CODEC_ID_VP6A \|\| enc->codec_id == AV_CODEC_ID_AAC)	450	enc->codec_id == AV_CODEC_ID_VP6A \|\| enc->codec_id == AV_CODEC_ID_AAC)
454	flags_size = 2;	451	flags_size = 2;

libavformat/h263dec.c+0−2

                 last_gn= gn;
         }
     }
-//av_log(NULL, AV_LOG_ERROR, "h263_probe: psc:%d invalid:%d res_change:%d\n", valid_psc, invalid_psc, res_change);
-//h263_probe: psc:3 invalid:0 res_change:0 (1588/recent_ffmpeg_parses_mpg_incorrectly.mpg)
     if(valid_psc > 2*invalid_psc + 2*res_change + 3){
         return 50;
     }else if(valid_psc > 2*invalid_psc)

libavformat/movenc.c+0−1

@@ -2196,7 +2196,6 @@ static int mov_write_uuidusmt_tag(AVIOContext pb, AVFormatContext s) · 2195 unmodified lines
2196		2196
2197	mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04);	2197	mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04);
2198	mov_write_psp_udta_tag(pb, title->value, "eng", 0x01);	2198	mov_write_psp_udta_tag(pb, title->value, "eng", 0x01);
2199	// snprintf(dt,32,"%04d/%02d/%02d %02d:%02d:%02d",t_st->tm_year+1900,t_st->tm_mon+1,t_st->tm_mday,t_st->tm_hour,t_st->tm_min,t_st->tm_sec);
2200	mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03);	2199	mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03);
2201		2200
2202	update_size(pb, pos2);	2201	update_size(pb, pos2);

libavformat/mpeg.c+0−2

     if(vid+audio > invalid+1)     /* invalid VDR files nd short PES streams */
         score= AVPROBE_SCORE_MAX/4;
-//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, invalid, p->buf_size);
     if(sys>invalid && sys*9 <= pspack*10)
         return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9)
         size = MAX_SYNC_SIZE;
         startcode = find_next_start_code(s->pb, &size, &m->header_state);
         last_sync = avio_tell(s->pb);
-    //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, avio_tell(s->pb));
     if (startcode < 0){
         if(url_feof(s->pb))
             return AVERROR_EOF;

libavformat/mpegenc.c+7−2

     }
     if(timestamp_packet){
-//av_log(ctx, AV_LOG_DEBUG, "dts:%f pts:%f scr:%f stream:%d\n", timestamp_packet->dts/90000.0, timestamp_packet->pts/90000.0, scr/90000.0, best_i);
+        av_dlog(ctx, "dts:%f pts:%f scr:%f stream:%d\n",
+                timestamp_packet->dts / 90000.0,
+                timestamp_packet->pts / 90000.0,
+                scr / 90000.0, best_i);
         es_size= flush_packet(ctx, best_i, timestamp_packet->pts, timestamp_packet->dts, scr, trailer_size);
     }else{
         assert(av_fifo_size(stream->fifo) == trailer_size);
         dts += 2*preload;
     }
-//av_log(ctx, AV_LOG_DEBUG, "dts:%f pts:%f flags:%d stream:%d nopts:%d\n", dts/90000.0, pts/90000.0, pkt->flags, pkt->stream_index, pts != AV_NOPTS_VALUE);
+    av_dlog(ctx, "dts:%f pts:%f flags:%d stream:%d nopts:%d\n",
+            dts / 90000.0, pts / 90000.0, pkt->flags,
+            pkt->stream_index, pts != AV_NOPTS_VALUE);
     if (!stream->premux_packet)
         stream->next_packet = &stream->premux_packet;
     *stream->next_packet=

libavformat/mpegts.c+4−2

     score    = analyze(buf, size, TS_PACKET_SIZE, NULL);
     dvhs_score    = analyze(buf, size, TS_DVHS_PACKET_SIZE, NULL);
     fec_score= analyze(buf, size, TS_FEC_PACKET_SIZE, NULL);
-//    av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
+    av_dlog(NULL, "score: %d, dvhs_score: %d, fec_score: %d \n",
+            score, dvhs_score, fec_score);
     if     (score > fec_score && score > dvhs_score) return TS_PACKET_SIZE;
     else if(dvhs_score > score && dvhs_score > fec_score) return TS_DVHS_PACKET_SIZE;
     score     = analyze(p->buf, TS_PACKET_SIZE     *check_count, TS_PACKET_SIZE     , NULL)*CHECK_COUNT/check_count;
     dvhs_score= analyze(p->buf, TS_DVHS_PACKET_SIZE*check_count, TS_DVHS_PACKET_SIZE, NULL)*CHECK_COUNT/check_count;
     fec_score = analyze(p->buf, TS_FEC_PACKET_SIZE *check_count, TS_FEC_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
-//    av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
+    av_dlog(NULL, "score: %d, dvhs_score: %d, fec_score: %d \n",
+            score, dvhs_score, fec_score);
 // we need a clear definition for the returned score otherwise things will become messy sooner or later
     if     (score > fec_score && score > dvhs_score && score > 6) return AVPROBE_SCORE_MAX + score     - CHECK_COUNT;

libavformat/mpegtsenc.c+1−1

@@ -1098,7 +1098,7 @@ static int mpegts_write_packet_internal(AVFormatContext s, AVPacket pkt) · 1097 unmodified lines
1098		1098
1099	do {	1099	do {
1100	p = avpriv_mpv_find_start_code(p, buf_end, &state);	1100	p = avpriv_mpv_find_start_code(p, buf_end, &state);
1101	//av_log(s, AV_LOG_INFO, "nal %d\n", state & 0x1f);	1101	av_dlog(s, "nal %d\n", state & 0x1f);
1102	} while (p < buf_end && (state & 0x1f) != 9 &&	1102	} while (p < buf_end && (state & 0x1f) != 9 &&
1103	(state & 0x1f) != 5 && (state & 0x1f) != 1);	1103	(state & 0x1f) != 5 && (state & 0x1f) != 1);
1104		1104

libavformat/mxfenc.c+1−1

@@ -2107,7 +2107,7 @@ static int mxf_interleave_get_packet(AVFormatContext s, AVPacket out, AVPacket · 2106 unmodified lines
2107	}	2107	}
2108		2108
2109	*out = pktl->pkt;	2109	*out = pktl->pkt;
2110	//av_log(s, AV_LOG_DEBUG, "out st:%d dts:%lld\n", (out).stream_index, (out).dts);	2110	av_dlog(s, "out st:%d dts:%lld\n", (out).stream_index, (out).dts);
2111	s->packet_buffer = pktl->next;	2111	s->packet_buffer = pktl->next;
2112	if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl)	2112	if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl)
2113	s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL;	2113	s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL;

libavformat/nutenc.c+0−4

     int i;
     int len= find_expected_header(c, size, frame_type, out);
-//av_log(NULL, AV_LOG_ERROR, "expected_h len=%d size=%d codec_id=%d\n", len, size, c->codec_id);
     for(i=1; i<nut->header_count; i++){
         if(   len == nut->header_len[i]
            && !memcmp(out, nut->header[i], len)){
-//    av_log(NULL, AV_LOG_ERROR, "found %d\n", i);
             return i;
         }
     }
-//    av_log(NULL, AV_LOG_ERROR, "nothing found\n");
     return 0;
 }

libavformat/rmdec.c+3−2

         st->codec->codec_tag = avio_rl32(pb);
         st->codec->codec_id  = ff_codec_get_id(ff_rm_codec_tags,
                                                st->codec->codec_tag);
-//        av_log(s, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
+        av_dlog(s, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
         if (st->codec->codec_id == AV_CODEC_ID_NONE)
             goto fail1;
         st->codec->width  = avio_rb16(pb);
         }
         if((flags&2) && (seq&0x7F) == 1){
-//            av_log(s, AV_LOG_DEBUG, "%d %d-%d %"PRId64" %d\n", flags, stream_index2, stream_index, dts, seq);
+            av_dlog(s, "%d %d-%d %"PRId64" %d\n",
+                    flags, stream_index2, stream_index, dts, seq);
             av_add_index_entry(st, pos, dts, 0, 0, AVINDEX_KEYFRAME);
             if(stream_index2 == stream_index)
                 break;

libavformat/rtsp.c+0−2

@@ -155,8 +155,6 @@ static void rtsp_parse_range_npt(const char p, int64_t start, int64_t *end) · 154 unmodified lines
155	get_word_sep(buf, sizeof(buf), "-", &p);	155	get_word_sep(buf, sizeof(buf), "-", &p);
156	av_parse_time(end, buf, 1);	156	av_parse_time(end, buf, 1);
157	}	157	}
158	// av_log(NULL, AV_LOG_DEBUG, "Range Start: %lld\n", *start);
159	// av_log(NULL, AV_LOG_DEBUG, "Range End: %lld\n", *end);
160	}	158	}
161		159
162	static int get_sockaddr(const char buf, struct sockaddr_storage sock)	160	static int get_sockaddr(const char buf, struct sockaddr_storage sock)

libavformat/swfdec.c+0−1

@@ -45,7 +45,6 @@ static int get_swf_tag(AVIOContext pb, int len_ptr) · 44 unmodified lines
45	if (len == 0x3f) {	45	if (len == 0x3f) {
46	len = avio_rl32(pb);	46	len = avio_rl32(pb);
47	}	47	}
48	// av_log(NULL, AV_LOG_DEBUG, "Tag: %d - Len: %d\n", tag, len);
49	*len_ptr = len;	48	*len_ptr = len;
50	return tag;	49	return tag;
51	}	50	}

libavformat/utils.c+6−5

     if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts)
         presentation_delayed = 1;
-//    av_log(NULL, AV_LOG_DEBUG, "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%d\n",
+    av_dlog(NULL, "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%d\n",
-//           presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), pkt->stream_index, pc, pkt->duration);
+           presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), pkt->stream_index, pc, pkt->duration);
     /* interpolate PTS and DTS if they are not present */
     //We skip H264 currently because delay and has_b_frames are not reliably set
     if((delay==0 || (delay==1 && pc)) && st->codec->codec_id != AV_CODEC_ID_H264){
     if(pkt->dts > st->cur_dts)
         st->cur_dts = pkt->dts;
-//    av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n",
+    av_dlog(NULL, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n",
-//           presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts));
+            presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts));
     /* update flags */
     if (is_intra_only(st->codec))
         return AVERROR(EINVAL);
     }
-//    av_log(s, AV_LOG_DEBUG, "av_write_frame: pts2:%s dts2:%s\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts));
+    av_dlog(s, "av_write_frame: pts2:%s dts2:%s\n",
+            av_ts2str(pkt->pts), av_ts2str(pkt->dts));
     st->cur_dts= pkt->dts;
     st->pts.val= pkt->dts;

tools/pktdumper.c+0−1

@@ -113,7 +113,6 @@ int main(int argc, char **argv) · 112 unmodified lines
113	(pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_');	113	(pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_');
114	printf(PKTFILESUFF "\n", pktnum, pkt.stream_index, pkt.pts, pkt.size,	114	printf(PKTFILESUFF "\n", pktnum, pkt.stream_index, pkt.pts, pkt.size,
115	(pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_');	115	(pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_');
116	//printf("open(\"%s\")\n", pktfilename);
117	if (!nowrite) {	116	if (!nowrite) {
118	fd = open(pktfilename, O_WRONLY \| O_CREAT, 0644);	117	fd = open(pktfilename, O_WRONLY \| O_CREAT, 0644);
119	err = write(fd, pkt.data, pkt.size);	118	err = write(fd, pkt.data, pkt.size);

Merge remote-tracking branch 'qatar/master'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code