mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521'
* commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521': Remove some pointless TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
1436769c57
|
@ -1479,17 +1479,6 @@ resync:
|
||||||
// pkt->dts += ast->start;
|
// pkt->dts += ast->start;
|
||||||
if (ast->sample_size)
|
if (ast->sample_size)
|
||||||
pkt->dts /= ast->sample_size;
|
pkt->dts /= ast->sample_size;
|
||||||
av_log(s, AV_LOG_TRACE,
|
|
||||||
"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;
|
pkt->stream_index = avi->stream_index;
|
||||||
|
|
||||||
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && st->index_entries) {
|
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && st->index_entries) {
|
||||||
|
@ -1760,13 +1749,6 @@ static int avi_load_index(AVFormatContext *s)
|
||||||
break;
|
break;
|
||||||
next = avio_tell(pb) + size + (size & 1);
|
next = avio_tell(pb) + size + (size & 1);
|
||||||
|
|
||||||
av_log(s, AV_LOG_TRACE, "tag=%c%c%c%c size=0x%x\n",
|
|
||||||
tag & 0xff,
|
|
||||||
(tag >> 8) & 0xff,
|
|
||||||
(tag >> 16) & 0xff,
|
|
||||||
(tag >> 24) & 0xff,
|
|
||||||
size);
|
|
||||||
|
|
||||||
if (tag == MKTAG('i', 'd', 'x', '1') &&
|
if (tag == MKTAG('i', 'd', 'x', '1') &&
|
||||||
avi_read_idx1(s, size) >= 0) {
|
avi_read_idx1(s, size) >= 0) {
|
||||||
avi->index_loaded=2;
|
avi->index_loaded=2;
|
||||||
|
|
|
@ -358,9 +358,6 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
s->frame_pts_inc = ((uint64_t)AV_RL32(&scratch[0])) * AV_RL16(&scratch[4]);
|
s->frame_pts_inc = ((uint64_t)AV_RL32(&scratch[0])) * AV_RL16(&scratch[4]);
|
||||||
av_log(s->avf, AV_LOG_TRACE, " %.2f frames/second (timer div = %d, subdiv = %d)\n",
|
|
||||||
1000000.0 / s->frame_pts_inc, AV_RL32(&scratch[0]),
|
|
||||||
AV_RL16(&scratch[4]));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OPCODE_INIT_AUDIO_BUFFERS:
|
case OPCODE_INIT_AUDIO_BUFFERS:
|
||||||
|
|
|
@ -515,9 +515,6 @@ retry:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
av_log(c->fc, AV_LOG_TRACE, "lang \"%3s\" ", language);
|
|
||||||
av_log(c->fc, AV_LOG_TRACE, "tag \"%s\" value \"%s\" atom \"%.4s\" %d %"PRId64"\n",
|
|
||||||
key, str, (char*)&atom.type, str_size_alloc, atom.size);
|
|
||||||
|
|
||||||
av_freep(&str);
|
av_freep(&str);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -597,7 +594,6 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
|
|
||||||
dref->type = avio_rl32(pb);
|
dref->type = avio_rl32(pb);
|
||||||
avio_rb32(pb); // version + flags
|
avio_rb32(pb); // version + flags
|
||||||
av_log(c->fc, AV_LOG_TRACE, "type %.4s size %d\n", (char*)&dref->type, size);
|
|
||||||
|
|
||||||
if (dref->type == MKTAG('a','l','i','s') && size > 150) {
|
if (dref->type == MKTAG('a','l','i','s') && size > 150) {
|
||||||
/* macintosh alias record */
|
/* macintosh alias record */
|
||||||
|
@ -2476,7 +2472,6 @@ static int mov_read_stps(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
|
|
||||||
for (i = 0; i < entries && !pb->eof_reached; i++) {
|
for (i = 0; i < entries && !pb->eof_reached; i++) {
|
||||||
sc->stps_data[i] = avio_rb32(pb);
|
sc->stps_data[i] = avio_rb32(pb);
|
||||||
//av_log(c->fc, AV_LOG_TRACE, "stps %d\n", sc->stps_data[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sc->stps_count = i;
|
sc->stps_count = i;
|
||||||
|
@ -2524,7 +2519,6 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
|
|
||||||
for (i = 0; i < entries && !pb->eof_reached; i++) {
|
for (i = 0; i < entries && !pb->eof_reached; i++) {
|
||||||
sc->keyframes[i] = avio_rb32(pb);
|
sc->keyframes[i] = avio_rb32(pb);
|
||||||
//av_log(c->fc, AV_LOG_TRACE, "keyframes[]=%d\n", sc->keyframes[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sc->keyframe_count = i;
|
sc->keyframe_count = i;
|
||||||
|
|
|
@ -211,13 +211,6 @@ static const AVCodecTag nsv_codec_audio_tags[] = {
|
||||||
//static int nsv_load_index(AVFormatContext *s);
|
//static int nsv_load_index(AVFormatContext *s);
|
||||||
static int nsv_read_chunk(AVFormatContext *s, int fill_header);
|
static int nsv_read_chunk(AVFormatContext *s, int fill_header);
|
||||||
|
|
||||||
#define print_tag(str, tag, size) \
|
|
||||||
av_log(NULL, AV_LOG_TRACE, "%s: tag=%c%c%c%c\n", \
|
|
||||||
str, tag & 0xff, \
|
|
||||||
(tag >> 8) & 0xff, \
|
|
||||||
(tag >> 16) & 0xff, \
|
|
||||||
(tag >> 24) & 0xff);
|
|
||||||
|
|
||||||
/* try to find something we recognize, and set the state accordingly */
|
/* try to find something we recognize, and set the state accordingly */
|
||||||
static int nsv_resync(AVFormatContext *s)
|
static int nsv_resync(AVFormatContext *s)
|
||||||
{
|
{
|
||||||
|
@ -404,8 +397,6 @@ static int nsv_parse_NSVs_header(AVFormatContext *s)
|
||||||
nsv->avsync = avio_rl16(pb);
|
nsv->avsync = avio_rl16(pb);
|
||||||
nsv->framerate = framerate;
|
nsv->framerate = framerate;
|
||||||
|
|
||||||
print_tag("NSV NSVs vtag", vtag, 0);
|
|
||||||
print_tag("NSV NSVs atag", atag, 0);
|
|
||||||
av_log(s, AV_LOG_TRACE, "NSV NSVs vsize %dx%d\n", vwidth, vheight);
|
av_log(s, AV_LOG_TRACE, "NSV NSVs vsize %dx%d\n", vwidth, vheight);
|
||||||
|
|
||||||
/* XXX change to ap != NULL ? */
|
/* XXX change to ap != NULL ? */
|
||||||
|
@ -558,12 +549,6 @@ null_chunk_retry:
|
||||||
uint32_t av_unused auxtag;
|
uint32_t av_unused auxtag;
|
||||||
auxsize = avio_rl16(pb);
|
auxsize = avio_rl16(pb);
|
||||||
auxtag = avio_rl32(pb);
|
auxtag = avio_rl32(pb);
|
||||||
av_log(s, AV_LOG_TRACE, "NSV aux data: '%c%c%c%c', %d bytes\n",
|
|
||||||
(auxtag & 0x0ff),
|
|
||||||
((auxtag >> 8) & 0x0ff),
|
|
||||||
((auxtag >> 16) & 0x0ff),
|
|
||||||
((auxtag >> 24) & 0x0ff),
|
|
||||||
auxsize);
|
|
||||||
avio_skip(pb, auxsize);
|
avio_skip(pb, auxsize);
|
||||||
vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming brain-dead */
|
vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming brain-dead */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue