Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] format/imfdec: improve error handling when selecting tracks for playback
@ 2022-09-07 20:02 pal
  2022-09-14 17:21 ` Pierre-Anthony Lemieux
  2022-09-16 17:26 ` Michael Niedermayer
  0 siblings, 2 replies; 11+ messages in thread
From: pal @ 2022-09-07 20:02 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Pierre-Anthony Lemieux

From: Pierre-Anthony Lemieux <pal@palemieux.com>

Addresses coverity 1512414

---
 libavformat/imfdec.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index 5bbe7a53f8..58b1455c9f 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -681,8 +681,11 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma
 {
     IMFContext *c = s->priv_data;
     IMFVirtualTrackPlaybackCtx *track;
+    AVRational minimum_timestamp = av_make_q(INT_MAX, 1);
+
+    if (!c->track_count)
+        return NULL;
 
-    AVRational minimum_timestamp = av_make_q(INT32_MAX, 1);
     for (uint32_t i = c->track_count; i > 0; i--) {
         av_log(s, AV_LOG_TRACE, "Compare track %d timestamp " AVRATIONAL_FORMAT
                " to minimum " AVRATIONAL_FORMAT
@@ -697,8 +700,6 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma
         }
     }
 
-    av_log(s, AV_LOG_DEBUG, "Found next track to read: %d (timestamp: %lf / %lf)\n",
-           track->index, av_q2d(track->current_timestamp), av_q2d(minimum_timestamp));
     return track;
 }
 
@@ -761,6 +762,14 @@ static int imf_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     track = get_next_track_with_minimum_timestamp(s);
 
+    if (!track) {
+        av_log(s, AV_LOG_ERROR, "No track found for playback\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    av_log(s, AV_LOG_DEBUG, "Found track %d to read at timestamp %lf\n",
+           track->index, av_q2d(track->current_timestamp));
+
     ret = get_resource_context_for_timestamp(s, track, &resource);
     if (ret)
         return ret;
-- 
2.25.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-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-09-19 14:47 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-07 20:02 [FFmpeg-devel] [PATCH] format/imfdec: improve error handling when selecting tracks for playback pal
2022-09-14 17:21 ` Pierre-Anthony Lemieux
2022-09-16 17:26 ` Michael Niedermayer
2022-09-16 17:39   ` Pierre-Anthony Lemieux
2022-09-16 19:51     ` Pierre-Anthony Lemieux
2022-09-16 20:14     ` Michael Niedermayer
2022-09-16 20:19       ` Pierre-Anthony Lemieux
2022-09-17 14:43         ` Michael Niedermayer
2022-09-17 15:57           ` Pierre-Anthony Lemieux
2022-09-19 14:42             ` Michael Niedermayer
2022-09-19 14:47               ` Pierre-Anthony Lemieux

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git