diff mbox

[FFmpeg-devel,1/2] crystalhd: Fix handling of PTS

Message ID 1476035413-16516-2-git-send-email-philipl@overt.org
State Accepted
Commit b5f45208fbe5373c7f9112a8169933b73a8478e1
Headers show

Commit Message

Philip Langdale Oct. 9, 2016, 5:50 p.m. UTC 
With all the various refactorings that have happened over the years,
the current pts logic is very broken for non-trivial cases (ie: ones
where not every frame/field has a meaningful pts assocated with it).

Generally, we do not want to write AV_NOPTS_VALUE as the output
timestamp, regardless of anything else. It's better to pass zero
if there's no other information.

Additionally, interlaced content where the decoder returns each field
separately can result in the first field carrying the timestamp and
the second having AV_NOPTS_VALUE. It's clearly wrong to overwrite
the valid timestamp.

So, let's just never write AV_NOPTS_VALUE into an output frame.

Empirically, this fixed playback of interlaced mpeg2 and h.264 and
mpeg4-asp with packed b-frames in an avi container.
---
 libavcodec/crystalhd.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c
index 0f5101a..83be8e5 100644
--- a/libavcodec/crystalhd.c
+++ b/libavcodec/crystalhd.c
@@ -707,12 +707,17 @@  static inline CopyRet copy_frame(AVCodecContext *avctx,
     if (interlaced)
         priv->pic->top_field_first = !bottom_first;
 
-    priv->pic->pts = pkt_pts;
+    if (pkt_pts != AV_NOPTS_VALUE) {
+        priv->pic->pts = pkt_pts;
 #if FF_API_PKT_PTS
 FF_DISABLE_DEPRECATION_WARNINGS
-    priv->pic->pkt_pts = pkt_pts;
+        priv->pic->pkt_pts = pkt_pts;
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
+    }
+    av_frame_set_pkt_pos(priv->pic, -1);
+    av_frame_set_pkt_duration(priv->pic, 0);
+    av_frame_set_pkt_size(priv->pic, -1);
 
     if (!priv->need_second_field) {
         *got_frame       = 1;
@@ -966,8 +971,8 @@  static int decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *a
                 H264Context *h = priv->parser->priv_data;
 
                 index = av_parser_parse2(priv->parser, avctx, &pout, &psize,
-                                         in_data, len, avctx->internal->pkt->pts,
-                                         avctx->internal->pkt->dts, 0);
+                                         in_data, len, avpkt->pts,
+                                         avpkt->dts, 0);
                 if (index < 0) {
                     av_log(avctx, AV_LOG_WARNING,
                            "CrystalHD: Failed to parse h.264 packet to "
@@ -1001,7 +1006,8 @@  static int decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *a
              * avoiding mangling so we need to build a mapping to values
              * we know will not be mangled.
              */
-            uint64_t pts = opaque_list_push(priv, avctx->internal->pkt->pts, pic_type);
+            int64_t safe_pts = avpkt->pts == AV_NOPTS_VALUE ? 0 : avpkt->pts;
+            uint64_t pts = opaque_list_push(priv, safe_pts, pic_type);
             if (!pts) {
                 if (free_data) {
                     av_freep(&in_data);