Commit 484d42a0 authored by Stefano Sabatini's avatar Stefano Sabatini

lavf/concatdec: add timestamp log

Help debugging timestamp conversion issues.
parent 9f6d48d6
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/timestamp.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "url.h" #include "url.h"
...@@ -479,6 +480,7 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) ...@@ -479,6 +480,7 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
int ret; int ret;
int64_t delta; int64_t delta;
ConcatStream *cs; ConcatStream *cs;
AVStream *st;
while (1) { while (1) {
ret = av_read_frame(cat->avf, pkt); ret = av_read_frame(cat->avf, pkt);
...@@ -504,6 +506,12 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) ...@@ -504,6 +506,12 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
if ((ret = filter_packet(avf, cs, pkt))) if ((ret = filter_packet(avf, cs, pkt)))
return ret; return ret;
st = cat->avf->streams[pkt->stream_index];
av_log(avf, AV_LOG_DEBUG, "file:%d stream:%d pts:%s pts_time:%s dts:%s dts_time:%s",
(unsigned)(cat->cur_file - cat->files), pkt->stream_index,
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
delta = av_rescale_q(cat->cur_file->start_time - cat->avf->start_time, delta = av_rescale_q(cat->cur_file->start_time - cat->avf->start_time,
AV_TIME_BASE_Q, AV_TIME_BASE_Q,
cat->avf->streams[pkt->stream_index]->time_base); cat->avf->streams[pkt->stream_index]->time_base);
...@@ -511,6 +519,9 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) ...@@ -511,6 +519,9 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
pkt->pts += delta; pkt->pts += delta;
if (pkt->dts != AV_NOPTS_VALUE) if (pkt->dts != AV_NOPTS_VALUE)
pkt->dts += delta; pkt->dts += delta;
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment