[FFmpeg-devel] [PATCH V2] libavformat/rtpdec_jpeg.c: Allow sender to include the qtable in fragment offset calculation

[Hayden Myers via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

Signed-off-by: Hayden Myers <haydenm315@gmail.com>
---
 libavformat/rtpdec_jpeg.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 4d9ee0d754..be2316da9b 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -353,9 +353,25 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg,
     }
 
     if (off != avio_tell(jpeg->frame) - jpeg->hdr_size) {
-        av_log(ctx, AV_LOG_ERROR,
-               "Missing packets; dropping frame.\n");
-        return AVERROR(EAGAIN);
+        /* The fragment offset may include the quant table data. Allow the
+         * offset to differ by the size of the quant header and table.
+         */
+
+        // Default to 2 * 64 byte tables for 8 bit precision.
+        int qtable_len =  128;
+
+        // Use the q table len value stored in the ctx
+        if (q > 127 && q < 255)
+            qtable_len = jpeg->qtables_len[q-128];
+
+        // account for MBZ, Precision, and Length bytes.
+        qtable_len += 4;
+
+        if (off != (avio_tell(jpeg->frame) - (jpeg->hdr_size - qtable_len))) {
+            av_log(ctx, AV_LOG_ERROR,
+                "Missing packets; dropping frame.\n");
+            return AVERROR(EAGAIN);
+        }
     }
 
     /* Copy data to frame buffer. */
-- 
2.43.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org