GetTime may return an error indication that the sample has not timestamps, or
may return a NULL start time. In those cases, fall back to graph time
better debug message in case sample dropped: could now be audio or video frame
Signed-off-by: Diederick Niehorster <dcni...@gmail.com>
---
libavdevice/dshow_pin.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavdevice/dshow_pin.c b/libavdevice/dshow_pin.c
index 8408af26da..160f1e1324 100644
--- a/libavdevice/dshow_pin.c
+++ b/libavdevice/dshow_pin.c
@@ -295,8 +295,8 @@ long ff_dshow_meminputpin_Receive(DShowMemInputPin *this,
IMediaSample *sample)
uint8_t *buf;
int buf_size; /* todo should be a long? */
int index;
- int64_t curtime;
- int64_t orig_curtime;
+ int64_t curtime = 0;
+ int64_t orig_curtime = 0;
int64_t graphtime;
const char *devtypename = (devtype == VideoDevice) ? "video" : "audio";
IReferenceClock *clock = pin->filter->clock;
@@ -320,13 +320,15 @@ long ff_dshow_meminputpin_Receive(DShowMemInputPin *this,
IMediaSample *sample)
/* PTS from video devices is unreliable. */
curtime = graphtime;
} else {
- IMediaSample_GetTime(sample, &curtime, &dummy);
- if(curtime > 400000000000000000LL) {
+ HRESULT hr = IMediaSample_GetTime(sample, &curtime, &dummy);
+ if (hr==VFW_E_SAMPLE_TIME_NOT_SET || curtime==0) {
+ curtime = graphtime;
+ } else if (curtime > 400000000000000000LL) {
/* initial frames sometimes start < 0 (shown as a very large
number here,
like 437650244077016960 which FFmpeg doesn't like.
TODO figure out math. For now just drop them. */
av_log(NULL, AV_LOG_DEBUG,
- "dshow dropping initial (or ending) audio frame with odd PTS
too high %"PRId64"\n", curtime);
+ "dshow dropping initial (or ending) audio with odd PTS too
high %"PRId64"\n", curtime);
return S_OK;
}
curtime += pin->filter->start_time;
--
2.28.0.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
