diff mbox series

[FFmpeg-devel,20/20] avformat/matroskaenc: Avoid seek when writing Cues at the front

Message ID 20200101005837.11356-21-andreas.rheinhardt@gmail.com
State Superseded
Headers show
Series Matroska muxer patches | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 1, 2020, 12:58 a.m. UTC 
When the Cues are written in front of the Cluster, the muxer would seek
to the beginning (to where the Cues ought to be written) and write the
Cues; afterwards it would seek back to the end of the file only to seek
to the beginning once again to update several elements there. This
commit removes the seek to the end.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/matroskaenc.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 24317d3819..95d97a10c5 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2449,7 +2449,6 @@  static int mkv_write_trailer(AVFormatContext *s)
 {
     MatroskaMuxContext *mkv = s->priv_data;
     AVIOContext *pb = s->pb;
-    int64_t currentpos;
     int ret;
 
     // check if we have an audio packet cached
@@ -2472,11 +2471,14 @@  static int mkv_write_trailer(AVFormatContext *s)
 
 
     if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
-        int64_t ret64;
+        int64_t endpos, ret64;
+
+        endpos = avio_tell(pb);
 
         if (mkv->cues.num_entries) {
             AVIOContext *cues;
             uint64_t size;
+            int64_t cuespos = endpos;
             int length_size = 0;
 
             ret = start_ebml_master_crc32(&cues, mkv);
@@ -2499,7 +2501,7 @@  static int mkv_write_trailer(AVFormatContext *s)
                            mkv->reserve_cues_space, size);
                     mkv->reserve_cues_space = 0;
                 } else {
-                    currentpos = avio_tell(pb);
+                    cuespos = mkv->cues_pos;
                     if ((ret64 = avio_seek(pb, mkv->cues_pos, SEEK_SET)) < 0) {
                         ffio_free_dyn_buf(&cues);
                         return ret64;
@@ -2515,17 +2517,15 @@  static int mkv_write_trailer(AVFormatContext *s)
                     }
                 }
             }
-            mkv_add_seekhead_entry(mkv, MATROSKA_ID_CUES, avio_tell(pb));
+            mkv_add_seekhead_entry(mkv, MATROSKA_ID_CUES, cuespos);
             end_ebml_master_crc32(pb, &cues, mkv, MATROSKA_ID_CUES, length_size);
             if (mkv->reserve_cues_space) {
                 if (size < mkv->reserve_cues_space)
                     put_ebml_void(pb, mkv->reserve_cues_space - size);
-                avio_seek(pb, currentpos, SEEK_SET);
-            }
+            } else
+                endpos = avio_tell(pb);
         }
 
-        currentpos = avio_tell(pb);
-
         ret = mkv_write_seekhead(pb, mkv, 1, mkv->info_pos);
         if (ret < 0)
             return ret;
@@ -2571,7 +2571,7 @@  static int mkv_write_trailer(AVFormatContext *s)
             end_ebml_master_crc32(pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS, 0);
         }
 
-        avio_seek(pb, currentpos, SEEK_SET);
+        avio_seek(pb, endpos, SEEK_SET);
     }
 
     if (!mkv->is_live) {