From 9e2c056c278f92fd412ed840e5776f2f00942fc9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 4 Nov 2018 09:21:20 +0100 Subject: [PATCH] ffmpeg: fix timestamp tracing Use ffmpeg functions to format the timestamps. Change-Id: Idd51feb22fc6c5a70e177604eb995ae2d8601cd4 Reviewed-on: https://review.haiku-os.org/663 Reviewed-by: waddlesplash --- src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 11 ++++++----- src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp index 12f8d36cb9..aa462137f8 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp @@ -1589,11 +1589,12 @@ AVCodecDecoder::_UpdateMediaHeaderForVideoFrame() fHeader.u.raw_video.pixel_width_aspect, fHeader.u.raw_video.pixel_height_aspect); - TRACE("[v] start_time=%02d:%02d.%02d field_sequence=%lu\n", - int((fHeader.start_time / 60000000) % 60), - int((fHeader.start_time / 1000000) % 60), - int((fHeader.start_time / 10000) % 100), - fHeader.u.raw_video.field_sequence); + char timestamp[AV_TS_MAX_STRING_SIZE]; + av_ts_make_time_string(timestamp, + fRawDecodedPicture->best_effort_timestamp, &fCodecContext->time_base); + + TRACE("[v] start_time=%s field_sequence=%lu\n", + timestamp, fHeader.u.raw_video.field_sequence); } diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h index 52b8e40132..322cda65f6 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h @@ -25,6 +25,7 @@ extern "C" { #include "imgutils.h" #include "swresample.h" #include "swscale.h" + #include "timestamp.h" }