From 11d4e92ed929f092c6ecc8775b0ba340ccd7179d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 21 Aug 2012 12:27:40 +0200 Subject: [PATCH] avformat: Remove non-compiling and/or silly commented-out printf/av_log statements --- libavformat/asfdec.c | 20 -------------------- libavformat/avidec.c | 4 ---- libavformat/avienc.c | 2 -- libavformat/ffmdec.c | 3 --- libavformat/flvenc.c | 3 --- libavformat/h263dec.c | 2 -- libavformat/movenc.c | 1 - libavformat/mpeg.c | 2 -- libavformat/nutenc.c | 4 ---- libavformat/rtsp.c | 2 -- libavformat/swfdec.c | 1 - libavutil/lfg.c | 4 +--- tools/pktdumper.c | 1 - 13 files changed, 1 insertion(+), 48 deletions(-) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 66f72c3349..e6e593ba4b 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -428,9 +428,6 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) 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) @@ -451,7 +448,6 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) 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); @@ -697,9 +693,7 @@ static int asf_read_header(AVFormatContext *s) 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.. @@ -931,9 +925,6 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ } asf->packet_frag_timestamp = avio_rl32(pb); // timestamp if(asf->packet_replic_size >= 8+38+4){ -// for(i=0; ipacket_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); avio_skip(pb, 8);; @@ -972,14 +963,12 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ asf->packet_padsize -= diff; } } - //printf("Fragsize %d\n", asf->packet_frag_size); } else { if (rsize > asf->packet_size_left) { av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); return -1; } 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; @@ -987,7 +976,6 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ return -1; } asf->packet_size_left -= rsize; - //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); return 0; } @@ -1013,7 +1001,6 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk || 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); @@ -1060,7 +1047,6 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk 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 @@ -1170,8 +1156,6 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk 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, @@ -1186,7 +1170,6 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk } 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; @@ -1275,7 +1258,6 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, *ppos= pos; avio_seek(s->pb, pos, SEEK_SET); -//printf("asf_read_pts\n"); asf_reset_header(s); for(;;){ if (asf_read_packet(s, pkt) < 0){ @@ -1303,8 +1285,6 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, } *ppos= pos; -//printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts); - return pts; } diff --git a/libavformat/avidec.c b/libavformat/avidec.c index b2a06edd8c..22ec5f8239 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -870,7 +870,6 @@ start_sync: ||(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; } @@ -944,7 +943,6 @@ 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{ @@ -1025,12 +1023,10 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) 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; avio_seek(s->pb, pos + 8, SEEK_SET); -// av_log(s, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos); assert(best_ast->remaining <= best_ast->packet_size); diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 86698794df..fa6321200e 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -520,7 +520,6 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) AVCodecContext *enc= s->streams[stream_index]->codec; int size= pkt->size; -// av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %d\n", pkt->dts, avi->packet_count[stream_index], stream_index); while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count){ AVPacket empty_packet; @@ -529,7 +528,6 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) empty_packet.data= NULL; empty_packet.stream_index= stream_index; avi_write_packet(s, &empty_packet); -// av_log(s, AV_LOG_DEBUG, "dup %"PRId64" %d\n", pkt->dts, avi->packet_count[stream_index]); } avist->packet_count++; diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index c4ee22e73a..8929657784 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -240,9 +240,6 @@ static void adjust_write_index(AVFormatContext *s) ffm->write_index += pos_max; } - //printf("Adjusted write index from %"PRId64" to %"PRId64": pts=%0.6f\n", orig_write_index, ffm->write_index, pts / 1000000.); - //printf("pts range %0.6f - %0.6f\n", get_dts(s, 0) / 1000000. , get_dts(s, ffm->file_size - 2 * FFM_PACKET_SIZE) / 1000000. ); - end: avio_seek(pb, ptr, SEEK_SET); } diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 839b9b0df4..8aeea968b4 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -423,9 +423,6 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *data = NULL; int flags = 0, flags_size; - // av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", - // enc->codec_type, timestamp, size); - if (enc->codec_id == AV_CODEC_ID_VP6 || enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_AAC) flags_size = 2; diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c index 9f50faabc4..101ef51748 100644 --- a/libavformat/h263dec.c +++ b/libavformat/h263dec.c @@ -55,8 +55,6 @@ static int h263_probe(AVProbeData *p) 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) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 90c5806f50..935b9a3ad7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2002,7 +2002,6 @@ static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s) mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04); mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); -// 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); mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03); update_size(pb, pos2); diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a56f17abf3..2d08b17682 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -84,7 +84,6 @@ static int mpegps_probe(AVProbeData *p) if(vid+audio > invalid) /* 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 pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9) @@ -218,7 +217,6 @@ static int mpegps_read_pes_header(AVFormatContext *s, 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(s->pb->eof_reached) return AVERROR_EOF; diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 29b6dcdaab..4b1e66379c 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -95,16 +95,12 @@ static int find_header_idx(AVFormatContext *s, AVCodecContext *c, int size, int 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; iheader_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; } diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 3ddf33ce64..df272188a8 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -154,8 +154,6 @@ static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end) get_word_sep(buf, sizeof(buf), "-", &p); av_parse_time(end, buf, 1); } -// av_log(NULL, AV_LOG_DEBUG, "Range Start: %lld\n", *start); -// av_log(NULL, AV_LOG_DEBUG, "Range End: %lld\n", *end); } static int get_sockaddr(const char *buf, struct sockaddr_storage *sock) diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 6a923f307d..ff44452f8f 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -45,7 +45,6 @@ static int get_swf_tag(AVIOContext *pb, int *len_ptr) if (len == 0x3f) { len = avio_rl32(pb); } -// av_log(NULL, AV_LOG_DEBUG, "Tag: %d - Len: %d\n", tag, len); *len_ptr = len; return tag; } diff --git a/libavutil/lfg.c b/libavutil/lfg.c index c1f2861785..4221e6228b 100644 --- a/libavutil/lfg.c +++ b/libavutil/lfg.c @@ -72,10 +72,8 @@ int main(void) av_lfg_init(&state, 0xdeadbeef); for (j = 0; j < 10000; j++) { START_TIMER - for (i = 0; i < 624; i++) { - //av_log(NULL, AV_LOG_ERROR, "%X\n", av_lfg_get(&state)); + for (i = 0; i < 624; i++) x += av_lfg_get(&state); - } STOP_TIMER("624 calls of av_lfg_get"); } av_log(NULL, AV_LOG_ERROR, "final value:%X\n", x); diff --git a/tools/pktdumper.c b/tools/pktdumper.c index 087ac5b2dc..98b9327ef4 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -113,7 +113,6 @@ int main(int argc, char **argv) (pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_'); printf(PKTFILESUFF "\n", pktnum, pkt.stream_index, pkt.pts, pkt.size, (pkt.flags & AV_PKT_FLAG_KEY) ? 'K' : '_'); - //printf("open(\"%s\")\n", pktfilename); if (!nowrite) { fd = open(pktfilename, O_WRONLY | O_CREAT, 0644); err = write(fd, pkt.data, pkt.size);