* Re: [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
@ 2022-01-16 22:51 ` James Almer
2022-01-16 23:05 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 02/25] avformat/matroskaenc: Don't open BlockGroup twice Andreas Rheinhardt
` (30 subsequent siblings)
31 siblings, 1 reply; 35+ messages in thread
From: James Almer @ 2022-01-16 22:51 UTC (permalink / raw)
To: ffmpeg-devel
On 1/16/2022 7:49 PM, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavformat/matroskaenc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> index 41b2df7dbf..1dde12a7d9 100644
> --- a/libavformat/matroskaenc.c
> +++ b/libavformat/matroskaenc.c
> @@ -286,7 +286,7 @@ static void put_ebml_uint(AVIOContext *pb, uint32_t elementid, uint64_t val)
> static void put_ebml_sint(AVIOContext *pb, uint32_t elementid, int64_t val)
> {
> int i, bytes = 1;
> - uint64_t tmp = 2*(val < 0 ? val^-1 : val);
> + uint64_t tmp = 2 * (uint64_t)(val < 0 ? val^-1 : val);
nit: 2ULL is shorter.
>
> while (tmp >>= 8)
> bytes++;
_______________________________________________
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] 35+ messages in thread* Re: [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow
2022-01-16 22:51 ` James Almer
@ 2022-01-16 23:05 ` Andreas Rheinhardt
0 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:05 UTC (permalink / raw)
To: ffmpeg-devel
James Almer:
>
>
> On 1/16/2022 7:49 PM, Andreas Rheinhardt wrote:
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> libavformat/matroskaenc.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
>> index 41b2df7dbf..1dde12a7d9 100644
>> --- a/libavformat/matroskaenc.c
>> +++ b/libavformat/matroskaenc.c
>> @@ -286,7 +286,7 @@ static void put_ebml_uint(AVIOContext *pb,
>> uint32_t elementid, uint64_t val)
>> static void put_ebml_sint(AVIOContext *pb, uint32_t elementid,
>> int64_t val)
>> {
>> int i, bytes = 1;
>> - uint64_t tmp = 2*(val < 0 ? val^-1 : val);
>> + uint64_t tmp = 2 * (uint64_t)(val < 0 ? val^-1 : val);
>
> nit: 2ULL is shorter.
>
This is correct, but the above is more natural; after all, it is (val <
0 ? val^-1 : val) that is reinterpreted as uint64_t.
- Andreas
_______________________________________________
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] 35+ messages in thread
* [FFmpeg-devel] [PATCH 02/25] avformat/matroskaenc: Don't open BlockGroup twice
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
2022-01-16 22:51 ` James Almer
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 03/25] avformat/matroskaenc: Add API to write Masters with minimal length field Andreas Rheinhardt
` (29 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This would happen in case non-WebVTT-subtitles had BlockAdditional
or DiscardPadding side-data. Given that these are not accounted for
in the length of the outer BlockGroup (which is a quite sharp upper
bound) it is possible for the outer BlockGroup to use an insufficient
number of bytes which leads to an assert in end_ebml_master().
Fix this by not opening a second BlockGroup inside an already opened
BlockGroup.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 1dde12a7d9..81194fd28d 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2095,6 +2095,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
int64_t discard_padding = 0;
unsigned track_number = track->track_num;
ebml_master block_group, block_additions, block_more;
+ int blockgroup_already_opened = blockid == MATROSKA_ID_BLOCK;
ts += track->ts_offset;
@@ -2141,7 +2142,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES,
&side_data_size);
- if (side_data && side_data_size >= 10) {
+ if (side_data && side_data_size >= 10 && !blockgroup_already_opened) {
discard_padding = av_rescale_q(AV_RL32(side_data + 4),
(AVRational){1, par->sample_rate},
(AVRational){1, 1000000000});
@@ -2152,7 +2153,8 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
&side_data_size);
if (side_data) {
// Only the Codec-specific BlockMore (id == 1) is currently supported.
- if (side_data_size < 8 || (additional_id = AV_RB64(side_data)) != 1) {
+ if (side_data_size < 8 || (additional_id = AV_RB64(side_data)) != 1 ||
+ blockgroup_already_opened) {
side_data_size = 0;
} else {
side_data += 8;
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 03/25] avformat/matroskaenc: Add API to write Masters with minimal length field
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
2022-01-16 22:51 ` James Almer
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 02/25] avformat/matroskaenc: Don't open BlockGroup twice Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 04/25] avformat/matroskaenc: Don't waste bytes on SimpleTags length fields Andreas Rheinhardt
` (28 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This muxer currently uses two ways to ensure that no bytes
are wasted by writing unnecessary long EBML length fields
for Master elements and the (Simple)Block element
(all the other elements are fine as one either already has
the right length or getting the actual length is easy
and necessary anyway):
Either use an upper bound that is good enough in case one
is available or write the data into a dynamic buffer first
to get the length; the former approach is impossible in
lots of cases, whereas the latter incurs allocations and
memcpying. It is therefore unfeasible to use the latter
to e.g.
This patch adds a third alternative to complement the former two:
It consists of an EbmlWriter that one can add EBML elements to
that can be written later by calling ebml_writer_write();
the latter function first traverses the written elements recursively
and calculates the length of each element; then a second pass
is performed in which all the elements are written directly
(without any seeks).
This new API also performs checks for overlong elements;
this is in contrast to put_ebml_string() which simply performs
a size_t->int conversion even for strings originating from the user.
The new API is designed to have very low overhead: It is designed
to use a stack array and performs no allocations; this also comes
at a price: Right now, it can only be used in contexts in which
there is a compile-time upper bound for the number of elements.
It is also incompatible with storing the offset of an element
in order to update this field later. Furthermore, it puts
the onus of memory management (i.e. ensuring that pointers stay valid)
on the user.
These restrictions might be overcome in the future.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 248 ++++++++++++++++++++++++++++++++++++++
1 file changed, 248 insertions(+)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 81194fd28d..4ec2074d2c 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -61,6 +61,12 @@
* Info, Tracks, Chapters, Attachments, Tags (potentially twice) and Cues */
#define MAX_SEEKHEAD_ENTRIES 7
+/* Largest known-length EBML length */
+#define MAX_EBML_LENGTH ((1ULL << 56) - 2)
+/* The dynamic buffer API we rely upon has a limit of INT_MAX;
+ * and so has avio_write(). */
+#define MAX_SUPPORTED_EBML_LENGTH FFMIN(MAX_EBML_LENGTH, INT_MAX)
+
#define MODE_MATROSKAv2 0x01
#define MODE_WEBM 0x02
@@ -85,6 +91,48 @@ typedef struct ebml_stored_master {
int64_t pos;
} ebml_stored_master;
+typedef enum EbmlType {
+ EBML_UINT,
+ EBML_SINT,
+ EBML_FLOAT,
+ EBML_UID,
+ EBML_STR,
+ EBML_UTF8 = EBML_STR,
+ EBML_BIN,
+ EBML_MASTER,
+} EbmlType;
+
+typedef struct EbmlMaster {
+ int nb_elements; ///< -1 if not finished
+ int containing_master; ///< -1 if no parent exists
+} EbmlMaster;
+
+typedef struct EbmlElement {
+ uint32_t id;
+ EbmlType type;
+ unsigned length_size;
+ uint64_t size; ///< excluding id and length field
+ union {
+ uint64_t uint;
+ int64_t sint;
+ double f;
+ const char *str;
+ const uint8_t *bin;
+ EbmlMaster master;
+ } priv;
+} EbmlElement;
+
+typedef struct EbmlWriter {
+ unsigned nb_elements;
+ int current_master_element;
+ EbmlElement *elements;
+} EbmlWriter;
+
+#define EBML_WRITER(max_nb_elems) \
+ EbmlElement elements[max_nb_elems]; \
+ EbmlWriter writer = (EbmlWriter){ .elements = elements, \
+ .current_master_element = -1 }
+
typedef struct mkv_seekhead_entry {
uint32_t elementid;
uint64_t segmentpos;
@@ -362,6 +410,206 @@ static void end_ebml_master(AVIOContext *pb, ebml_master master)
avio_seek(pb, pos, SEEK_SET);
}
+static EbmlElement *ebml_writer_add(EbmlWriter *writer,
+ uint32_t id, EbmlType type)
+{
+ writer->elements[writer->nb_elements].id = id;
+ writer->elements[writer->nb_elements].type = type;
+ return &writer->elements[writer->nb_elements++];
+}
+
+static void ebml_writer_open_master(EbmlWriter *writer, uint32_t id)
+{
+ EbmlMaster *master = &ebml_writer_add(writer, id, EBML_MASTER)->priv.master;
+
+ master->containing_master = writer->current_master_element;
+ master->nb_elements = -1;
+
+ writer->current_master_element = writer->nb_elements - 1;
+}
+
+static void ebml_writer_add_string(EbmlWriter *writer, uint32_t id,
+ const char *str)
+{
+ EbmlElement *elem = ebml_writer_add(writer, id, EBML_STR);
+
+ elem->priv.str = str;
+}
+
+static void ebml_writer_add_bin(EbmlWriter *writer, uint32_t id,
+ const uint8_t *data, size_t size)
+{
+ EbmlElement *elem = ebml_writer_add(writer, id, EBML_BIN);
+
+#if SIZE_MAX > UINT64_MAX
+ size = FFMIN(size, UINT64_MAX);
+#endif
+ elem->size = size;
+ elem->priv.bin = data;
+}
+
+static void ebml_writer_add_float(EbmlWriter *writer, uint32_t id,
+ double val)
+{
+ EbmlElement *elem = ebml_writer_add(writer, id, EBML_FLOAT);
+
+ elem->priv.f = val;
+}
+
+static void ebml_writer_add_uid(EbmlWriter *writer, uint32_t id,
+ uint64_t val)
+{
+ EbmlElement *elem = ebml_writer_add(writer, id, EBML_UID);
+ elem->priv.uint = val;
+}
+
+static int ebml_writer_str_len(EbmlElement *elem)
+{
+ size_t len = strlen(elem->priv.str);
+#if SIZE_MAX > UINT64_MAX
+ len = FF_MIN(len, UINT64_MAX);
+#endif
+ elem->size = len;
+ return 0;
+}
+
+static av_const int uint_size(uint64_t val)
+{
+ int bytes = 0;
+ do {
+ bytes++;
+ } while (val >>= 8);
+ return bytes;
+}
+
+static int ebml_writer_uint_len(EbmlElement *elem)
+{
+ elem->size = uint_size(elem->priv.uint);
+ return 0;
+}
+
+static av_const int sint_size(int64_t val)
+{
+ uint64_t tmp = 2 * (uint64_t)(val < 0 ? val^-1 : val);
+ return uint_size(tmp);
+}
+
+static int ebml_writer_sint_len(EbmlElement *elem)
+{
+ elem->size = sint_size(elem->priv.sint);
+ return 0;
+}
+
+static int ebml_writer_elem_len(EbmlWriter *writer, EbmlElement *elem,
+ int remaining_elems);
+
+static int ebml_writer_master_len(EbmlWriter *writer, EbmlElement *elem,
+ int remaining_elems)
+{
+ int nb_elems = elem->priv.master.nb_elements >= 0 ? elem->priv.master.nb_elements : remaining_elems - 1;
+ EbmlElement *const master = elem;
+ uint64_t total_size = 0;
+
+ master->priv.master.nb_elements = nb_elems;
+ for (; elem++, nb_elems > 0;) {
+ int ret = ebml_writer_elem_len(writer, elem, nb_elems);
+ if (ret < 0)
+ return ret;
+ av_assert2(ret < nb_elems);
+ /* No overflow is possible here, as both total_size and elem->size
+ * are bounded by MAX_SUPPORTED_EBML_LENGTH. */
+ total_size += ebml_id_size(elem->id) + elem->length_size + elem->size;
+ if (total_size > MAX_SUPPORTED_EBML_LENGTH)
+ return AVERROR(ERANGE);
+ nb_elems--; /* consume elem */
+ elem += ret, nb_elems -= ret; /* and elem's children */
+ }
+ master->size = total_size;
+
+ return master->priv.master.nb_elements;
+}
+
+static int ebml_writer_elem_len(EbmlWriter *writer, EbmlElement *elem,
+ int remaining_elems)
+{
+ int ret = 0;
+
+ switch (elem->type) {
+ case EBML_FLOAT:
+ case EBML_UID:
+ elem->size = 8;
+ break;
+ case EBML_STR:
+ ret = ebml_writer_str_len(elem);
+ break;
+ case EBML_UINT:
+ ret = ebml_writer_uint_len(elem);
+ break;
+ case EBML_SINT:
+ ret = ebml_writer_sint_len(elem);
+ break;
+ case EBML_MASTER:
+ ret = ebml_writer_master_len(writer, elem, remaining_elems);
+ break;
+ }
+ if (ret < 0)
+ return ret;
+ if (elem->size > MAX_SUPPORTED_EBML_LENGTH)
+ return AVERROR(ERANGE);
+ elem->length_size = ebml_length_size(elem->size);
+ return ret; /* number of elements consumed excluding elem itself */
+}
+
+static int ebml_writer_elem_write(const EbmlElement *elem, AVIOContext *pb)
+{
+ put_ebml_id(pb, elem->id);
+ put_ebml_num(pb, elem->size, elem->length_size);
+ switch (elem->type) {
+ case EBML_UID:
+ case EBML_FLOAT: {
+ uint64_t val = elem->type == EBML_UID ? elem->priv.uint
+ : av_double2int(elem->priv.f);
+ avio_wb64(pb, val);
+ break;
+ }
+ case EBML_UINT:
+ case EBML_SINT: {
+ uint64_t val = elem->type == EBML_UINT ? elem->priv.uint
+ : elem->priv.sint;
+ for (int i = elem->size; --i >= 0; )
+ avio_w8(pb, (uint8_t)(val >> i * 8));
+ break;
+ }
+ case EBML_STR:
+ case EBML_BIN: {
+ const uint8_t *data = elem->type == EBML_BIN ? elem->priv.bin
+ : (const uint8_t*)elem->priv.str;
+ avio_write(pb, data, elem->size);
+ break;
+ }
+ case EBML_MASTER: {
+ int nb_elems = elem->priv.master.nb_elements;
+
+ elem++;
+ for (int i = 0; i < nb_elems; i++)
+ i += ebml_writer_elem_write(elem + i, pb);
+
+ return nb_elems;
+ }
+ }
+ return 0;
+}
+
+static int ebml_writer_write(EbmlWriter *writer, AVIOContext *pb)
+{
+ int ret = ebml_writer_elem_len(writer, writer->elements,
+ writer->nb_elements);
+ if (ret < 0)
+ return ret;
+ ebml_writer_elem_write(writer->elements, pb);
+ return 0;
+}
+
static void mkv_add_seekhead_entry(MatroskaMuxContext *mkv, uint32_t elementid,
uint64_t filepos)
{
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 04/25] avformat/matroskaenc: Don't waste bytes on SimpleTags length fields
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (2 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 03/25] avformat/matroskaenc: Add API to write Masters with minimal length field Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 05/25] avformat/matroskaenc: Don't waste bytes when writing attachments Andreas Rheinhardt
` (27 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Also check the (user-provided) tags for being overlong; the earlier
code had an implicit unchecked size_t->int conversion.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 15 ++++---
tests/ref/fate/matroska-dovi-write-config7 | 4 +-
| 4 +-
tests/ref/fate/matroska-h264-remux | 4 +-
.../fate/matroska-mastering-display-metadata | 4 +-
tests/ref/fate/matroska-move-cues-to-front | 4 +-
tests/ref/fate/matroska-qt-mode | 4 +-
tests/ref/fate/matroska-vp8-alpha-remux | 4 +-
tests/ref/fate/matroska-zero-length-block | 4 +-
tests/ref/fate/rgb24-mkv | 4 +-
tests/ref/fate/webm-dash-chapters | 4 +-
tests/ref/lavf/mka | 4 +-
tests/ref/lavf/mkv | 4 +-
tests/ref/lavf/mkv_attachment | 4 +-
tests/ref/seek/lavf-mkv | 44 +++++++++----------
15 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 4ec2074d2c..154de25f59 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1753,10 +1753,11 @@ static int mkv_write_tracks(AVFormatContext *s)
static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t)
{
+ EBML_WRITER(4);
uint8_t *key = av_strdup(t->key);
uint8_t *p = key;
const uint8_t *lang = NULL;
- ebml_master tag;
+ int ret;
if (!key)
return AVERROR(ENOMEM);
@@ -1774,15 +1775,15 @@ static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t)
p++;
}
- tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
- put_ebml_string(pb, MATROSKA_ID_TAGNAME, key);
+ ebml_writer_open_master(&writer, MATROSKA_ID_SIMPLETAG);
+ ebml_writer_add_string(&writer, MATROSKA_ID_TAGNAME, key);
if (lang)
- put_ebml_string(pb, MATROSKA_ID_TAGLANG, lang);
- put_ebml_string(pb, MATROSKA_ID_TAGSTRING, t->value);
- end_ebml_master(pb, tag);
+ ebml_writer_add_string(&writer, MATROSKA_ID_TAGLANG, lang);
+ ebml_writer_add_string(&writer, MATROSKA_ID_TAGSTRING, t->value);
+ ret = ebml_writer_write(&writer, pb);
av_freep(&key);
- return 0;
+ return ret;
}
static int mkv_write_tag_targets(MatroskaMuxContext *mkv, AVIOContext **pb,
diff --git a/tests/ref/fate/matroska-dovi-write-config7 b/tests/ref/fate/matroska-dovi-write-config7
index 1c1422c0e4..b652fe411d 100644
--- a/tests/ref/fate/matroska-dovi-write-config7
+++ b/tests/ref/fate/matroska-dovi-write-config7
@@ -1,5 +1,5 @@
-3fa1f47c5c3d22b5c33156ff14928d6c *tests/data/fate/matroska-dovi-write-config7.matroska
-72758 tests/data/fate/matroska-dovi-write-config7.matroska
+058e95f1effefe3842b6174bba2693fc *tests/data/fate/matroska-dovi-write-config7.matroska
+72707 tests/data/fate/matroska-dovi-write-config7.matroska
#extradata 0: 116, 0x2b8d1669
#extradata 1: 116, 0x2b8d1669
#tb 0: 1/1000
--git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update
index 1a8add7736..260d596904 100644
--- a/tests/ref/fate/matroska-flac-extradata-update
+++ b/tests/ref/fate/matroska-flac-extradata-update
@@ -1,5 +1,5 @@
-c2b76d47a9f0e9626a4999bd395cae08 *tests/data/fate/matroska-flac-extradata-update.matroska
-2029 tests/data/fate/matroska-flac-extradata-update.matroska
+56ff5763fd81ad3bc02c22402cd685e2 *tests/data/fate/matroska-flac-extradata-update.matroska
+2008 tests/data/fate/matroska-flac-extradata-update.matroska
#extradata 0: 34, 0x7acb09e7
#extradata 1: 34, 0x7acb09e7
#extradata 2: 34, 0x443402dd
diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux
index b5ecebaf24..e55708ce37 100644
--- a/tests/ref/fate/matroska-h264-remux
+++ b/tests/ref/fate/matroska-h264-remux
@@ -1,5 +1,5 @@
-36fda8942bfed91fed04c5ba63dc8b1a *tests/data/fate/matroska-h264-remux.matroska
-2036089 tests/data/fate/matroska-h264-remux.matroska
+ae0ccd32cc0d3bfc1eaa15c7fc985dfb *tests/data/fate/matroska-h264-remux.matroska
+2036075 tests/data/fate/matroska-h264-remux.matroska
#tb 0: 1/25
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata
index 8f5d7b6a22..f13d60ff2f 100644
--- a/tests/ref/fate/matroska-mastering-display-metadata
+++ b/tests/ref/fate/matroska-mastering-display-metadata
@@ -1,5 +1,5 @@
-542ababe5c088ab925ee49373d8b8a85 *tests/data/fate/matroska-mastering-display-metadata.matroska
-1669695 tests/data/fate/matroska-mastering-display-metadata.matroska
+64403411e52d7ba9081ab5692e422737 *tests/data/fate/matroska-mastering-display-metadata.matroska
+1669597 tests/data/fate/matroska-mastering-display-metadata.matroska
#extradata 0: 4, 0x040901a3
#extradata 3: 200, 0x506463a8
#tb 0: 1/1000
diff --git a/tests/ref/fate/matroska-move-cues-to-front b/tests/ref/fate/matroska-move-cues-to-front
index 46effff53e..55a03b8c10 100644
--- a/tests/ref/fate/matroska-move-cues-to-front
+++ b/tests/ref/fate/matroska-move-cues-to-front
@@ -1,5 +1,5 @@
-ce15d8b7577933a057c413af505500df *tests/data/fate/matroska-move-cues-to-front.matroska
-23210310 tests/data/fate/matroska-move-cues-to-front.matroska
+62064edeb4a621fd0097f04c410c165c *tests/data/fate/matroska-move-cues-to-front.matroska
+23210303 tests/data/fate/matroska-move-cues-to-front.matroska
#tb 0: 1/1000
#media_type 0: audio
#codec_id 0: pcm_s24be
diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode
index 9dc115cc0d..770d9e7e91 100644
--- a/tests/ref/fate/matroska-qt-mode
+++ b/tests/ref/fate/matroska-qt-mode
@@ -1,5 +1,5 @@
-a741bd63da27d6b8ce3a21009267703d *tests/data/fate/matroska-qt-mode.matroska
-1884278 tests/data/fate/matroska-qt-mode.matroska
+1e525172caec2bf4e191a68c97bbbc51 *tests/data/fate/matroska-qt-mode.matroska
+1884243 tests/data/fate/matroska-qt-mode.matroska
#extradata 0: 90, 0x817d0185
#tb 0: 1/1000
#media_type 0: video
diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux
index adb771df88..165c2404e7 100644
--- a/tests/ref/fate/matroska-vp8-alpha-remux
+++ b/tests/ref/fate/matroska-vp8-alpha-remux
@@ -1,5 +1,5 @@
-d06be833da8e8d9d00bf334e0dfe8a58 *tests/data/fate/matroska-vp8-alpha-remux.matroska
-237192 tests/data/fate/matroska-vp8-alpha-remux.matroska
+e3912762161bb6e7f9607c085b371676 *tests/data/fate/matroska-vp8-alpha-remux.matroska
+237185 tests/data/fate/matroska-vp8-alpha-remux.matroska
#tb 0: 1/1000
#media_type 0: video
#codec_id 0: vp8
diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block
index e8c5decb39..924cec1e3f 100644
--- a/tests/ref/fate/matroska-zero-length-block
+++ b/tests/ref/fate/matroska-zero-length-block
@@ -1,5 +1,5 @@
-ba78b3e846d57002711bc481fa806717 *tests/data/fate/matroska-zero-length-block.matroska
-643 tests/data/fate/matroska-zero-length-block.matroska
+f37ba7e8a30eaa33c1fd0ef77447fb41 *tests/data/fate/matroska-zero-length-block.matroska
+636 tests/data/fate/matroska-zero-length-block.matroska
#tb 0: 1/1000
#media_type 0: subtitle
#codec_id 0: subrip
diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv
index 1ef70349b7..2630265ebc 100644
--- a/tests/ref/fate/rgb24-mkv
+++ b/tests/ref/fate/rgb24-mkv
@@ -1,5 +1,5 @@
-6244b8750d4155d3c9357bab26396ef9 *tests/data/fate/rgb24-mkv.matroska
-58245 tests/data/fate/rgb24-mkv.matroska
+2c7192d8b62c6a11e311a09ab3bef3b8 *tests/data/fate/rgb24-mkv.matroska
+58224 tests/data/fate/rgb24-mkv.matroska
#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters
index c04fc6a3ee..c2f87b2d7c 100644
--- a/tests/ref/fate/webm-dash-chapters
+++ b/tests/ref/fate/webm-dash-chapters
@@ -1,5 +1,5 @@
-c39ad75ef516d1d2e1332d960ad1057b *tests/data/fate/webm-dash-chapters.webm
-111239 tests/data/fate/webm-dash-chapters.webm
+d3a67db17fdca71b9f8cf57c341a031b *tests/data/fate/webm-dash-chapters.webm
+111218 tests/data/fate/webm-dash-chapters.webm
#extradata 0: 3469, 0xc6769ddc
#tb 0: 1/1000
#media_type 0: audio
diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka
index 9c0ec88637..5d4ab243c0 100644
--- a/tests/ref/lavf/mka
+++ b/tests/ref/lavf/mka
@@ -1,3 +1,3 @@
-52d2c70afe0f9ac510819f723b5ceb3b *tests/data/lavf/lavf.mka
-43583 tests/data/lavf/lavf.mka
+036f852ae7ae18cf38ddc99ea39032fb *tests/data/lavf/lavf.mka
+43576 tests/data/lavf/lavf.mka
tests/data/lavf/lavf.mka CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 6e517efede..e737cdf6ac 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,3 @@
-c1af29ab33c9477049672b62da221552 *tests/data/lavf/lavf.mkv
-320438 tests/data/lavf/lavf.mkv
+3e37e53471f20f2b7169afd75cba70d2 *tests/data/lavf/lavf.mkv
+320424 tests/data/lavf/lavf.mkv
tests/data/lavf/lavf.mkv CRC=0xec6c3c68
diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment
index 86ba4180cb..0149bf2010 100644
--- a/tests/ref/lavf/mkv_attachment
+++ b/tests/ref/lavf/mkv_attachment
@@ -1,3 +1,3 @@
-a669ae1a502ff0c487eee99753e7bef0 *tests/data/lavf/lavf.mkv_attachment
-472593 tests/data/lavf/lavf.mkv_attachment
+6a77b40186840d596bd584182ac3a283 *tests/data/lavf/lavf.mkv_attachment
+472579 tests/data/lavf/lavf.mkv_attachment
tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv
index fc65b14cd0..37945246ab 100644
--- a/tests/ref/seek/lavf-mkv
+++ b/tests/ref/seek/lavf-mkv
@@ -1,48 +1,48 @@
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 686 size: 208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208
ret: 0 st:-1 flags:0 ts:-1.000000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
ret: 0 st: 0 flags:0 ts: 0.788000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
ret: 0 st: 0 flags:1 ts:-0.317000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
ret:-1 st: 1 flags:0 ts: 2.577000
ret: 0 st: 1 flags:1 ts: 1.471000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320159 size: 209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209
ret: 0 st:-1 flags:0 ts: 0.365002
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146870 size: 27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925
ret: 0 st:-1 flags:1 ts:-0.740831
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
ret:-1 st: 0 flags:0 ts: 2.153000
ret: 0 st: 0 flags:1 ts: 1.048000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
ret: 0 st: 1 flags:0 ts:-0.058000
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 686 size: 208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208
ret: 0 st: 1 flags:1 ts: 2.836000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320159 size: 209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209
ret:-1 st:-1 flags:0 ts: 1.730004
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146870 size: 27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925
ret: 0 st: 0 flags:0 ts:-0.482000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
ret: 0 st: 0 flags:1 ts: 2.413000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
ret:-1 st: 1 flags:0 ts: 1.307000
ret: 0 st: 1 flags:1 ts: 0.201000
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 686 size: 208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208
ret: 0 st:-1 flags:0 ts:-0.904994
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
ret: 0 st:-1 flags:1 ts: 1.989173
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
ret: 0 st: 0 flags:0 ts: 0.883000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
ret: 0 st: 0 flags:1 ts:-0.222000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
ret:-1 st: 1 flags:0 ts: 2.672000
ret: 0 st: 1 flags:1 ts: 1.566000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320159 size: 209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146870 size: 27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925
ret: 0 st:-1 flags:1 ts:-0.645825
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 05/25] avformat/matroskaenc: Don't waste bytes when writing attachments
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (3 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 04/25] avformat/matroskaenc: Don't waste bytes on SimpleTags length fields Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 06/25] avformat/matroskaenc: Avoid seeks when writing EBML header Andreas Rheinhardt
` (26 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 20 ++++++++++++--------
tests/ref/lavf/mkv_attachment | 4 ++--
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 154de25f59..0927e0b873 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2056,30 +2056,34 @@ static int mkv_write_attachments(AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) {
const AVStream *st = s->streams[i];
mkv_track *track = &mkv->tracks[i];
- ebml_master attached_file;
+ EBML_WRITER(6);
const AVDictionaryEntry *t;
const char *mimetype;
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
continue;
- attached_file = start_ebml_master(dyn_cp, MATROSKA_ID_ATTACHEDFILE, 0);
+ ebml_writer_open_master(&writer, MATROSKA_ID_ATTACHEDFILE);
if (t = av_dict_get(st->metadata, "title", NULL, 0))
- put_ebml_string(dyn_cp, MATROSKA_ID_FILEDESC, t->value);
+ ebml_writer_add_string(&writer, MATROSKA_ID_FILEDESC, t->value);
if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) {
av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i);
ffio_free_dyn_buf(&dyn_cp);
return AVERROR(EINVAL);
}
- put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value);
+ ebml_writer_add_string(&writer, MATROSKA_ID_FILENAME, t->value);
mimetype = get_mimetype(st);
av_assert0(mimetype);
- put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype);
- put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size);
- put_ebml_uid(dyn_cp, MATROSKA_ID_FILEUID, track->uid);
- end_ebml_master(dyn_cp, attached_file);
+ ebml_writer_add_string(&writer, MATROSKA_ID_FILEMIMETYPE, mimetype);
+ ebml_writer_add_bin(&writer, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size);
+ ebml_writer_add_uid(&writer, MATROSKA_ID_FILEUID, track->uid);
+ ret = ebml_writer_write(&writer, dyn_cp);
+ if (ret < 0) {
+ ffio_free_dyn_buf(&dyn_cp);
+ return ret;
+ }
}
return end_ebml_master_crc32(pb, &dyn_cp, mkv,
MATROSKA_ID_ATTACHMENTS, 0, 0, 1);
diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment
index 0149bf2010..4a2f9eb7f1 100644
--- a/tests/ref/lavf/mkv_attachment
+++ b/tests/ref/lavf/mkv_attachment
@@ -1,3 +1,3 @@
-6a77b40186840d596bd584182ac3a283 *tests/data/lavf/lavf.mkv_attachment
-472579 tests/data/lavf/lavf.mkv_attachment
+32b24b97956f1fbcfbc1a94aac8f6202 *tests/data/lavf/lavf.mkv_attachment
+472574 tests/data/lavf/lavf.mkv_attachment
tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 06/25] avformat/matroskaenc: Avoid seeks when writing EBML header
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (4 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 05/25] avformat/matroskaenc: Don't waste bytes when writing attachments Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 07/25] avformat/matroskaenc: Factor writing TrackVideo out Andreas Rheinhardt
` (25 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Using start/end_ebml_master() to write an EBML Master element
uses seeks under the hood. This does not work if the output is
unseekable with the AVIOContext's buffer being very small
(the size of the currently written Matroska EBML header is 40)
or with the AVIOContext being in direct mode, because then
this seek can't be performed in the AVIOContext's buffer.
So using an approach that does not rely on seeking at all
is preferable; this is achieved by switching to EbmlWriter.
Also factor writing the EBML header out into a function of its own.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 0927e0b873..4d4d270db1 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -214,10 +214,6 @@ typedef struct MatroskaMuxContext {
uint32_t segment_uid[4];
} MatroskaMuxContext;
-/** 2 bytes * 7 for EBML IDs, 7 1-byte EBML lengths, 6 1-byte uint,
- * 8 byte for "matroska" doctype string */
-#define MAX_EBML_HEADER_SIZE 35
-
/** 2 bytes * 3 for EBML IDs, 3 1-byte EBML lengths, 8 bytes for 64 bit
* offset, 4 bytes for target EBML ID */
#define MAX_SEEKENTRY_SIZE 21
@@ -463,6 +459,13 @@ static void ebml_writer_add_uid(EbmlWriter *writer, uint32_t id,
elem->priv.uint = val;
}
+static void ebml_writer_add_uint(EbmlWriter *writer, uint32_t id,
+ uint64_t val)
+{
+ EbmlElement *elem = ebml_writer_add(writer, id, EBML_UINT);
+ elem->priv.uint = val;
+}
+
static int ebml_writer_str_len(EbmlElement *elem)
{
size_t len = strlen(elem->priv.str);
@@ -2113,11 +2116,26 @@ static int64_t get_metadata_duration(AVFormatContext *s)
return max;
}
+static void ebml_write_header(AVIOContext *pb,
+ const char *doctype, int version)
+{
+ EBML_WRITER(8);
+ ebml_writer_open_master(&writer, EBML_ID_HEADER);
+ ebml_writer_add_uint (&writer, EBML_ID_EBMLVERSION, 1);
+ ebml_writer_add_uint (&writer, EBML_ID_EBMLREADVERSION, 1);
+ ebml_writer_add_uint (&writer, EBML_ID_EBMLMAXIDLENGTH, 4);
+ ebml_writer_add_uint (&writer, EBML_ID_EBMLMAXSIZELENGTH, 8);
+ ebml_writer_add_string(&writer, EBML_ID_DOCTYPE, doctype);
+ ebml_writer_add_uint (&writer, EBML_ID_DOCTYPEVERSION, version);
+ ebml_writer_add_uint (&writer, EBML_ID_DOCTYPEREADVERSION, 2);
+ /* The size is bounded, so no need to check this. */
+ ebml_writer_write(&writer, pb);
+}
+
static int mkv_write_header(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *pb = s->pb;
- ebml_master ebml_header;
const AVDictionaryEntry *tag;
int ret, i, version = 2;
int64_t creation_time;
@@ -2134,16 +2152,7 @@ static int mkv_write_header(AVFormatContext *s)
version = 4;
}
- ebml_header = start_ebml_master(pb, EBML_ID_HEADER, MAX_EBML_HEADER_SIZE);
- put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
- put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
- put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
- put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
- put_ebml_string(pb, EBML_ID_DOCTYPE , s->oformat->name);
- put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , version);
- put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION, 2);
- end_ebml_master(pb, ebml_header);
-
+ ebml_write_header(pb, s->oformat->name, version);
put_ebml_id(pb, MATROSKA_ID_SEGMENT);
put_ebml_size_unknown(pb, 8);
mkv->segment_offset = avio_tell(pb);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 07/25] avformat/matroskaenc: Factor writing TrackVideo out
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (5 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 06/25] avformat/matroskaenc: Avoid seeks when writing EBML header Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 08/25] avformat/matroskaenc: Don't waste bytes on Video element length fields Andreas Rheinhardt
` (24 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
It is already quite big.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 130 +++++++++++++++++++++-----------------
1 file changed, 72 insertions(+), 58 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 4d4d270db1..2f5f1cc56d 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1418,6 +1418,77 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st)
#endif
}
+static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv,
+ AVStream *st, const AVCodecParameters *par,
+ AVIOContext *pb)
+{
+ const AVDictionaryEntry *tag;
+ int display_width_div = 1, display_height_div = 1;
+ ebml_master subinfo;
+ int ret;
+
+ subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
+
+ put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width);
+ put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height);
+
+ mkv_write_field_order(pb, IS_WEBM(mkv), par->field_order);
+
+ // check both side data and metadata for stereo information,
+ // write the result to the bitstream if any is found
+ ret = mkv_write_stereo_mode(s, pb, st, IS_WEBM(mkv),
+ &display_width_div,
+ &display_height_div);
+ if (ret < 0)
+ return ret;
+
+ if (((tag = av_dict_get(st->metadata, "alpha_mode", NULL, 0)) && atoi(tag->value)) ||
+ ((tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0)) && atoi(tag->value)) ||
+ (par->format == AV_PIX_FMT_YUVA420P)) {
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOALPHAMODE, 1);
+ }
+
+ // write DisplayWidth and DisplayHeight, they contain the size of
+ // a single source view and/or the display aspect ratio
+ if (st->sample_aspect_ratio.num) {
+ int64_t d_width = av_rescale(par->width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
+ if (d_width > INT_MAX) {
+ av_log(s, AV_LOG_ERROR, "Overflow in display width\n");
+ return AVERROR(EINVAL);
+ }
+ if (d_width != par->width || display_width_div != 1 || display_height_div != 1) {
+ if (IS_WEBM(mkv) || display_width_div != 1 || display_height_div != 1) {
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
+ } else {
+ AVRational display_aspect_ratio;
+ av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
+ par->width * (int64_t)st->sample_aspect_ratio.num,
+ par->height * (int64_t)st->sample_aspect_ratio.den,
+ 1024 * 1024);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH, display_aspect_ratio.num);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, display_aspect_ratio.den);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_DAR);
+ }
+ }
+ } else if (display_width_div != 1 || display_height_div != 1) {
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , par->width / display_width_div);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
+ } else if (!IS_WEBM(mkv))
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN);
+
+ if (par->codec_id == AV_CODEC_ID_RAWVIDEO) {
+ uint32_t color_space = av_le2ne32(par->codec_tag);
+ put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
+ }
+ mkv_write_video_color(pb, st, par);
+ mkv_write_video_projection(s, pb, st);
+
+ end_ebml_master(pb, subinfo);
+
+ return 0;
+}
+
static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
AVStream *st, mkv_track *track, AVIOContext *pb,
int is_default)
@@ -1429,8 +1500,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
int bit_depth;
int sample_rate = par->sample_rate;
int output_sample_rate = 0;
- int display_width_div = 1;
- int display_height_div = 1;
int j, ret;
const AVDictionaryEntry *tag;
@@ -1552,65 +1621,10 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
ffformatcontext(s)->avoid_negative_ts_use_pts = 0;
}
- subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
-
- put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width);
- put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height);
-
- mkv_write_field_order(pb, IS_WEBM(mkv), par->field_order);
-
- // check both side data and metadata for stereo information,
- // write the result to the bitstream if any is found
- ret = mkv_write_stereo_mode(s, pb, st, IS_WEBM(mkv),
- &display_width_div,
- &display_height_div);
+ ret = mkv_write_track_video(s, mkv, st, par, pb);
if (ret < 0)
return ret;
- if (((tag = av_dict_get(st->metadata, "alpha_mode", NULL, 0)) && atoi(tag->value)) ||
- ((tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0)) && atoi(tag->value)) ||
- (par->format == AV_PIX_FMT_YUVA420P)) {
- put_ebml_uint(pb, MATROSKA_ID_VIDEOALPHAMODE, 1);
- }
-
- // write DisplayWidth and DisplayHeight, they contain the size of
- // a single source view and/or the display aspect ratio
- if (st->sample_aspect_ratio.num) {
- int64_t d_width = av_rescale(par->width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
- if (d_width > INT_MAX) {
- av_log(s, AV_LOG_ERROR, "Overflow in display width\n");
- return AVERROR(EINVAL);
- }
- if (d_width != par->width || display_width_div != 1 || display_height_div != 1) {
- if (IS_WEBM(mkv) || display_width_div != 1 || display_height_div != 1) {
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
- } else {
- AVRational display_aspect_ratio;
- av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
- par->width * (int64_t)st->sample_aspect_ratio.num,
- par->height * (int64_t)st->sample_aspect_ratio.den,
- 1024 * 1024);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH, display_aspect_ratio.num);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, display_aspect_ratio.den);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_DAR);
- }
- }
- } else if (display_width_div != 1 || display_height_div != 1) {
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , par->width / display_width_div);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
- } else if (!IS_WEBM(mkv))
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN);
-
- if (par->codec_id == AV_CODEC_ID_RAWVIDEO) {
- uint32_t color_space = av_le2ne32(par->codec_tag);
- put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
- }
- mkv_write_video_color(pb, st, par);
- mkv_write_video_projection(s, pb, st);
-
- end_ebml_master(pb, subinfo);
-
if (!IS_WEBM(mkv))
mkv_write_dovi(s, pb, st);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 08/25] avformat/matroskaenc: Don't waste bytes on Video element length fields
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (6 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 07/25] avformat/matroskaenc: Factor writing TrackVideo out Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 09/25] avformat/matroskaenc: Don't waste bytes on ChapterAtoms " Andreas Rheinhardt
` (23 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 233 ++++++++++--------
tests/fate/matroska.mak | 2 +-
tests/ref/fate/matroska-dovi-write-config7 | 4 +-
tests/ref/fate/matroska-h264-remux | 4 +-
.../fate/matroska-mastering-display-metadata | 4 +-
tests/ref/fate/matroska-ms-mode | 4 +-
tests/ref/fate/matroska-qt-mode | 4 +-
tests/ref/fate/matroska-spherical-mono-remux | 4 +-
tests/ref/fate/matroska-vp8-alpha-remux | 4 +-
tests/ref/fate/rgb24-mkv | 4 +-
tests/ref/lavf-fate/av1.mkv | 4 +-
tests/ref/lavf/mkv | 4 +-
tests/ref/lavf/mkv_attachment | 4 +-
tests/ref/seek/lavf-mkv | 44 ++--
14 files changed, 175 insertions(+), 148 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 2f5f1cc56d..236dd3ae8d 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -424,6 +424,28 @@ static void ebml_writer_open_master(EbmlWriter *writer, uint32_t id)
writer->current_master_element = writer->nb_elements - 1;
}
+static void ebml_writer_close_master(EbmlWriter *writer)
+{
+ EbmlElement *elem;
+ av_assert2(writer->current_master_element >= 0);
+ av_assert2(writer->current_master_element < writer->nb_elements);
+ elem = &writer->elements[writer->current_master_element];
+ av_assert2(elem->type == EBML_MASTER);
+ elem->priv.master.nb_elements = writer->nb_elements - writer->current_master_element - 1;
+ writer->current_master_element = elem->priv.master.containing_master;
+}
+
+static void ebml_writer_close_or_discard_master(EbmlWriter *writer)
+{
+ av_assert2(writer->nb_elements > 0);
+ if (writer->current_master_element == writer->nb_elements - 1) {
+ /* The master element has no children. Discard it. */
+ writer->nb_elements--;
+ return;
+ }
+ ebml_writer_close_master(writer);
+}
+
static void ebml_writer_add_string(EbmlWriter *writer, uint32_t id,
const char *str)
{
@@ -1101,98 +1123,93 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
return ret;
}
-static void mkv_write_video_color(AVIOContext *pb, const AVStream *st,
+#define MAX_VIDEO_COLOR_ELEMS 20
+static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st,
const AVCodecParameters *par)
{
- /* 18 Elements with two bytes ID, one byte length field, 8 bytes payload
- * a master element with two bytes ID and one byte length field
- * plus another byte to stay clear of the end. */
- uint8_t colour[(2 + 1 + 8) * 18 + (2 + 1) + 1];
- FFIOContext buf;
- AVIOContext *const dyn_cp = &buf.pub;
- int colorinfo_size;
const void *side_data;
- ffio_init_context(&buf, colour, sizeof(colour), 1, NULL, NULL, NULL, NULL);
+ ebml_writer_open_master(writer, MATROSKA_ID_VIDEOCOLOR);
if (par->color_trc != AVCOL_TRC_UNSPECIFIED &&
par->color_trc < AVCOL_TRC_NB) {
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORTRANSFERCHARACTERISTICS,
- par->color_trc);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORTRANSFERCHARACTERISTICS,
+ par->color_trc);
}
if (par->color_space != AVCOL_SPC_UNSPECIFIED &&
par->color_space < AVCOL_SPC_NB) {
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMATRIXCOEFF, par->color_space);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORMATRIXCOEFF,
+ par->color_space);
}
if (par->color_primaries != AVCOL_PRI_UNSPECIFIED &&
par->color_primaries < AVCOL_PRI_NB) {
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORPRIMARIES, par->color_primaries);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORPRIMARIES,
+ par->color_primaries);
}
if (par->color_range != AVCOL_RANGE_UNSPECIFIED &&
par->color_range < AVCOL_RANGE_NB) {
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORRANGE, par->color_range);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORRANGE, par->color_range);
}
if (par->chroma_location != AVCHROMA_LOC_UNSPECIFIED &&
par->chroma_location <= AVCHROMA_LOC_TOP) {
int xpos, ypos;
avcodec_enum_to_chroma_pos(&xpos, &ypos, par->chroma_location);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ, (xpos >> 7) + 1);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT, (ypos >> 7) + 1);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ,
+ (xpos >> 7) + 1);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT,
+ (ypos >> 7) + 1);
}
side_data = av_stream_get_side_data(st, AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
NULL);
if (side_data) {
const AVContentLightMetadata *metadata = side_data;
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXCLL, metadata->MaxCLL);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXFALL, metadata->MaxFALL);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORMAXCLL,
+ metadata->MaxCLL);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORMAXFALL,
+ metadata->MaxFALL);
}
side_data = av_stream_get_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
NULL);
if (side_data) {
- ebml_master meta_element = start_ebml_master(
- dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 10 * (2 + 1 + 8));
const AVMasteringDisplayMetadata *metadata = side_data;
+ ebml_writer_open_master(writer, MATROSKA_ID_VIDEOCOLORMASTERINGMETA);
if (metadata->has_primaries) {
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_RX,
- av_q2d(metadata->display_primaries[0][0]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_RY,
- av_q2d(metadata->display_primaries[0][1]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_GX,
- av_q2d(metadata->display_primaries[1][0]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_GY,
- av_q2d(metadata->display_primaries[1][1]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_BX,
- av_q2d(metadata->display_primaries[2][0]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_BY,
- av_q2d(metadata->display_primaries[2][1]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_WHITEX,
- av_q2d(metadata->white_point[0]));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_WHITEY,
- av_q2d(metadata->white_point[1]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_RX,
+ av_q2d(metadata->display_primaries[0][0]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_RY,
+ av_q2d(metadata->display_primaries[0][1]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_GX,
+ av_q2d(metadata->display_primaries[1][0]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_GY,
+ av_q2d(metadata->display_primaries[1][1]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_BX,
+ av_q2d(metadata->display_primaries[2][0]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_BY,
+ av_q2d(metadata->display_primaries[2][1]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_WHITEX,
+ av_q2d(metadata->white_point[0]));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_WHITEY,
+ av_q2d(metadata->white_point[1]));
}
if (metadata->has_luminance) {
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_LUMINANCEMAX,
- av_q2d(metadata->max_luminance));
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_LUMINANCEMIN,
- av_q2d(metadata->min_luminance));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_LUMINANCEMAX,
+ av_q2d(metadata->max_luminance));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOCOLOR_LUMINANCEMIN,
+ av_q2d(metadata->min_luminance));
}
- end_ebml_master(dyn_cp, meta_element);
+ ebml_writer_close_or_discard_master(writer);
}
- colorinfo_size = avio_tell(dyn_cp);
- if (colorinfo_size)
- put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLOR, colour, colorinfo_size);
+ ebml_writer_close_or_discard_master(writer);
}
-static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
- const AVStream *st)
+#define MAX_VIDEO_PROJECTION_ELEMS 6
+static void mkv_write_video_projection(AVFormatContext *s, EbmlWriter *writer,
+ const AVStream *st, uint8_t private[])
{
- ebml_master projection;
- uint8_t private[20];
-
const AVSphericalMapping *spherical =
(const AVSphericalMapping *)av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL,
NULL);
@@ -1209,91 +1226,92 @@ static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
// Maximally 4 8-byte elements with id-length 2 + 1 byte length field
// and the private data of the AV_SPHERICAL_EQUIRECTANGULAR_TILE case
- projection = start_ebml_master(pb, MATROSKA_ID_VIDEOPROJECTION,
- 4 * (2 + 1 + 8) + (2 + 1 + 20));
+ ebml_writer_open_master(writer, MATROSKA_ID_VIDEOPROJECTION);
switch (spherical->projection) {
case AV_SPHERICAL_EQUIRECTANGULAR:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
- MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
break;
case AV_SPHERICAL_EQUIRECTANGULAR_TILE:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
- MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
AV_WB32(private, 0); // version + flags
AV_WB32(private + 4, spherical->bound_top);
AV_WB32(private + 8, spherical->bound_bottom);
AV_WB32(private + 12, spherical->bound_left);
AV_WB32(private + 16, spherical->bound_right);
- put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
- private, 20);
+ ebml_writer_add_bin(writer, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
+ private, 20);
break;
case AV_SPHERICAL_CUBEMAP:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
- MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
AV_WB32(private, 0); // version + flags
AV_WB32(private + 4, 0); // layout
AV_WB32(private + 8, spherical->padding);
- put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
- private, 12);
+ ebml_writer_add_bin(writer, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
+ private, 12);
break;
default:
av_assert0(0);
}
if (spherical->yaw)
- put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
- (double) spherical->yaw / (1 << 16));
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
+ (double) spherical->yaw / (1 << 16));
if (spherical->pitch)
- put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
(double) spherical->pitch / (1 << 16));
if (spherical->roll)
- put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
+ ebml_writer_add_float(writer, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
(double) spherical->roll / (1 << 16));
- end_ebml_master(pb, projection);
+ ebml_writer_close_master(writer);
}
-static void mkv_write_field_order(AVIOContext *pb, int is_webm,
+#define MAX_FIELD_ORDER_ELEMS 2
+static void mkv_write_field_order(EbmlWriter *writer, int is_webm,
enum AVFieldOrder field_order)
{
switch (field_order) {
case AV_FIELD_UNKNOWN:
break;
case AV_FIELD_PROGRESSIVE:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED,
- MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOFLAGINTERLACED,
+ MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE);
break;
case AV_FIELD_TT:
case AV_FIELD_BB:
case AV_FIELD_TB:
case AV_FIELD_BT:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED,
- MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOFLAGINTERLACED,
+ MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED);
if (!is_webm) {
switch (field_order) {
case AV_FIELD_TT:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
- MATROSKA_VIDEO_FIELDORDER_TT);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOFIELDORDER,
+ MATROSKA_VIDEO_FIELDORDER_TT);
break;
case AV_FIELD_BB:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
- MATROSKA_VIDEO_FIELDORDER_BB);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOFIELDORDER,
+ MATROSKA_VIDEO_FIELDORDER_BB);
break;
case AV_FIELD_TB:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
- MATROSKA_VIDEO_FIELDORDER_TB);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOFIELDORDER,
+ MATROSKA_VIDEO_FIELDORDER_TB);
break;
case AV_FIELD_BT:
- put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER,
- MATROSKA_VIDEO_FIELDORDER_BT);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOFIELDORDER,
+ MATROSKA_VIDEO_FIELDORDER_BT);
break;
}
}
}
}
-static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
+#define MAX_STEREO_MODE_ELEMS 1
+static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer,
AVStream *st, int is_webm,
int *h_width, int *h_height)
{
@@ -1380,7 +1398,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
}
// write StereoMode if format is valid
- put_ebml_uint(pb, MATROSKA_ID_VIDEOSTEREOMODE, format);
+ ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOSTEREOMODE, format);
return 0;
}
@@ -1424,19 +1442,21 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv,
{
const AVDictionaryEntry *tag;
int display_width_div = 1, display_height_div = 1;
- ebml_master subinfo;
+ uint8_t color_space[4], projection_private[20];
+ EBML_WRITER(MAX_FIELD_ORDER_ELEMS + MAX_STEREO_MODE_ELEMS +
+ MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 8);
int ret;
- subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
+ ebml_writer_open_master(&writer, MATROSKA_ID_TRACKVIDEO);
- put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width);
- put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELWIDTH , par->width);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height);
- mkv_write_field_order(pb, IS_WEBM(mkv), par->field_order);
+ mkv_write_field_order(&writer, IS_WEBM(mkv), par->field_order);
// check both side data and metadata for stereo information,
// write the result to the bitstream if any is found
- ret = mkv_write_stereo_mode(s, pb, st, IS_WEBM(mkv),
+ ret = mkv_write_stereo_mode(s, &writer, st, IS_WEBM(mkv),
&display_width_div,
&display_height_div);
if (ret < 0)
@@ -1445,7 +1465,7 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv,
if (((tag = av_dict_get(st->metadata, "alpha_mode", NULL, 0)) && atoi(tag->value)) ||
((tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0)) && atoi(tag->value)) ||
(par->format == AV_PIX_FMT_YUVA420P)) {
- put_ebml_uint(pb, MATROSKA_ID_VIDEOALPHAMODE, 1);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOALPHAMODE, 1);
}
// write DisplayWidth and DisplayHeight, they contain the size of
@@ -1458,35 +1478,42 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv,
}
if (d_width != par->width || display_width_div != 1 || display_height_div != 1) {
if (IS_WEBM(mkv) || display_width_div != 1 || display_height_div != 1) {
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH,
+ d_width / display_width_div);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT,
+ par->height / display_height_div);
} else {
AVRational display_aspect_ratio;
av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
par->width * (int64_t)st->sample_aspect_ratio.num,
par->height * (int64_t)st->sample_aspect_ratio.den,
1024 * 1024);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH, display_aspect_ratio.num);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, display_aspect_ratio.den);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_DAR);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH,
+ display_aspect_ratio.num);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT,
+ display_aspect_ratio.den);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYUNIT,
+ MATROSKA_VIDEO_DISPLAYUNIT_DAR);
}
}
} else if (display_width_div != 1 || display_height_div != 1) {
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , par->width / display_width_div);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH,
+ par->width / display_width_div);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT,
+ par->height / display_height_div);
} else if (!IS_WEBM(mkv))
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYUNIT,
+ MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN);
if (par->codec_id == AV_CODEC_ID_RAWVIDEO) {
- uint32_t color_space = av_le2ne32(par->codec_tag);
- put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
+ AV_WL32(color_space, par->codec_tag);
+ ebml_writer_add_bin(&writer, MATROSKA_ID_VIDEOCOLORSPACE,
+ color_space, sizeof(color_space));
}
- mkv_write_video_color(pb, st, par);
- mkv_write_video_projection(s, pb, st);
+ mkv_write_video_color(&writer, st, par);
+ mkv_write_video_projection(s, &writer, st, projection_private);
- end_ebml_master(pb, subinfo);
-
- return 0;
+ return ebml_writer_write(&writer, pb);
}
static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 295489d2cc..2fcac34d62 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -12,7 +12,7 @@ fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/m
FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux
fate-matroska-remux: CMD = md5pipe -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska
fate-matroska-remux: CMP = oneline
-fate-matroska-remux: REF = 26fabd90326e3de4bb6afe1b216ce232
+fate-matroska-remux: REF = b9c7b650349972c9dce42ab79b472917
FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER VORBIS_PARSER) += fate-matroska-xiph-lacing
fate-matroska-xiph-lacing: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/xiph_lacing.mka -c:a copy
diff --git a/tests/ref/fate/matroska-dovi-write-config7 b/tests/ref/fate/matroska-dovi-write-config7
index b652fe411d..65c397b807 100644
--- a/tests/ref/fate/matroska-dovi-write-config7
+++ b/tests/ref/fate/matroska-dovi-write-config7
@@ -1,5 +1,5 @@
-058e95f1effefe3842b6174bba2693fc *tests/data/fate/matroska-dovi-write-config7.matroska
-72707 tests/data/fate/matroska-dovi-write-config7.matroska
+7981e419c77ebd4180caafc0b45ade4d *tests/data/fate/matroska-dovi-write-config7.matroska
+72693 tests/data/fate/matroska-dovi-write-config7.matroska
#extradata 0: 116, 0x2b8d1669
#extradata 1: 116, 0x2b8d1669
#tb 0: 1/1000
diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux
index e55708ce37..4004afef9a 100644
--- a/tests/ref/fate/matroska-h264-remux
+++ b/tests/ref/fate/matroska-h264-remux
@@ -1,5 +1,5 @@
-ae0ccd32cc0d3bfc1eaa15c7fc985dfb *tests/data/fate/matroska-h264-remux.matroska
-2036075 tests/data/fate/matroska-h264-remux.matroska
+e4b0303e7bfbc8394bf47e11ab991d48 *tests/data/fate/matroska-h264-remux.matroska
+2036061 tests/data/fate/matroska-h264-remux.matroska
#tb 0: 1/25
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata
index f13d60ff2f..a3055c7bc7 100644
--- a/tests/ref/fate/matroska-mastering-display-metadata
+++ b/tests/ref/fate/matroska-mastering-display-metadata
@@ -1,5 +1,5 @@
-64403411e52d7ba9081ab5692e422737 *tests/data/fate/matroska-mastering-display-metadata.matroska
-1669597 tests/data/fate/matroska-mastering-display-metadata.matroska
+62866a79d93bbe699d6abb6592ceb50e *tests/data/fate/matroska-mastering-display-metadata.matroska
+1669585 tests/data/fate/matroska-mastering-display-metadata.matroska
#extradata 0: 4, 0x040901a3
#extradata 3: 200, 0x506463a8
#tb 0: 1/1000
diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode
index 5fe052c39b..a38c0aa91c 100644
--- a/tests/ref/fate/matroska-ms-mode
+++ b/tests/ref/fate/matroska-ms-mode
@@ -1,5 +1,5 @@
-b3d928e92bc8b323793a237ce82f9437 *tests/data/fate/matroska-ms-mode.matroska
-413108 tests/data/fate/matroska-ms-mode.matroska
+20e86febdfa8a2d5aefd83f89d5d99a7 *tests/data/fate/matroska-ms-mode.matroska
+413101 tests/data/fate/matroska-ms-mode.matroska
#extradata 0: 40, 0x54290c93
#extradata 1: 114, 0xb6c80771
#tb 0: 1/1000
diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode
index 770d9e7e91..f322df24c1 100644
--- a/tests/ref/fate/matroska-qt-mode
+++ b/tests/ref/fate/matroska-qt-mode
@@ -1,5 +1,5 @@
-1e525172caec2bf4e191a68c97bbbc51 *tests/data/fate/matroska-qt-mode.matroska
-1884243 tests/data/fate/matroska-qt-mode.matroska
+7f3a5c46ccb2b95074bdabc034ee71d1 *tests/data/fate/matroska-qt-mode.matroska
+1884236 tests/data/fate/matroska-qt-mode.matroska
#extradata 0: 90, 0x817d0185
#tb 0: 1/1000
#media_type 0: video
diff --git a/tests/ref/fate/matroska-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux
index 24d4413a87..6b7d64f6d5 100644
--- a/tests/ref/fate/matroska-spherical-mono-remux
+++ b/tests/ref/fate/matroska-spherical-mono-remux
@@ -1,5 +1,5 @@
-9176856edc1ff2b401e323f422fd8e78 *tests/data/fate/matroska-spherical-mono-remux.matroska
-161583 tests/data/fate/matroska-spherical-mono-remux.matroska
+28d9277e1992fa362e7eac7a16261fde *tests/data/fate/matroska-spherical-mono-remux.matroska
+161569 tests/data/fate/matroska-spherical-mono-remux.matroska
#extradata 0: 43, 0x2b0e0d7b
#extradata 1: 43, 0x2b0e0d7b
#tb 0: 1/1000
diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux
index 165c2404e7..413961672f 100644
--- a/tests/ref/fate/matroska-vp8-alpha-remux
+++ b/tests/ref/fate/matroska-vp8-alpha-remux
@@ -1,5 +1,5 @@
-e3912762161bb6e7f9607c085b371676 *tests/data/fate/matroska-vp8-alpha-remux.matroska
-237185 tests/data/fate/matroska-vp8-alpha-remux.matroska
+89c4f6136f151f45c217ec363fe9db2b *tests/data/fate/matroska-vp8-alpha-remux.matroska
+237178 tests/data/fate/matroska-vp8-alpha-remux.matroska
#tb 0: 1/1000
#media_type 0: video
#codec_id 0: vp8
diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv
index 2630265ebc..a9461dfc1b 100644
--- a/tests/ref/fate/rgb24-mkv
+++ b/tests/ref/fate/rgb24-mkv
@@ -1,5 +1,5 @@
-2c7192d8b62c6a11e311a09ab3bef3b8 *tests/data/fate/rgb24-mkv.matroska
-58224 tests/data/fate/rgb24-mkv.matroska
+afc7b59819a8d69773b04757278fccef *tests/data/fate/rgb24-mkv.matroska
+58217 tests/data/fate/rgb24-mkv.matroska
#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/lavf-fate/av1.mkv b/tests/ref/lavf-fate/av1.mkv
index 454aef53fb..7d7acae135 100644
--- a/tests/ref/lavf-fate/av1.mkv
+++ b/tests/ref/lavf-fate/av1.mkv
@@ -1,3 +1,3 @@
-61e66b67c0c38532f6c6edc8c9d32e48 *tests/data/lavf-fate/lavf.av1.mkv
-55656 tests/data/lavf-fate/lavf.av1.mkv
+33e58aee4132d60e7ae21ecf3ae9e35f *tests/data/lavf-fate/lavf.av1.mkv
+55649 tests/data/lavf-fate/lavf.av1.mkv
tests/data/lavf-fate/lavf.av1.mkv CRC=0x7c27cc15
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index e737cdf6ac..e089bff61c 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,3 @@
-3e37e53471f20f2b7169afd75cba70d2 *tests/data/lavf/lavf.mkv
-320424 tests/data/lavf/lavf.mkv
+c5e6db66eb81415c2a5128f4298850a8 *tests/data/lavf/lavf.mkv
+320417 tests/data/lavf/lavf.mkv
tests/data/lavf/lavf.mkv CRC=0xec6c3c68
diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment
index 4a2f9eb7f1..18dc902ca7 100644
--- a/tests/ref/lavf/mkv_attachment
+++ b/tests/ref/lavf/mkv_attachment
@@ -1,3 +1,3 @@
-32b24b97956f1fbcfbc1a94aac8f6202 *tests/data/lavf/lavf.mkv_attachment
-472574 tests/data/lavf/lavf.mkv_attachment
+a24aaf26dde6461f89acb7dd7c492015 *tests/data/lavf/lavf.mkv_attachment
+472567 tests/data/lavf/lavf.mkv_attachment
tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68
diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv
index 37945246ab..cbdbe9bfd1 100644
--- a/tests/ref/seek/lavf-mkv
+++ b/tests/ref/seek/lavf-mkv
@@ -1,48 +1,48 @@
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 665 size: 208
ret: 0 st:-1 flags:0 ts:-1.000000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292297 size: 27834
ret: 0 st: 0 flags:0 ts: 0.788000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292297 size: 27834
ret: 0 st: 0 flags:1 ts:-0.317000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
ret:-1 st: 1 flags:0 ts: 2.577000
ret: 0 st: 1 flags:1 ts: 1.471000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320138 size: 209
ret: 0 st:-1 flags:0 ts: 0.365002
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146849 size: 27925
ret: 0 st:-1 flags:1 ts:-0.740831
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
ret:-1 st: 0 flags:0 ts: 2.153000
ret: 0 st: 0 flags:1 ts: 1.048000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292297 size: 27834
ret: 0 st: 1 flags:0 ts:-0.058000
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 665 size: 208
ret: 0 st: 1 flags:1 ts: 2.836000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320138 size: 209
ret:-1 st:-1 flags:0 ts: 1.730004
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146849 size: 27925
ret: 0 st: 0 flags:0 ts:-0.482000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
ret: 0 st: 0 flags:1 ts: 2.413000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292297 size: 27834
ret:-1 st: 1 flags:0 ts: 1.307000
ret: 0 st: 1 flags:1 ts: 0.201000
-ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208
+ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 665 size: 208
ret: 0 st:-1 flags:0 ts:-0.904994
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
ret: 0 st:-1 flags:1 ts: 1.989173
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292297 size: 27834
ret: 0 st: 0 flags:0 ts: 0.883000
-ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834
+ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292297 size: 27834
ret: 0 st: 0 flags:1 ts:-0.222000
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
ret:-1 st: 1 flags:0 ts: 2.672000
ret: 0 st: 1 flags:1 ts: 1.566000
-ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209
+ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320138 size: 209
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925
+ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146849 size: 27925
ret: 0 st:-1 flags:1 ts:-0.645825
-ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837
+ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 881 size: 27837
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 09/25] avformat/matroskaenc: Don't waste bytes on ChapterAtoms length fields
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (7 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 08/25] avformat/matroskaenc: Don't waste bytes on Video element length fields Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 10/25] avformat/matroskaenc: Factor writing Info out Andreas Rheinhardt
` (22 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Also check the (user-provided) metadata tags for being too long.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 22 ++++++++++++----------
tests/ref/fate/webm-dash-chapters | 4 ++--
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 236dd3ae8d..fa58f1e171 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2013,12 +2013,13 @@ static int mkv_write_chapters(AVFormatContext *s)
create_new_ids = mkv_new_chapter_ids_needed(s);
for (unsigned i = 0; i < s->nb_chapters; i++) {
- ebml_master chapteratom, chapterdisplay;
const AVChapter *c = s->chapters[i];
int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale);
int64_t chapterend = av_rescale_q(c->end, c->time_base, scale);
const AVDictionaryEntry *t;
uint64_t uid = create_new_ids ? i + 1ULL : c->id;
+ EBML_WRITER(7);
+
if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) {
av_log(s, AV_LOG_ERROR,
"Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
@@ -2027,17 +2028,18 @@ static int mkv_write_chapters(AVFormatContext *s)
goto fail;
}
- chapteratom = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERATOM, 0);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERUID, uid);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMESTART, chapterstart);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMEEND, chapterend);
+ ebml_writer_open_master(&writer, MATROSKA_ID_CHAPTERATOM);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_CHAPTERUID, uid);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_CHAPTERTIMESTART, chapterstart);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_CHAPTERTIMEEND, chapterend);
if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
- chapterdisplay = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERDISPLAY, 0);
- put_ebml_string(dyn_cp, MATROSKA_ID_CHAPSTRING, t->value);
- put_ebml_string(dyn_cp, MATROSKA_ID_CHAPLANG , "und");
- end_ebml_master(dyn_cp, chapterdisplay);
+ ebml_writer_open_master(&writer, MATROSKA_ID_CHAPTERDISPLAY);
+ ebml_writer_add_string(&writer, MATROSKA_ID_CHAPSTRING, t->value);
+ ebml_writer_add_string(&writer, MATROSKA_ID_CHAPLANG , "und");
}
- end_ebml_master(dyn_cp, chapteratom);
+ ret = ebml_writer_write(&writer, dyn_cp);
+ if (ret < 0)
+ goto fail;
if (tags && mkv_check_tag(c->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) {
ret = mkv_write_tag(mkv, c->metadata, tags, NULL,
diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters
index c2f87b2d7c..95114e6526 100644
--- a/tests/ref/fate/webm-dash-chapters
+++ b/tests/ref/fate/webm-dash-chapters
@@ -1,5 +1,5 @@
-d3a67db17fdca71b9f8cf57c341a031b *tests/data/fate/webm-dash-chapters.webm
-111218 tests/data/fate/webm-dash-chapters.webm
+01732642a0750de3959fd348092929a5 *tests/data/fate/webm-dash-chapters.webm
+111162 tests/data/fate/webm-dash-chapters.webm
#extradata 0: 3469, 0xc6769ddc
#tb 0: 1/1000
#media_type 0: audio
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 10/25] avformat/matroskaenc: Factor writing Info out
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (8 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 09/25] avformat/matroskaenc: Don't waste bytes on ChapterAtoms " Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 11/25] avformat/matroskaenc: Allow to use custom reformatting functions Andreas Rheinhardt
` (21 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Avoids the surprise of using pb for the main AVIOContext
at the beginning and end of mkv_write_header() and for
for the dynamic buffer opened for the Info element
in the middle of mkv_write_header().
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 64 +++++++++++++++++++++------------------
1 file changed, 35 insertions(+), 29 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fa58f1e171..fb790ebe8b 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2175,36 +2175,13 @@ static void ebml_write_header(AVIOContext *pb,
ebml_writer_write(&writer, pb);
}
-static int mkv_write_header(AVFormatContext *s)
+static int mkv_write_info(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *pb = s->pb;
const AVDictionaryEntry *tag;
- int ret, i, version = 2;
int64_t creation_time;
-
- if (!IS_WEBM(mkv) ||
- av_dict_get(s->metadata, "stereo_mode", NULL, 0) ||
- av_dict_get(s->metadata, "alpha_mode", NULL, 0))
- version = 4;
-
- for (i = 0; i < s->nb_streams; i++) {
- if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_OPUS ||
- av_dict_get(s->streams[i]->metadata, "stereo_mode", NULL, 0) ||
- av_dict_get(s->streams[i]->metadata, "alpha_mode", NULL, 0))
- version = 4;
- }
-
- ebml_write_header(pb, s->oformat->name, version);
- put_ebml_id(pb, MATROSKA_ID_SEGMENT);
- put_ebml_size_unknown(pb, 8);
- mkv->segment_offset = avio_tell(pb);
-
- // We write a SeekHead at the beginning to point to all other level
- // one elements (except Clusters).
- mkv_start_seekhead(mkv, pb);
-
- ret = start_ebml_master_crc32(&mkv->info.bc, mkv);
+ AVIOContext *pb;
+ int ret = start_ebml_master_crc32(&mkv->info.bc, mkv);
if (ret < 0)
return ret;
pb = mkv->info.bc;
@@ -2253,11 +2230,40 @@ static int mkv_write_header(AVFormatContext *s)
put_ebml_void(pb, 11); // assumes double-precision float to be written
}
}
- ret = end_ebml_master_crc32_tentatively(s->pb, &mkv->info,
- mkv, MATROSKA_ID_INFO);
+ return end_ebml_master_crc32_tentatively(s->pb, &mkv->info,
+ mkv, MATROSKA_ID_INFO);
+}
+
+static int mkv_write_header(AVFormatContext *s)
+{
+ MatroskaMuxContext *mkv = s->priv_data;
+ AVIOContext *pb = s->pb;
+ int ret, version = 2;
+
+ if (!IS_WEBM(mkv) ||
+ av_dict_get(s->metadata, "stereo_mode", NULL, 0) ||
+ av_dict_get(s->metadata, "alpha_mode", NULL, 0))
+ version = 4;
+
+ for (unsigned i = 0; i < s->nb_streams; i++) {
+ if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_OPUS ||
+ av_dict_get(s->streams[i]->metadata, "stereo_mode", NULL, 0) ||
+ av_dict_get(s->streams[i]->metadata, "alpha_mode", NULL, 0))
+ version = 4;
+ }
+
+ ebml_write_header(pb, s->oformat->name, version);
+ put_ebml_id(pb, MATROSKA_ID_SEGMENT);
+ put_ebml_size_unknown(pb, 8);
+ mkv->segment_offset = avio_tell(pb);
+
+ // We write a SeekHead at the beginning to point to all other level
+ // one elements (except Clusters).
+ mkv_start_seekhead(mkv, pb);
+
+ ret = mkv_write_info(s);
if (ret < 0)
return ret;
- pb = s->pb;
ret = mkv_write_tracks(s);
if (ret < 0)
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 11/25] avformat/matroskaenc: Allow to use custom reformatting functions
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (9 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 10/25] avformat/matroskaenc: Factor writing Info out Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 12/25] avformat/matroskaenc: Speed up reformatting WavPack Andreas Rheinhardt
` (20 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Matroska uses variable-length elements and in order not to waste
bytes on length fields, the length of the data to write needs to
be known before writing the length field. Annex B H.264/5 and
WavPack need to be reformatted to know this length and this
currently involves writing the data into temporary buffers;
AV1 sometimes suffers from this as well.
This commit aims to solve this by adding a callback that is called
twice per packet: Once to get the size and once to actually write
the data. In case of WavPack and AV1 (where parsing is cheap due
to length fields) both calls will just parse the data with only
the second function writing anything. For H.264/5, the position
of the NALUs will need to be stored to be written lateron.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fb790ebe8b..5b5e921eee 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -158,6 +158,8 @@ typedef struct mkv_cues {
int num_entries;
} mkv_cues;
+struct MatroskaMuxContext;
+
typedef struct mkv_track {
int write_dts;
int has_cue;
@@ -171,6 +173,13 @@ typedef struct mkv_track {
int64_t duration_offset;
int64_t codecpriv_offset;
int64_t ts_offset;
+ /* This callback will be called twice: First with a NULL AVIOContext
+ * to return the size of the (Simple)Block's data via size
+ * and a second time with the AVIOContext set when the data
+ * shall be written.
+ * The callback shall not return an error on the second call. */
+ int (*reformat)(struct MatroskaMuxContext *, AVIOContext *,
+ const AVPacket *, int *size);
} mkv_track;
typedef struct MatroskaMuxContext {
@@ -2433,6 +2442,8 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
#endif
if (par->codec_id == AV_CODEC_ID_AV1) {
err = ff_av1_filter_obus_buf(pkt->data, &data, &size, &offset);
+ } else if (track->reformat) {
+ err = track->reformat(mkv, NULL, pkt, &size);
} else
data = pkt->data;
@@ -2483,9 +2494,13 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
put_ebml_num(pb, track_number, track->track_num_size);
avio_wb16(pb, ts - mkv->cluster_pts);
avio_w8(pb, (blockid == MATROSKA_ID_SIMPLEBLOCK && keyframe) ? (1 << 7) : 0);
+ if (track->reformat) {
+ track->reformat(mkv, pb, pkt, NULL);
+ } else {
avio_write(pb, data + offset, size);
if (data != pkt->data)
av_free(data);
+ }
if (blockid == MATROSKA_ID_BLOCK && !keyframe)
put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 12/25] avformat/matroskaenc: Speed up reformatting WavPack
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (10 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 11/25] avformat/matroskaenc: Allow to use custom reformatting functions Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 13/25] avformat/av1: Document actual behaviour of ff_av1_filter_obus() Andreas Rheinhardt
` (19 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
WavPack's blocks use a length field, so that parsing them is fast.
Therefore it makes sense to parse the block twice, once to get
the length of the output packet and once to write the actual data
instead of writing the data into a temporary buffer in a single pass.
This speeds up muxing from 1597092 to 761850 Decicycles per
write_packet call for a 2000kb/s stereo WavPack file muxed to /dev/null
with writing CRC-32 disabled.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 59 ++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 32 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 5b5e921eee..08d2d338a6 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2347,57 +2347,45 @@ static int mkv_blockgroup_size(int pkt_size, int track_num_size)
}
#if CONFIG_MATROSKA_MUXER
-static int mkv_strip_wavpack(const uint8_t *src, uint8_t **pdst, int *size)
+static int mkv_reformat_wavpack(MatroskaMuxContext *mkv, AVIOContext *pb,
+ const AVPacket *pkt, int *size)
{
- uint8_t *dst;
- int srclen = *size;
+ const uint8_t *src = pkt->data;
+ int srclen = pkt->size;
int offset = 0;
int ret;
- dst = av_malloc(srclen);
- if (!dst)
- return AVERROR(ENOMEM);
-
while (srclen >= WV_HEADER_SIZE) {
WvHeader header;
ret = ff_wv_parse_header(&header, src);
if (ret < 0)
- goto fail;
+ return ret;
src += WV_HEADER_SIZE;
srclen -= WV_HEADER_SIZE;
- if (srclen < header.blocksize) {
- ret = AVERROR_INVALIDDATA;
- goto fail;
- }
+ if (srclen < header.blocksize)
+ return AVERROR_INVALIDDATA;
- if (header.initial) {
- AV_WL32(dst + offset, header.samples);
- offset += 4;
- }
- AV_WL32(dst + offset, header.flags);
- AV_WL32(dst + offset + 4, header.crc);
- offset += 8;
+ offset += 4 * !!header.initial + 8 + 4 * !(header.initial && header.final);
+ if (pb) {
+ if (header.initial)
+ avio_wl32(pb, header.samples);
+ avio_wl32(pb, header.flags);
+ avio_wl32(pb, header.crc);
- if (!(header.initial && header.final)) {
- AV_WL32(dst + offset, header.blocksize);
- offset += 4;
- }
+ if (!(header.initial && header.final))
+ avio_wl32(pb, header.blocksize);
- memcpy(dst + offset, src, header.blocksize);
+ avio_write(pb, src, header.blocksize);
+ }
src += header.blocksize;
srclen -= header.blocksize;
offset += header.blocksize;
}
-
- *pdst = dst;
*size = offset;
return 0;
-fail:
- av_freep(&dst);
- return ret;
}
#endif
@@ -2436,8 +2424,6 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
(AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
/* extradata is Annex B, assume the bitstream is too and convert it */
err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
- } else if (par->codec_id == AV_CODEC_ID_WAVPACK) {
- err = mkv_strip_wavpack(pkt->data, &data, &size);
} else
#endif
if (par->codec_id == AV_CODEC_ID_AV1) {
@@ -2495,7 +2481,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
avio_wb16(pb, ts - mkv->cluster_pts);
avio_w8(pb, (blockid == MATROSKA_ID_SIMPLEBLOCK && keyframe) ? (1 << 7) : 0);
if (track->reformat) {
- track->reformat(mkv, pb, pkt, NULL);
+ track->reformat(mkv, pb, pkt, &size);
} else {
avio_write(pb, data + offset, size);
if (data != pkt->data)
@@ -3111,8 +3097,17 @@ static int mkv_init(struct AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
+ const AVCodecParameters *const par = st->codecpar;
mkv_track *track = &mkv->tracks[i];
+ switch (par->codec_id) {
+#if CONFIG_MATROSKA_MUXER
+ case AV_CODEC_ID_WAVPACK:
+ track->reformat = mkv_reformat_wavpack;
+ break;
+#endif
+ }
+
if (s->flags & AVFMT_FLAG_BITEXACT) {
track->uid = i + 1;
} else {
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 13/25] avformat/av1: Document actual behaviour of ff_av1_filter_obus()
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (11 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 12/25] avformat/matroskaenc: Speed up reformatting WavPack Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 14/25] avformat/matroskaenc: Redo reformatting AV1 Andreas Rheinhardt
` (18 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Document that it can be used with a NULL AVIOContext to
get the output size in a first pass.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/av1.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/av1.h b/libavformat/av1.h
index dd5b47dc25..f57dabe986 100644
--- a/libavformat/av1.h
+++ b/libavformat/av1.h
@@ -46,12 +46,14 @@ typedef struct AV1SequenceParameters {
* the resulting bitstream to the provided AVIOContext.
*
* @param pb pointer to the AVIOContext where the filtered bitstream shall be
- * written
+ * written; may be NULL, in which case nothing is written.
* @param buf input data buffer
* @param size size of the input data buffer
*
- * @return the amount of bytes written in case of success, a negative AVERROR
+ * @return the amount of bytes written (or would have been written in case
+ * pb had been supplied) in case of success, a negative AVERROR
* code in case of failure
+ * @note One can use NULL for pb to just get the output size.
*/
int ff_av1_filter_obus(AVIOContext *pb, const uint8_t *buf, int size);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 14/25] avformat/matroskaenc: Redo reformatting AV1
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (12 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 13/25] avformat/av1: Document actual behaviour of ff_av1_filter_obus() Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 15/25] avformat/matroskaenc: Use common function for H.2645 annex B->mp4 Andreas Rheinhardt
` (17 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This avoids allocations+copies in all cases, not only those
in which the desired OBUs are contiguous in the input buffer.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
ff_av1_filter_obus_buf() now has only one user left: movenc.c
Maybe movenc.c should be modified accordingly to remove it?
libavformat/matroskaenc.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 08d2d338a6..d275d6cd6c 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2389,6 +2389,16 @@ static int mkv_reformat_wavpack(MatroskaMuxContext *mkv, AVIOContext *pb,
}
#endif
+static int mkv_reformat_av1(MatroskaMuxContext *mkv, AVIOContext *pb,
+ const AVPacket *pkt, int *size)
+{
+ int ret = ff_av1_filter_obus(pb, pkt->data, pkt->size);
+ if (ret < 0)
+ return ret;
+ *size = ret;
+ return 0;
+}
+
static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
uint32_t blockid, const AVPacket *pkt, int keyframe)
{
@@ -2426,9 +2436,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
} else
#endif
- if (par->codec_id == AV_CODEC_ID_AV1) {
- err = ff_av1_filter_obus_buf(pkt->data, &data, &size, &offset);
- } else if (track->reformat) {
+ if (track->reformat) {
err = track->reformat(mkv, NULL, pkt, &size);
} else
data = pkt->data;
@@ -3106,6 +3114,9 @@ static int mkv_init(struct AVFormatContext *s)
track->reformat = mkv_reformat_wavpack;
break;
#endif
+ case AV_CODEC_ID_AV1:
+ track->reformat = mkv_reformat_av1;
+ break;
}
if (s->flags & AVFMT_FLAG_BITEXACT) {
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 15/25] avformat/matroskaenc: Use common function for H.2645 annex B->mp4
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (13 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 14/25] avformat/matroskaenc: Redo reformatting AV1 Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 16/25] avformat/avc: Add functions to split access unit into list of NALUs Andreas Rheinhardt
` (16 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Matroska does not have different profiles that allow or disallow
in-band extradata, so one can just use the ordinary H.264 function
for H.265, too. (Both use ff_avc_parse_nal_units() internally anyway.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d275d6cd6c..0446cd6ca9 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2427,13 +2427,10 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
mkv->cluster_pos, track_number, keyframe != 0);
#if CONFIG_MATROSKA_MUXER
- if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 &&
+ if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 ||
+ par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) &&
(AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
- } else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 &&
- (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
- /* extradata is Annex B, assume the bitstream is too and convert it */
- err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
} else
#endif
if (track->reformat) {
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 16/25] avformat/avc: Add functions to split access unit into list of NALUs
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (14 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 15/25] avformat/matroskaenc: Use common function for H.2645 annex B->mp4 Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 17/25] avformat/matroskaenc: Avoid temporary buffers when reformatting H.2645 Andreas Rheinhardt
` (15 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This will allow to avoid the temporary buffer and memcpys
when repacketing annex B to mp4-style H.264/H.265 without
searching twice for start codes.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/avc.c | 40 +++++++++++++++++++++++++++++++++++++---
libavformat/avc.h | 29 +++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/libavformat/avc.c b/libavformat/avc.c
index b5e2921388..b0ceb1d2d8 100644
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -70,7 +70,8 @@ const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end){
return out;
}
-int ff_avc_parse_nal_units(AVIOContext *pb, const uint8_t *buf_in, int size)
+static int avc_parse_nal_units(AVIOContext *pb, NALUList *list,
+ const uint8_t *buf_in, int size)
{
const uint8_t *p = buf_in;
const uint8_t *end = p + size;
@@ -79,19 +80,52 @@ int ff_avc_parse_nal_units(AVIOContext *pb, const uint8_t *buf_in, int size)
size = 0;
nal_start = ff_avc_find_startcode(p, end);
for (;;) {
+ const size_t nalu_limit = SIZE_MAX / sizeof(*list->nalus);
while (nal_start < end && !*(nal_start++));
if (nal_start == end)
break;
nal_end = ff_avc_find_startcode(nal_start, end);
- avio_wb32(pb, nal_end - nal_start);
- avio_write(pb, nal_start, nal_end - nal_start);
+ if (pb) {
+ avio_wb32(pb, nal_end - nal_start);
+ avio_write(pb, nal_start, nal_end - nal_start);
+ } else if (list->nb_nalus >= nalu_limit) {
+ return AVERROR(ERANGE);
+ } else {
+ NALU *tmp = av_fast_realloc(list->nalus, &list->nalus_array_size,
+ (list->nb_nalus + 1) * sizeof(*list->nalus));
+ if (!tmp)
+ return AVERROR(ENOMEM);
+ list->nalus = tmp;
+ tmp[list->nb_nalus++] = (NALU){ .offset = nal_start - p,
+ .size = nal_end - nal_start };
+ }
size += 4 + nal_end - nal_start;
nal_start = nal_end;
}
return size;
}
+int ff_avc_parse_nal_units(AVIOContext *pb, const uint8_t *buf_in, int size)
+{
+ return avc_parse_nal_units(pb, NULL, buf_in, size);
+}
+
+int ff_nal_units_create_list(NALUList *list, const uint8_t *buf, int size)
+{
+ list->nb_nalus = 0;
+ return avc_parse_nal_units(NULL, list, buf, size);
+}
+
+void ff_nal_units_write_list(const NALUList *list, AVIOContext *pb,
+ const uint8_t *buf)
+{
+ for (unsigned i = 0; i < list->nb_nalus; i++) {
+ avio_wb32(pb, list->nalus[i].size);
+ avio_write(pb, buf + list->nalus[i].offset, list->nalus[i].size);
+ }
+}
+
int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size)
{
AVIOContext *pb;
diff --git a/libavformat/avc.h b/libavformat/avc.h
index 9792b77913..aced285c7a 100644
--- a/libavformat/avc.h
+++ b/libavformat/avc.h
@@ -25,6 +25,35 @@
#include <stdint.h>
#include "avio.h"
+typedef struct NALU {
+ int offset;
+ uint32_t size;
+} NALU;
+
+typedef struct NALUList {
+ NALU *nalus;
+ unsigned nalus_array_size;
+ unsigned nb_nalus; ///< valid entries in nalus
+} NALUList;
+
+/* This function will parse the given annex B buffer and create
+ * a NALUList from it. This list can be passed to ff_nal_units_write_list()
+ * to write the access unit reformatted to mp4.
+ *
+ * @param list A NALUList. The list->nalus and list->nalus_array_size
+ * must be valid when calling this function and may be updated.
+ * nb_nalus is set by this function on success.
+ * @param buf buffer containing annex B H.264 or H.265. Must be padded.
+ * @param size size of buf, excluding padding.
+ * @return < 0 on error, the size of the mp4-style packet on success.
+ */
+int ff_nal_units_create_list(NALUList *list, const uint8_t *buf, int size);
+
+/* Writes a NALUList to the specified AVIOContext. The list must originate
+ * from ff_nal_units_create_list() with the same buf. */
+void ff_nal_units_write_list(const NALUList *list, AVIOContext *pb,
+ const uint8_t *buf);
+
int ff_avc_parse_nal_units(AVIOContext *s, const uint8_t *buf, int size);
int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size);
int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 17/25] avformat/matroskaenc: Avoid temporary buffers when reformatting H.2645
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (15 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 16/25] avformat/avc: Add functions to split access unit into list of NALUs Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 18/25] avformat/matroskaenc: Remove special code for writing subtitles Andreas Rheinhardt
` (14 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Do this by using the new NALUList API. This avoids an allocation
of a dynamic buffer per packet as well as the (re)allocation
of the actual buffer as well as copying the data around.
This improves performance: The time for one call to write_packet
decreased from 703501 to 357900 decicyles when remuxing a 5min
14000 kb/s H.264 transport stream.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 0446cd6ca9..e247f1029c 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -199,6 +199,8 @@ typedef struct MatroskaMuxContext {
mkv_cues cues;
int64_t cues_pos;
+ NALUList h2645_nalu_list;
+
AVPacket *cur_audio_pkt;
unsigned nb_attachments;
@@ -746,6 +748,7 @@ static void mkv_deinit(AVFormatContext *s)
ffio_free_dyn_buf(&mkv->track.bc);
ffio_free_dyn_buf(&mkv->tags.bc);
+ av_freep(&mkv->h2645_nalu_list.nalus);
av_freep(&mkv->cues.entries);
av_freep(&mkv->tracks);
}
@@ -2347,6 +2350,21 @@ static int mkv_blockgroup_size(int pkt_size, int track_num_size)
}
#if CONFIG_MATROSKA_MUXER
+static int mkv_reformat_h2645(MatroskaMuxContext *mkv, AVIOContext *pb,
+ const AVPacket *pkt, int *size)
+{
+ int ret;
+ if (pb) {
+ ff_nal_units_write_list(&mkv->h2645_nalu_list, pb, pkt->data);
+ } else {
+ ret = ff_nal_units_create_list(&mkv->h2645_nalu_list, pkt->data, pkt->size);
+ if (ret < 0)
+ return ret;
+ *size = ret;
+ }
+ return 0;
+}
+
static int mkv_reformat_wavpack(MatroskaMuxContext *mkv, AVIOContext *pb,
const AVPacket *pkt, int *size)
{
@@ -2426,13 +2444,6 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
mkv->cluster_pos, track_number, keyframe != 0);
-#if CONFIG_MATROSKA_MUXER
- if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 ||
- par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) &&
- (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
- err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
- } else
-#endif
if (track->reformat) {
err = track->reformat(mkv, NULL, pkt, &size);
} else
@@ -2489,8 +2500,6 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
track->reformat(mkv, pb, pkt, &size);
} else {
avio_write(pb, data + offset, size);
- if (data != pkt->data)
- av_free(data);
}
if (blockid == MATROSKA_ID_BLOCK && !keyframe)
@@ -3110,6 +3119,13 @@ static int mkv_init(struct AVFormatContext *s)
case AV_CODEC_ID_WAVPACK:
track->reformat = mkv_reformat_wavpack;
break;
+ case AV_CODEC_ID_H264:
+ case AV_CODEC_ID_HEVC:
+ if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 ||
+ par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) &&
+ (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
+ track->reformat = mkv_reformat_h2645;
+ break;
#endif
case AV_CODEC_ID_AV1:
track->reformat = mkv_reformat_av1;
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 18/25] avformat/matroskaenc: Remove special code for writing subtitles
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (16 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 17/25] avformat/matroskaenc: Avoid temporary buffers when reformatting H.2645 Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 19/25] avformat/matroskaenc: Pass more parameters explicitly to mkv_write_block Andreas Rheinhardt
` (13 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Once upon a time, mkv_write_block() only wrote a (Simple)Block,
not a BlockGroup which is needed for subtitles to convey
the duration. But with the introduction of support for writing
BlockAdditions and DiscardPadding (both of which require a BlockGroup),
mkv_write_block() can also open and close a BlockGroup of its own. This
naturally led to some code duplication which is removed in this commit.
This new code leads to one regression: It always uses eight bytes for
the BlockGroup's length field, whereas the earlier code usually used the
lowest amount of bytes needed. This will be fixed in a future commit.
This temporary regression is also the reason for changes to the
binsub-mksenc and matroska-zero-length-block fate tests.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 40 ++++++++++-------------
tests/ref/fate/binsub-mksenc | 2 +-
tests/ref/fate/matroska-zero-length-block | 4 +--
3 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e247f1029c..4e921e3d6d 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2418,7 +2418,7 @@ static int mkv_reformat_av1(MatroskaMuxContext *mkv, AVIOContext *pb,
}
static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
- uint32_t blockid, const AVPacket *pkt, int keyframe)
+ const AVPacket *pkt, int keyframe, uint64_t duration)
{
MatroskaMuxContext *mkv = s->priv_data;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
@@ -2428,10 +2428,10 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
int err = 0, offset = 0, size = pkt->size;
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
uint64_t additional_id;
+ uint32_t blockid = MATROSKA_ID_SIMPLEBLOCK;
int64_t discard_padding = 0;
unsigned track_number = track->track_num;
ebml_master block_group, block_additions, block_more;
- int blockgroup_already_opened = blockid == MATROSKA_ID_BLOCK;
ts += track->ts_offset;
@@ -2466,7 +2466,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES,
&side_data_size);
- if (side_data && side_data_size >= 10 && !blockgroup_already_opened) {
+ if (side_data && side_data_size >= 10) {
discard_padding = av_rescale_q(AV_RL32(side_data + 4),
(AVRational){1, par->sample_rate},
(AVRational){1, 1000000000});
@@ -2477,8 +2477,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
&side_data_size);
if (side_data) {
// Only the Codec-specific BlockMore (id == 1) is currently supported.
- if (side_data_size < 8 || (additional_id = AV_RB64(side_data)) != 1 ||
- blockgroup_already_opened) {
+ if (side_data_size < 8 || (additional_id = AV_RB64(side_data)) != 1) {
side_data_size = 0;
} else {
side_data += 8;
@@ -2486,7 +2485,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
}
}
- if (side_data_size || discard_padding) {
+ if (side_data_size || discard_padding || duration) {
block_group = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, 0);
blockid = MATROSKA_ID_BLOCK;
}
@@ -2502,6 +2501,9 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
avio_write(pb, data + offset, size);
}
+ if (duration)
+ put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
+
if (blockid == MATROSKA_ID_BLOCK && !keyframe)
put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts);
track->last_timestamp = ts;
@@ -2520,7 +2522,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
end_ebml_master(pb, block_more);
end_ebml_master(pb, block_additions);
}
- if (side_data_size || discard_padding)
+ if (blockid == MATROSKA_ID_BLOCK)
end_ebml_master(pb, block_group);
return 0;
@@ -2697,8 +2699,11 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
AVIOContext *pb;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
mkv_track *track = &mkv->tracks[pkt->stream_index];
- int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
+ int is_sub = par->codec_type == AVMEDIA_TYPE_SUBTITLE;
+ /* All subtitle blocks are considered to be keyframes. */
+ int keyframe = is_sub || !!(pkt->flags & AV_PKT_FLAG_KEY);
int64_t duration = pkt->duration;
+ int64_t write_duration = is_sub ? FFMAX(duration, 0) : 0;
int ret;
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
int64_t relative_packet_pos;
@@ -2735,9 +2740,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
relative_packet_pos = avio_tell(pb);
- if (par->codec_type != AVMEDIA_TYPE_SUBTITLE ||
- (par->codec_id != AV_CODEC_ID_WEBVTT && duration <= 0)) {
- ret = mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
+ if (par->codec_id != AV_CODEC_ID_WEBVTT) {
+ ret = mkv_write_block(s, pb, pkt, keyframe, write_duration);
if (ret < 0)
return ret;
if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
@@ -2745,26 +2749,16 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
par->codec_type == AVMEDIA_TYPE_SUBTITLE ||
!mkv->have_video && !track->has_cue)) {
ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
- mkv->cluster_pos, relative_packet_pos, 0);
+ mkv->cluster_pos, relative_packet_pos,
+ write_duration);
if (ret < 0)
return ret;
track->has_cue = 1;
}
} else {
- if (par->codec_id == AV_CODEC_ID_WEBVTT) {
ret = mkv_write_vtt_blocks(s, pb, pkt);
if (ret < 0)
return ret;
- } else {
- ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
- mkv_blockgroup_size(pkt->size,
- track->track_num_size));
-
- /* All subtitle blocks are considered to be keyframes. */
- mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 1);
- put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
- end_ebml_master(pb, blockgroup);
- }
if (IS_SEEKABLE(s->pb, mkv)) {
ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
diff --git a/tests/ref/fate/binsub-mksenc b/tests/ref/fate/binsub-mksenc
index 184661a3f0..01e7db64f2 100644
--- a/tests/ref/fate/binsub-mksenc
+++ b/tests/ref/fate/binsub-mksenc
@@ -1 +1 @@
-490b1b4beb4a614c06004609039ce779
+9dd2ff92a3da9fb50405db3d05e41042
diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block
index 924cec1e3f..edee36a4ab 100644
--- a/tests/ref/fate/matroska-zero-length-block
+++ b/tests/ref/fate/matroska-zero-length-block
@@ -1,5 +1,5 @@
-f37ba7e8a30eaa33c1fd0ef77447fb41 *tests/data/fate/matroska-zero-length-block.matroska
-636 tests/data/fate/matroska-zero-length-block.matroska
+c09d3b89ed0795817d671deb041fca1b *tests/data/fate/matroska-zero-length-block.matroska
+650 tests/data/fate/matroska-zero-length-block.matroska
#tb 0: 1/1000
#media_type 0: subtitle
#codec_id 0: subrip
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 19/25] avformat/matroskaenc: Pass more parameters explicitly to mkv_write_block
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (17 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 18/25] avformat/matroskaenc: Remove special code for writing subtitles Andreas Rheinhardt
@ 2022-01-16 23:03 ` Andreas Rheinhardt
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 20/25] avformat/matroskaenc: Redo applying ProRes offset Andreas Rheinhardt
` (12 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:03 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This e.g. stops recalculating ts again.
Also pass the AVFormatContext as pointer to void as it is only used
for logging.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 4e921e3d6d..be1b3711e4 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2417,27 +2417,23 @@ static int mkv_reformat_av1(MatroskaMuxContext *mkv, AVIOContext *pb,
return 0;
}
-static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
- const AVPacket *pkt, int keyframe, uint64_t duration)
+static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
+ AVIOContext *pb, const AVCodecParameters *par,
+ mkv_track *track, const AVPacket *pkt,
+ int keyframe, int64_t ts, uint64_t duration)
{
- MatroskaMuxContext *mkv = s->priv_data;
- AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
- mkv_track *track = &mkv->tracks[pkt->stream_index];
uint8_t *data = NULL, *side_data = NULL;
size_t side_data_size;
int err = 0, offset = 0, size = pkt->size;
- int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
uint64_t additional_id;
uint32_t blockid = MATROSKA_ID_SIMPLEBLOCK;
int64_t discard_padding = 0;
unsigned track_number = track->track_num;
ebml_master block_group, block_additions, block_more;
- ts += track->ts_offset;
-
/* The following string is identical to the one in mkv_write_vtt_blocks
* so that only one copy needs to exist in binaries. */
- av_log(s, AV_LOG_DEBUG,
+ av_log(logctx, AV_LOG_DEBUG,
"Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", "
"duration %" PRId64 " at relative offset %" PRId64 " in cluster "
"at offset %" PRId64 ". TrackNumber %u, keyframe %d\n",
@@ -2450,7 +2446,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
data = pkt->data;
if (err < 0) {
- av_log(s, AV_LOG_ERROR, "Error when reformatting data of "
+ av_log(logctx, AV_LOG_ERROR, "Error when reformatting data of "
"a packet from stream %d.\n", pkt->stream_index);
return err;
}
@@ -2741,7 +2737,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
relative_packet_pos = avio_tell(pb);
if (par->codec_id != AV_CODEC_ID_WEBVTT) {
- ret = mkv_write_block(s, pb, pkt, keyframe, write_duration);
+ ret = mkv_write_block(s, mkv, pb, par, track, pkt,
+ keyframe, ts, write_duration);
if (ret < 0)
return ret;
if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 20/25] avformat/matroskaenc: Redo applying ProRes offset
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (18 preceding siblings ...)
2022-01-16 23:03 ` [FFmpeg-devel] [PATCH 19/25] avformat/matroskaenc: Pass more parameters explicitly to mkv_write_block Andreas Rheinhardt
@ 2022-01-16 23:04 ` Andreas Rheinhardt
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 21/25] avformat/matroskaenc: Don't waste bytes on BlockGroup length fields Andreas Rheinhardt
` (11 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Add a field to mkv_track that is set to the offset instead
of checking for whether the track is ProRes when writing
the Block. This makes writing the Block independent
of the AVCodecParameters.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index be1b3711e4..fdce3fad49 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -167,6 +167,7 @@ typedef struct mkv_track {
unsigned track_num;
int track_num_size;
int sample_rate;
+ unsigned offset;
int64_t sample_rate_offset;
int64_t last_timestamp;
int64_t duration;
@@ -2451,12 +2452,9 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
return err;
}
- if (CONFIG_MATROSKA_MUXER &&
- par->codec_id == AV_CODEC_ID_PRORES && size >= 8) {
- /* Matroska specification requires to remove the first QuickTime atom
- */
- size -= 8;
- offset = 8;
+ if (track->offset <= size) {
+ size -= track->offset;
+ offset = track->offset;
}
side_data = av_packet_get_side_data(pkt,
@@ -3117,6 +3115,11 @@ static int mkv_init(struct AVFormatContext *s)
(AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
track->reformat = mkv_reformat_h2645;
break;
+ case AV_CODEC_ID_PRORES:
+ /* Matroska specification requires to remove
+ * the first QuickTime atom. */
+ track->offset = 8;
+ break;
#endif
case AV_CODEC_ID_AV1:
track->reformat = mkv_reformat_av1;
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 21/25] avformat/matroskaenc: Don't waste bytes on BlockGroup length fields
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (19 preceding siblings ...)
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 20/25] avformat/matroskaenc: Redo applying ProRes offset Andreas Rheinhardt
@ 2022-01-16 23:04 ` Andreas Rheinhardt
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 22/25] avformat/matroskaenc: Remove duplicated code for writing WebVTT subs Andreas Rheinhardt
` (10 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This commit uses the new EbmlWriter API to write the length fields
of the BlockGroup and its descendants that are themselves Master
elements (namely BlockAdditions and BlockMore) on the least amount of
bytes.
This fixes regressions introduced when the special code for writing
general subtitles was removed. Accordingly, the binsub-mksenc and
matroska-zero-length-block FATE-tests have now been reverted back
to their old state again; the advantages of this approach are evident
with the matroska-vp8-alpha-remux test which up until now wrote
all the length fields of all BlockGroups, BlockAdditions and BlockMore
on eight bytes.
Using the EbmlWriter API also allowed to improve locality in
mkv_write_block(): E.g. both DiscardPadding as well as the
BlockAdditional side-data are now directly used to add elements
to the writer whereas the earlier code had to first check
for whether a BlockGroup should be used and then check again
(after the place where a BlockGroup would be opened if one were
used) for whether there is DiscardPadding or BlockAdditional
side-data to write.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 208 +++++++++++++---------
tests/ref/fate/binsub-mksenc | 2 +-
tests/ref/fate/matroska-vp8-alpha-remux | 4 +-
tests/ref/fate/matroska-zero-length-block | 4 +-
tests/ref/fate/webm-dash-chapters | 4 +-
5 files changed, 130 insertions(+), 92 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fdce3fad49..a3c84eb63b 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -99,9 +99,18 @@ typedef enum EbmlType {
EBML_STR,
EBML_UTF8 = EBML_STR,
EBML_BIN,
+ EBML_BLOCK, ///< pseudo-type for writing BlockGroups/SimpleBlocks
EBML_MASTER,
} EbmlType;
+typedef struct BlockContext {
+ struct mkv_track *track;
+ const AVPacket *pkt;
+ int16_t rel_ts;
+ uint8_t flags;
+ NALUList h2645_nalu_list;
+} BlockContext;
+
typedef struct EbmlMaster {
int nb_elements; ///< -1 if not finished
int containing_master; ///< -1 if no parent exists
@@ -118,6 +127,7 @@ typedef struct EbmlElement {
double f;
const char *str;
const uint8_t *bin;
+ struct MatroskaMuxContext *mkv; ///< used by EBML_BLOCK
EbmlMaster master;
} priv;
} EbmlElement;
@@ -185,6 +195,8 @@ typedef struct mkv_track {
typedef struct MatroskaMuxContext {
const AVClass *class;
+ AVFormatContext *ctx;
+
int mode;
ebml_stored_master info;
ebml_stored_master track;
@@ -200,7 +212,7 @@ typedef struct MatroskaMuxContext {
mkv_cues cues;
int64_t cues_pos;
- NALUList h2645_nalu_list;
+ BlockContext cur_block;
AVPacket *cur_audio_pkt;
@@ -339,20 +351,6 @@ static void put_ebml_uint(AVIOContext *pb, uint32_t elementid, uint64_t val)
avio_w8(pb, (uint8_t)(val >> i * 8));
}
-static void put_ebml_sint(AVIOContext *pb, uint32_t elementid, int64_t val)
-{
- int i, bytes = 1;
- uint64_t tmp = 2 * (uint64_t)(val < 0 ? val^-1 : val);
-
- while (tmp >>= 8)
- bytes++;
-
- put_ebml_id(pb, elementid);
- put_ebml_length(pb, bytes, 0);
- for (i = bytes - 1; i >= 0; i--)
- avio_w8(pb, (uint8_t)(val >> i * 8));
-}
-
static void put_ebml_float(AVIOContext *pb, uint32_t elementid, double val)
{
put_ebml_id(pb, elementid);
@@ -500,6 +498,19 @@ static void ebml_writer_add_uint(EbmlWriter *writer, uint32_t id,
elem->priv.uint = val;
}
+static void ebml_writer_add_sint(EbmlWriter *writer, uint32_t id,
+ int64_t val)
+{
+ EbmlElement *elem = ebml_writer_add(writer, id, EBML_SINT);
+ elem->priv.sint = val;
+}
+
+static void ebml_writer_add_block(EbmlWriter *writer, MatroskaMuxContext *mkv)
+{
+ EbmlElement *elem = ebml_writer_add(writer, MATROSKA_ID_BLOCK, EBML_BLOCK);
+ elem->priv.mkv = mkv;
+}
+
static int ebml_writer_str_len(EbmlElement *elem)
{
size_t len = strlen(elem->priv.str);
@@ -566,6 +577,52 @@ static int ebml_writer_master_len(EbmlWriter *writer, EbmlElement *elem,
return master->priv.master.nb_elements;
}
+static int ebml_writer_block_len(EbmlElement *elem)
+{
+ MatroskaMuxContext *const mkv = elem->priv.mkv;
+ BlockContext *const block = &mkv->cur_block;
+ mkv_track *const track = block->track;
+ const AVPacket *const pkt = block->pkt;
+ int err, size;
+
+ if (track->reformat) {
+ err = track->reformat(mkv, NULL, pkt, &size);
+ if (err < 0) {
+ av_log(mkv->ctx, AV_LOG_ERROR, "Error when reformatting data of "
+ "a packet from stream %d.\n", pkt->stream_index);
+ return err;
+ }
+ } else {
+ size = pkt->size;
+ if (track->offset <= size)
+ size -= track->offset;
+ }
+ elem->size = track->track_num_size + 3U + size;
+
+ return 0;
+}
+
+static void ebml_writer_write_block(const EbmlElement *elem, AVIOContext *pb)
+{
+ MatroskaMuxContext *const mkv = elem->priv.mkv;
+ BlockContext *const block = &mkv->cur_block;
+ mkv_track *const track = block->track;
+ const AVPacket *const pkt = block->pkt;
+
+ put_ebml_num(pb, track->track_num, track->track_num_size);
+ avio_wb16(pb, block->rel_ts);
+ avio_w8(pb, block->flags);
+
+ if (track->reformat) {
+ int size;
+ track->reformat(mkv, pb, pkt, &size);
+ } else {
+ const uint8_t *data = pkt->data;
+ unsigned offset = track->offset <= pkt->size ? track->offset : 0;
+ avio_write(pb, data + offset, pkt->size - offset);
+ }
+}
+
static int ebml_writer_elem_len(EbmlWriter *writer, EbmlElement *elem,
int remaining_elems)
{
@@ -585,6 +642,9 @@ static int ebml_writer_elem_len(EbmlWriter *writer, EbmlElement *elem,
case EBML_SINT:
ret = ebml_writer_sint_len(elem);
break;
+ case EBML_BLOCK:
+ ret = ebml_writer_block_len(elem);
+ break;
case EBML_MASTER:
ret = ebml_writer_master_len(writer, elem, remaining_elems);
break;
@@ -624,6 +684,9 @@ static int ebml_writer_elem_write(const EbmlElement *elem, AVIOContext *pb)
avio_write(pb, data, elem->size);
break;
}
+ case EBML_BLOCK:
+ ebml_writer_write_block(elem, pb);
+ break;
case EBML_MASTER: {
int nb_elems = elem->priv.master.nb_elements;
@@ -749,7 +812,7 @@ static void mkv_deinit(AVFormatContext *s)
ffio_free_dyn_buf(&mkv->track.bc);
ffio_free_dyn_buf(&mkv->tags.bc);
- av_freep(&mkv->h2645_nalu_list.nalus);
+ av_freep(&mkv->cur_block.h2645_nalu_list.nalus);
av_freep(&mkv->cues.entries);
av_freep(&mkv->tracks);
}
@@ -2356,9 +2419,9 @@ static int mkv_reformat_h2645(MatroskaMuxContext *mkv, AVIOContext *pb,
{
int ret;
if (pb) {
- ff_nal_units_write_list(&mkv->h2645_nalu_list, pb, pkt->data);
+ ff_nal_units_write_list(&mkv->cur_block.h2645_nalu_list, pb, pkt->data);
} else {
- ret = ff_nal_units_create_list(&mkv->h2645_nalu_list, pkt->data, pkt->size);
+ ret = ff_nal_units_create_list(&mkv->cur_block.h2645_nalu_list, pkt->data, pkt->size);
if (ret < 0)
return ret;
*size = ret;
@@ -2423,14 +2486,25 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
mkv_track *track, const AVPacket *pkt,
int keyframe, int64_t ts, uint64_t duration)
{
- uint8_t *data = NULL, *side_data = NULL;
+ uint8_t *side_data;
size_t side_data_size;
- int err = 0, offset = 0, size = pkt->size;
uint64_t additional_id;
- uint32_t blockid = MATROSKA_ID_SIMPLEBLOCK;
int64_t discard_padding = 0;
unsigned track_number = track->track_num;
- ebml_master block_group, block_additions, block_more;
+ EBML_WRITER(9);
+
+ mkv->cur_block.track = track;
+ mkv->cur_block.pkt = pkt;
+ mkv->cur_block.rel_ts = ts - mkv->cluster_pts;
+ mkv->cur_block.flags = 0;
+
+ /* Open a BlockGroup with a Block now; it will later be converted
+ * to a SimpleBlock if possible. */
+ ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKGROUP);
+ ebml_writer_add_block(&writer, mkv);
+
+ if (duration)
+ ebml_writer_add_uint(&writer, MATROSKA_ID_BLOCKDURATION, duration);
/* The following string is identical to the one in mkv_write_vtt_blocks
* so that only one copy needs to exist in binaries. */
@@ -2441,22 +2515,6 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
mkv->cluster_pos, track_number, keyframe != 0);
- if (track->reformat) {
- err = track->reformat(mkv, NULL, pkt, &size);
- } else
- data = pkt->data;
-
- if (err < 0) {
- av_log(logctx, AV_LOG_ERROR, "Error when reformatting data of "
- "a packet from stream %d.\n", pkt->stream_index);
- return err;
- }
-
- if (track->offset <= size) {
- size -= track->offset;
- offset = track->offset;
- }
-
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES,
&side_data_size);
@@ -2464,62 +2522,39 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
discard_padding = av_rescale_q(AV_RL32(side_data + 4),
(AVRational){1, par->sample_rate},
(AVRational){1, 1000000000});
+ ebml_writer_add_sint(&writer, MATROSKA_ID_DISCARDPADDING, discard_padding);
}
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
&side_data_size);
- if (side_data) {
+ if (side_data && side_data_size >= 8 &&
// Only the Codec-specific BlockMore (id == 1) is currently supported.
- if (side_data_size < 8 || (additional_id = AV_RB64(side_data)) != 1) {
- side_data_size = 0;
- } else {
- side_data += 8;
- side_data_size -= 8;
- }
- }
-
- if (side_data_size || discard_padding || duration) {
- block_group = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, 0);
- blockid = MATROSKA_ID_BLOCK;
- }
-
- put_ebml_id(pb, blockid);
- put_ebml_length(pb, size + track->track_num_size + 3, 0);
- put_ebml_num(pb, track_number, track->track_num_size);
- avio_wb16(pb, ts - mkv->cluster_pts);
- avio_w8(pb, (blockid == MATROSKA_ID_SIMPLEBLOCK && keyframe) ? (1 << 7) : 0);
- if (track->reformat) {
- track->reformat(mkv, pb, pkt, &size);
- } else {
- avio_write(pb, data + offset, size);
- }
-
- if (duration)
- put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
-
- if (blockid == MATROSKA_ID_BLOCK && !keyframe)
- put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts);
- track->last_timestamp = ts;
-
- if (discard_padding)
- put_ebml_sint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding);
-
- if (side_data_size) {
- block_additions = start_ebml_master(pb, MATROSKA_ID_BLOCKADDITIONS, 0);
- block_more = start_ebml_master(pb, MATROSKA_ID_BLOCKMORE, 0);
+ (additional_id = AV_RB64(side_data)) == 1) {
+ ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKADDITIONS);
+ ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKMORE);
/* Until dbc50f8a our demuxer used a wrong default value
* of BlockAddID, so we write it unconditionally. */
- put_ebml_uint (pb, MATROSKA_ID_BLOCKADDID, additional_id);
- put_ebml_binary(pb, MATROSKA_ID_BLOCKADDITIONAL,
- side_data, side_data_size);
- end_ebml_master(pb, block_more);
- end_ebml_master(pb, block_additions);
- }
- if (blockid == MATROSKA_ID_BLOCK)
- end_ebml_master(pb, block_group);
+ ebml_writer_add_uint(&writer, MATROSKA_ID_BLOCKADDID, additional_id);
+ ebml_writer_add_bin (&writer, MATROSKA_ID_BLOCKADDITIONAL,
+ side_data + 8, side_data_size - 8);
+ ebml_writer_close_master(&writer);
+ ebml_writer_close_master(&writer);
+ }
+
+ if (writer.nb_elements == 2) {
+ /* Nothing except the BlockGroup + Block. Can use a SimpleBlock. */
+ writer.elements++; // Skip the BlockGroup.
+ writer.nb_elements--;
+ av_assert2(writer.elements[0].id == MATROSKA_ID_BLOCK);
+ writer.elements[0].id = MATROSKA_ID_SIMPLEBLOCK;
+ if (keyframe)
+ mkv->cur_block.flags |= 1 << 7;
+ } else if (!keyframe)
+ ebml_writer_add_sint(&writer, MATROSKA_ID_BLOCKREFERENCE,
+ track->last_timestamp - ts);
- return 0;
+ return ebml_writer_write(&writer, pb);
}
static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPacket *pkt)
@@ -2763,6 +2798,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
}
}
+ track->last_timestamp = ts;
mkv->duration = FFMAX(mkv->duration, ts + duration);
track->duration = FFMAX(track->duration, ts + duration);
@@ -3058,6 +3094,8 @@ static int mkv_init(struct AVFormatContext *s)
unsigned nb_tracks = 0;
int i;
+ mkv->ctx = s;
+
for (i = 0; i < s->nb_streams; i++) {
if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_ATRAC3 ||
s->streams[i]->codecpar->codec_id == AV_CODEC_ID_COOK ||
diff --git a/tests/ref/fate/binsub-mksenc b/tests/ref/fate/binsub-mksenc
index 01e7db64f2..184661a3f0 100644
--- a/tests/ref/fate/binsub-mksenc
+++ b/tests/ref/fate/binsub-mksenc
@@ -1 +1 @@
-9dd2ff92a3da9fb50405db3d05e41042
+490b1b4beb4a614c06004609039ce779
diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux
index 413961672f..c17e8d0587 100644
--- a/tests/ref/fate/matroska-vp8-alpha-remux
+++ b/tests/ref/fate/matroska-vp8-alpha-remux
@@ -1,5 +1,5 @@
-89c4f6136f151f45c217ec363fe9db2b *tests/data/fate/matroska-vp8-alpha-remux.matroska
-237178 tests/data/fate/matroska-vp8-alpha-remux.matroska
+58147987d42f32d105d96b24b0755257 *tests/data/fate/matroska-vp8-alpha-remux.matroska
+235018 tests/data/fate/matroska-vp8-alpha-remux.matroska
#tb 0: 1/1000
#media_type 0: video
#codec_id 0: vp8
diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block
index edee36a4ab..924cec1e3f 100644
--- a/tests/ref/fate/matroska-zero-length-block
+++ b/tests/ref/fate/matroska-zero-length-block
@@ -1,5 +1,5 @@
-c09d3b89ed0795817d671deb041fca1b *tests/data/fate/matroska-zero-length-block.matroska
-650 tests/data/fate/matroska-zero-length-block.matroska
+f37ba7e8a30eaa33c1fd0ef77447fb41 *tests/data/fate/matroska-zero-length-block.matroska
+636 tests/data/fate/matroska-zero-length-block.matroska
#tb 0: 1/1000
#media_type 0: subtitle
#codec_id 0: subrip
diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters
index 95114e6526..af8110ed1a 100644
--- a/tests/ref/fate/webm-dash-chapters
+++ b/tests/ref/fate/webm-dash-chapters
@@ -1,5 +1,5 @@
-01732642a0750de3959fd348092929a5 *tests/data/fate/webm-dash-chapters.webm
-111162 tests/data/fate/webm-dash-chapters.webm
+f97445ba73e182c888fa077348384083 *tests/data/fate/webm-dash-chapters.webm
+111156 tests/data/fate/webm-dash-chapters.webm
#extradata 0: 3469, 0xc6769ddc
#tb 0: 1/1000
#media_type 0: audio
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 22/25] avformat/matroskaenc: Remove duplicated code for writing WebVTT subs
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (20 preceding siblings ...)
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 21/25] avformat/matroskaenc: Don't waste bytes on BlockGroup length fields Andreas Rheinhardt
@ 2022-01-16 23:04 ` Andreas Rheinhardt
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 23/25] avformat/matroskaenc: Reindentation Andreas Rheinhardt
` (9 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Up until now, the WebM variant of WebVTT subtitles has been handled
specially: It had its own function to write it, because the data
had to be reformatted before writing. But given that other codecs
also need reformatting, this is no good reason to also duplicate the
generic stuff for writing Block(Group)s.
This commit therefore uses an ordinary reformatting function for
this task; writing WebVTT subtitles now uses the generic code
and therefore automatically uses the least amount of bytes
for its BlockGroup length fields whereas the earlier code used
an overestimation for the length of the Duration element.
This is the reason for the changes to the webm-webvtt-remux FATE-test.
(This commit does not implement support for Matroska's way of muxing
WebVTT; it also does not add checks to ensure that WebM-style subtitles
don't get muxed in Matroska. But the function for reformatting gets a
webm prefix to indicate that this is for WebM.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Finally! Removing this has been on my list for ages;
see https://ffmpeg.org/pipermail/ffmpeg-devel/2019-April/243012.html
libavformat/matroskaenc.c | 117 ++++++++++---------------------
tests/ref/fate/webm-webvtt-remux | 4 +-
2 files changed, 39 insertions(+), 82 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index a3c84eb63b..e2f2dd7dae 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2404,15 +2404,6 @@ static int mkv_write_header(AVFormatContext *s)
return 0;
}
-static int mkv_blockgroup_size(int pkt_size, int track_num_size)
-{
- int size = pkt_size + track_num_size + 3;
- size += ebml_length_size(size);
- size += 2; // EBML ID for block and block duration
- size += 9; // max size of block duration incl. length field
- return size;
-}
-
#if CONFIG_MATROSKA_MUXER
static int mkv_reformat_h2645(MatroskaMuxContext *mkv, AVIOContext *pb,
const AVPacket *pkt, int *size)
@@ -2481,10 +2472,38 @@ static int mkv_reformat_av1(MatroskaMuxContext *mkv, AVIOContext *pb,
return 0;
}
+static int webm_reformat_vtt(MatroskaMuxContext *mkv, AVIOContext *pb,
+ const AVPacket *pkt, int *size)
+{
+ const uint8_t *id, *settings;
+ size_t id_size, settings_size;
+ unsigned total = pkt->size + 2U;
+
+ if (total > INT_MAX)
+ return AVERROR(ERANGE);
+
+ id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER,
+ &id_size);
+ settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS,
+ &settings_size);
+ if (id_size > INT_MAX - total || settings_size > INT_MAX - (total += id_size))
+ return AVERROR(ERANGE);
+ *size = total += settings_size;
+ if (pb) {
+ avio_write(pb, id, id_size);
+ avio_w8(pb, '\n');
+ avio_write(pb, settings, settings_size);
+ avio_w8(pb, '\n');
+ avio_write(pb, pkt->data, pkt->size);
+ }
+ return 0;
+}
+
static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
AVIOContext *pb, const AVCodecParameters *par,
mkv_track *track, const AVPacket *pkt,
- int keyframe, int64_t ts, uint64_t duration)
+ int keyframe, int64_t ts, uint64_t duration,
+ int force_blockgroup)
{
uint8_t *side_data;
size_t side_data_size;
@@ -2506,8 +2525,6 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
if (duration)
ebml_writer_add_uint(&writer, MATROSKA_ID_BLOCKDURATION, duration);
- /* The following string is identical to the one in mkv_write_vtt_blocks
- * so that only one copy needs to exist in binaries. */
av_log(logctx, AV_LOG_DEBUG,
"Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", "
"duration %" PRId64 " at relative offset %" PRId64 " in cluster "
@@ -2542,7 +2559,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
ebml_writer_close_master(&writer);
}
- if (writer.nb_elements == 2) {
+ if (!force_blockgroup && writer.nb_elements == 2) {
/* Nothing except the BlockGroup + Block. Can use a SimpleBlock. */
writer.elements++; // Skip the BlockGroup.
writer.nb_elements--;
@@ -2557,59 +2574,6 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
return ebml_writer_write(&writer, pb);
}
-static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPacket *pkt)
-{
- MatroskaMuxContext *mkv = s->priv_data;
- mkv_track *track = &mkv->tracks[pkt->stream_index];
- ebml_master blockgroup;
- size_t id_size, settings_size;
- int size, id_size_int, settings_size_int;
- const char *id, *settings;
- int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
- const int flags = 0;
-
- id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER,
- &id_size);
- id = id ? id : "";
-
- settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS,
- &settings_size);
- settings = settings ? settings : "";
-
- if (id_size > INT_MAX - 2 || settings_size > INT_MAX - id_size - 2 ||
- pkt->size > INT_MAX - settings_size - id_size - 2)
- return AVERROR(EINVAL);
-
- size = id_size + 1 + settings_size + 1 + pkt->size;
-
- /* The following string is identical to the one in mkv_write_block so that
- * only one copy needs to exist in binaries. */
- av_log(s, AV_LOG_DEBUG,
- "Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", "
- "duration %" PRId64 " at relative offset %" PRId64 " in cluster "
- "at offset %" PRId64 ". TrackNumber %u, keyframe %d\n",
- size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
- mkv->cluster_pos, track->track_num, 1);
-
- blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
- mkv_blockgroup_size(size, track->track_num_size));
-
- put_ebml_id(pb, MATROSKA_ID_BLOCK);
- put_ebml_length(pb, size + track->track_num_size + 3, 0);
- put_ebml_num(pb, track->track_num, track->track_num_size);
- avio_wb16(pb, ts - mkv->cluster_pts);
- avio_w8(pb, flags);
-
- id_size_int = id_size;
- settings_size_int = settings_size;
- avio_printf(pb, "%.*s\n%.*s\n%.*s", id_size_int, id, settings_size_int, settings, pkt->size, pkt->data);
-
- put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, pkt->duration);
- end_ebml_master(pb, blockgroup);
-
- return 0;
-}
-
static int mkv_end_cluster(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
@@ -2769,9 +2733,11 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
relative_packet_pos = avio_tell(pb);
- if (par->codec_id != AV_CODEC_ID_WEBVTT) {
+ /* The WebM spec requires WebVTT to be muxed in BlockGroups;
+ * so we force it even for packets without duration. */
ret = mkv_write_block(s, mkv, pb, par, track, pkt,
- keyframe, ts, write_duration);
+ keyframe, ts, write_duration,
+ par->codec_id == AV_CODEC_ID_WEBVTT);
if (ret < 0)
return ret;
if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
@@ -2785,18 +2751,6 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
return ret;
track->has_cue = 1;
}
- } else {
- ret = mkv_write_vtt_blocks(s, pb, pkt);
- if (ret < 0)
- return ret;
-
- if (IS_SEEKABLE(s->pb, mkv)) {
- ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
- mkv->cluster_pos, relative_packet_pos, duration);
- if (ret < 0)
- return ret;
- }
- }
track->last_timestamp = ts;
mkv->duration = FFMAX(mkv->duration, ts + duration);
@@ -3162,6 +3116,9 @@ static int mkv_init(struct AVFormatContext *s)
case AV_CODEC_ID_AV1:
track->reformat = mkv_reformat_av1;
break;
+ case AV_CODEC_ID_WEBVTT:
+ track->reformat = webm_reformat_vtt;
+ break;
}
if (s->flags & AVFMT_FLAG_BITEXACT) {
diff --git a/tests/ref/fate/webm-webvtt-remux b/tests/ref/fate/webm-webvtt-remux
index 15e919d74b..d847bbee2b 100644
--- a/tests/ref/fate/webm-webvtt-remux
+++ b/tests/ref/fate/webm-webvtt-remux
@@ -1,5 +1,5 @@
-c5625f28e6968e12d91f125edef5f16c *tests/data/fate/webm-webvtt-remux.webm
-6560 tests/data/fate/webm-webvtt-remux.webm
+8620a6614f149fc49ab7f4552373943e *tests/data/fate/webm-webvtt-remux.webm
+6556 tests/data/fate/webm-webvtt-remux.webm
#tb 0: 1/1000
#media_type 0: subtitle
#codec_id 0: webvtt
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 23/25] avformat/matroskaenc: Reindentation
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (21 preceding siblings ...)
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 22/25] avformat/matroskaenc: Remove duplicated code for writing WebVTT subs Andreas Rheinhardt
@ 2022-01-16 23:04 ` Andreas Rheinhardt
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 24/25] avformat/matroskaenc: Avoid repeated avio_tell() Andreas Rheinhardt
` (8 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e2f2dd7dae..28c7dee9b5 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2735,22 +2735,22 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
/* The WebM spec requires WebVTT to be muxed in BlockGroups;
* so we force it even for packets without duration. */
- ret = mkv_write_block(s, mkv, pb, par, track, pkt,
- keyframe, ts, write_duration,
- par->codec_id == AV_CODEC_ID_WEBVTT);
+ ret = mkv_write_block(s, mkv, pb, par, track, pkt,
+ keyframe, ts, write_duration,
+ par->codec_id == AV_CODEC_ID_WEBVTT);
+ if (ret < 0)
+ return ret;
+ if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
+ (par->codec_type == AVMEDIA_TYPE_VIDEO ||
+ par->codec_type == AVMEDIA_TYPE_SUBTITLE ||
+ !mkv->have_video && !track->has_cue)) {
+ ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
+ mkv->cluster_pos, relative_packet_pos,
+ write_duration);
if (ret < 0)
return ret;
- if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
- (par->codec_type == AVMEDIA_TYPE_VIDEO ||
- par->codec_type == AVMEDIA_TYPE_SUBTITLE ||
- !mkv->have_video && !track->has_cue)) {
- ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
- mkv->cluster_pos, relative_packet_pos,
- write_duration);
- if (ret < 0)
- return ret;
- track->has_cue = 1;
- }
+ track->has_cue = 1;
+ }
track->last_timestamp = ts;
mkv->duration = FFMAX(mkv->duration, ts + duration);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 24/25] avformat/matroskaenc: Avoid repeated avio_tell()
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (22 preceding siblings ...)
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 23/25] avformat/matroskaenc: Reindentation Andreas Rheinhardt
@ 2022-01-16 23:04 ` Andreas Rheinhardt
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 25/25] avformat/matroskaenc: Write data directly into dynamic buffers Andreas Rheinhardt
` (7 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 28c7dee9b5..230bbf4a2c 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2503,7 +2503,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
AVIOContext *pb, const AVCodecParameters *par,
mkv_track *track, const AVPacket *pkt,
int keyframe, int64_t ts, uint64_t duration,
- int force_blockgroup)
+ int force_blockgroup, int64_t relative_packet_pos)
{
uint8_t *side_data;
size_t side_data_size;
@@ -2529,7 +2529,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
"Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", "
"duration %" PRId64 " at relative offset %" PRId64 " in cluster "
"at offset %" PRId64 ". TrackNumber %u, keyframe %d\n",
- pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
+ pkt->size, pkt->pts, pkt->dts, pkt->duration, relative_packet_pos,
mkv->cluster_pos, track_number, keyframe != 0);
side_data = av_packet_get_side_data(pkt,
@@ -2737,7 +2737,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
* so we force it even for packets without duration. */
ret = mkv_write_block(s, mkv, pb, par, track, pkt,
keyframe, ts, write_duration,
- par->codec_id == AV_CODEC_ID_WEBVTT);
+ par->codec_id == AV_CODEC_ID_WEBVTT,
+ relative_packet_pos);
if (ret < 0)
return ret;
if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 25/25] avformat/matroskaenc: Write data directly into dynamic buffers
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (23 preceding siblings ...)
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 24/25] avformat/matroskaenc: Avoid repeated avio_tell() Andreas Rheinhardt
@ 2022-01-16 23:04 ` Andreas Rheinhardt
2022-01-18 11:17 ` [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (6 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-16 23:04 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This avoids copying the data in small chunks (1024B) into
the dynamic buffer's small buffer before finally writing them
into the "big" buffer.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskaenc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 230bbf4a2c..82aab8b633 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2721,6 +2721,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
ret = start_ebml_master_crc32(&mkv->cluster_bc, mkv);
if (ret < 0)
return ret;
+ mkv->cluster_bc->direct = 1;
mkv->cluster_pos = avio_tell(s->pb);
put_ebml_uint(mkv->cluster_bc, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts));
mkv->cluster_pts = FFMAX(0, ts);
--
2.32.0
_______________________________________________
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] 35+ messages in thread* Re: [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (24 preceding siblings ...)
2022-01-16 23:04 ` [FFmpeg-devel] [PATCH 25/25] avformat/matroskaenc: Write data directly into dynamic buffers Andreas Rheinhardt
@ 2022-01-18 11:17 ` Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 26/31] avformat/mux: Remove assert based on faulty assumptions Andreas Rheinhardt
` (5 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 11:17 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavformat/matroskaenc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> index 41b2df7dbf..1dde12a7d9 100644
> --- a/libavformat/matroskaenc.c
> +++ b/libavformat/matroskaenc.c
> @@ -286,7 +286,7 @@ static void put_ebml_uint(AVIOContext *pb, uint32_t elementid, uint64_t val)
> static void put_ebml_sint(AVIOContext *pb, uint32_t elementid, int64_t val)
> {
> int i, bytes = 1;
> - uint64_t tmp = 2*(val < 0 ? val^-1 : val);
> + uint64_t tmp = 2 * (uint64_t)(val < 0 ? val^-1 : val);
>
> while (tmp >>= 8)
> bytes++;
>
Will apply this patchset tomorrow unless there are objections.
- Andreas
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 26/31] avformat/mux: Remove assert based on faulty assumptions
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (25 preceding siblings ...)
2022-01-18 11:17 ` [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
@ 2022-01-18 23:32 ` Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 27/31] fate/matroska: Add test for avoiding negative timestamps Andreas Rheinhardt
` (4 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 23:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This assert is based upon the wrong assumption that
the noninterleaved codepath is never used; if it is used,
max_interleave_delta is irrelevant. It furthermore
ignores audio_preload.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/mux.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index c387f8ec6e..e34fd88f05 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -697,7 +697,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
);
}
} else {
- av_assert2(pkt->dts == AV_NOPTS_VALUE || pkt->dts >= 0 || s->max_interleave_delta > 0);
if (pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) {
av_log(s, AV_LOG_WARNING,
"Packets poorly interleaved, failed to avoid negative "
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 27/31] fate/matroska: Add test for avoiding negative timestamps
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (26 preceding siblings ...)
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 26/31] avformat/mux: Remove assert based on faulty assumptions Andreas Rheinhardt
@ 2022-01-18 23:32 ` Andreas Rheinhardt
2022-01-19 0:33 ` Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 28/31] avformat/avformat: Add AVFMT_AVOID_NEG_TS_DISABLED Andreas Rheinhardt
` (3 subsequent siblings)
31 siblings, 1 reply; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 23:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This tests the issue from tickets #4536, #5784;
the output of this test is currently broken.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/fate/matroska.mak | 15 +++++++
tests/ref/fate/matroska-avoid-negative-ts | 55 +++++++++++++++++++++++
2 files changed, 70 insertions(+)
create mode 100644 tests/ref/fate/matroska-avoid-negative-ts
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 2fcac34d62..3bc35d0f4c 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -90,6 +90,21 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \
+= fate-matroska-dovi-write-config7
fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list"
+# This tests the scenario like tickets #4536, #5784 where
+# the first packet (with the overall lowest dts) is a video packet,
+# whereas an audio packet to be muxed later has the overall lowest pts
+# which happens to be negative and therefore needs to be shifted.
+# This is currently buggy (the timestamps of the video frames muxed
+# before the first audio frame are not shifted).
+# Also tests muxing DOVI.
+FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \
+ AAC_FIXED_DECODER HEVC_DECODER \
+ AC3_FIXED_ENCODER MATROSKA_MUXER \
+ MATROSKA_DEMUXER FRAMECRC_MUXER \
+ PIPE_PROTOCOL) \
+ += fate-matroska-avoid-negative-ts
+fate-matroska-avoid-negative-ts: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-map 0:v -map 0:a -c:v copy -c:a ac3_fixed" "-c copy -t 0.4" "" "-show_entries stream_side_data_list"
+
# This tests writing the MS-compatibility modes V_MS/VFW/FOURCC and A_MS/ACM.
# It furthermore tests writing the Cues at the front if the cues_to_front
# option is set and more than enough space has been reserved in advance.
diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts
new file mode 100644
index 0000000000..9c23f4721c
--- /dev/null
+++ b/tests/ref/fate/matroska-avoid-negative-ts
@@ -0,0 +1,55 @@
+6048ff1b45660eb544c1f0db450afff5 *tests/data/fate/matroska-avoid-negative-ts.matroska
+3618353 tests/data/fate/matroska-avoid-negative-ts.matroska
+#extradata 0: 551, 0xa18acf66
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: hevc
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+#tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: ac3
+#sample_rate 1: 44100
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0, -67, 0, 33, 63375, 0xc76606ab, S=1, 8
+0, -34, 133, 33, 46706, 0x0e08a7e5, F=0x0
+0, 0, 73, 33, 29766, 0x753c031a, F=0x0
+1, 0, 0, 34, 834, 0x7e7776bd
+1, 35, 35, 34, 836, 0x14a3a0ff
+0, 39, 39, 33, 19409, 0x4b948b6c, F=0x0
+1, 70, 70, 34, 836, 0xf55e9a61
+0, 73, 106, 33, 21086, 0x1b9412ce, F=0x0
+1, 105, 105, 34, 836, 0x415591f1
+0, 106, 273, 33, 62043, 0xc2356b56, F=0x0
+0, 133, 206, 33, 36175, 0x0a7df38c, F=0x0
+1, 140, 140, 34, 836, 0xe26c9bad
+0, 173, 173, 33, 16028, 0xa57fcbe9, F=0x0
+1, 174, 174, 34, 836, 0xbc8c9b66
+0, 206, 239, 33, 15428, 0x9a91f357, F=0x0
+1, 209, 209, 34, 836, 0xddeb9643
+0, 239, 406, 33, 66072, 0xa542b6d7, F=0x0
+1, 244, 244, 34, 836, 0x08a494eb
+0, 273, 339, 33, 34985, 0xbfd8ff45, F=0x0
+1, 279, 279, 34, 836, 0x94f09bb4
+0, 306, 306, 33, 16036, 0xfc39c6ea, F=0x0
+1, 314, 314, 34, 836, 0xd6358a3a
+0, 339, 373, 33, 19893, 0x7e746f4e, F=0x0
+1, 348, 348, 34, 836, 0x76ac91f1
+0, 373, 539, 33, 77576, 0xeba2e5c8, F=0x0
+1, 383, 383, 34, 836, 0xb32a86ac
+[STREAM]
+[SIDE_DATA]
+side_data_type=DOVI configuration record
+dv_version_major=1
+dv_version_minor=0
+dv_profile=8
+dv_level=4
+rpu_present_flag=1
+el_present_flag=0
+bl_present_flag=1
+dv_bl_signal_compatibility_id=4
+[/SIDE_DATA]
+[/STREAM]
+[STREAM]
+[/STREAM]
--
2.32.0
_______________________________________________
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] 35+ messages in thread* Re: [FFmpeg-devel] [PATCH 27/31] fate/matroska: Add test for avoiding negative timestamps
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 27/31] fate/matroska: Add test for avoiding negative timestamps Andreas Rheinhardt
@ 2022-01-19 0:33 ` Andreas Rheinhardt
0 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-19 0:33 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> This tests the issue from tickets #4536, #5784;
> the output of this test is currently broken.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> tests/fate/matroska.mak | 15 +++++++
> tests/ref/fate/matroska-avoid-negative-ts | 55 +++++++++++++++++++++++
> 2 files changed, 70 insertions(+)
> create mode 100644 tests/ref/fate/matroska-avoid-negative-ts
>
> diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
> index 2fcac34d62..3bc35d0f4c 100644
> --- a/tests/fate/matroska.mak
> +++ b/tests/fate/matroska.mak
> @@ -90,6 +90,21 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \
> += fate-matroska-dovi-write-config7
> fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list"
>
> +# This tests the scenario like tickets #4536, #5784 where
> +# the first packet (with the overall lowest dts) is a video packet,
> +# whereas an audio packet to be muxed later has the overall lowest pts
> +# which happens to be negative and therefore needs to be shifted.
> +# This is currently buggy (the timestamps of the video frames muxed
> +# before the first audio frame are not shifted).
> +# Also tests muxing DOVI.
> +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \
> + AAC_FIXED_DECODER HEVC_DECODER \
> + AC3_FIXED_ENCODER MATROSKA_MUXER \
> + MATROSKA_DEMUXER FRAMECRC_MUXER \
> + PIPE_PROTOCOL) \
> + += fate-matroska-avoid-negative-ts
> +fate-matroska-avoid-negative-ts: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-map 0:v -map 0:a -c:v copy -c:a ac3_fixed" "-c copy -t 0.4" "" "-show_entries stream_side_data_list"
> +
> # This tests writing the MS-compatibility modes V_MS/VFW/FOURCC and A_MS/ACM.
> # It furthermore tests writing the Cues at the front if the cues_to_front
> # option is set and more than enough space has been reserved in advance.
> diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts
> new file mode 100644
> index 0000000000..9c23f4721c
> --- /dev/null
> +++ b/tests/ref/fate/matroska-avoid-negative-ts
> @@ -0,0 +1,55 @@
> +6048ff1b45660eb544c1f0db450afff5 *tests/data/fate/matroska-avoid-negative-ts.matroska
> +3618353 tests/data/fate/matroska-avoid-negative-ts.matroska
> +#extradata 0: 551, 0xa18acf66
> +#tb 0: 1/1000
> +#media_type 0: video
> +#codec_id 0: hevc
> +#dimensions 0: 1920x1080
> +#sar 0: 0/1
> +#tb 1: 1/1000
> +#media_type 1: audio
> +#codec_id 1: ac3
> +#sample_rate 1: 44100
> +#channel_layout 1: 3
> +#channel_layout_name 1: stereo
> +0, -67, 0, 33, 63375, 0xc76606ab, S=1, 8
> +0, -34, 133, 33, 46706, 0x0e08a7e5, F=0x0
> +0, 0, 73, 33, 29766, 0x753c031a, F=0x0
> +1, 0, 0, 34, 834, 0x7e7776bd
> +1, 35, 35, 34, 836, 0x14a3a0ff
> +0, 39, 39, 33, 19409, 0x4b948b6c, F=0x0
> +1, 70, 70, 34, 836, 0xf55e9a61
> +0, 73, 106, 33, 21086, 0x1b9412ce, F=0x0
> +1, 105, 105, 34, 836, 0x415591f1
> +0, 106, 273, 33, 62043, 0xc2356b56, F=0x0
> +0, 133, 206, 33, 36175, 0x0a7df38c, F=0x0
> +1, 140, 140, 34, 836, 0xe26c9bad
> +0, 173, 173, 33, 16028, 0xa57fcbe9, F=0x0
> +1, 174, 174, 34, 836, 0xbc8c9b66
> +0, 206, 239, 33, 15428, 0x9a91f357, F=0x0
> +1, 209, 209, 34, 836, 0xddeb9643
> +0, 239, 406, 33, 66072, 0xa542b6d7, F=0x0
> +1, 244, 244, 34, 836, 0x08a494eb
> +0, 273, 339, 33, 34985, 0xbfd8ff45, F=0x0
> +1, 279, 279, 34, 836, 0x94f09bb4
> +0, 306, 306, 33, 16036, 0xfc39c6ea, F=0x0
> +1, 314, 314, 34, 836, 0xd6358a3a
> +0, 339, 373, 33, 19893, 0x7e746f4e, F=0x0
> +1, 348, 348, 34, 836, 0x76ac91f1
> +0, 373, 539, 33, 77576, 0xeba2e5c8, F=0x0
> +1, 383, 383, 34, 836, 0xb32a86ac
> +[STREAM]
> +[SIDE_DATA]
> +side_data_type=DOVI configuration record
> +dv_version_major=1
> +dv_version_minor=0
> +dv_profile=8
> +dv_level=4
> +rpu_present_flag=1
> +el_present_flag=0
> +bl_present_flag=1
> +dv_bl_signal_compatibility_id=4
> +[/SIDE_DATA]
> +[/STREAM]
> +[STREAM]
> +[/STREAM]
>
Seems like this test fails on PPC64 despite only using the fixed-point
version of the AAC decoder and the AC-3 encoder (with no format
conversion in-between); given that these codecs are used in other tests
using hash I entertained the hope that it would be otherwise. Will
reconsider.
- Andreas
_______________________________________________
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] 35+ messages in thread
* [FFmpeg-devel] [PATCH 28/31] avformat/avformat: Add AVFMT_AVOID_NEG_TS_DISABLED
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (27 preceding siblings ...)
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 27/31] fate/matroska: Add test for avoiding negative timestamps Andreas Rheinhardt
@ 2022-01-18 23:32 ` Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 29/31] avformat/mux: Preserve sync even if later packet has negative ts Andreas Rheinhardt
` (2 subsequent siblings)
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 23:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
And also don't use explicit constants in the movenc test.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Missing version bump and APIchanges entry.
libavformat/avformat.h | 1 +
libavformat/mux.c | 2 +-
libavformat/options_table.h | 2 +-
libavformat/tests/movenc.c | 4 ++--
libavformat/webm_chunk.c | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 6ce367e854..cd253fb28e 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1533,6 +1533,7 @@ typedef struct AVFormatContext {
*/
int avoid_negative_ts;
#define AVFMT_AVOID_NEG_TS_AUTO -1 ///< Enabled when required by target format
+#define AVFMT_AVOID_NEG_TS_DISABLED 0 ///< Do not shift timestamps even when they are negative.
#define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative
#define AVFMT_AVOID_NEG_TS_MAKE_ZERO 2 ///< Shift timestamps so that they start at 0
diff --git a/libavformat/mux.c b/libavformat/mux.c
index e34fd88f05..a1917878a5 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -421,7 +421,7 @@ static int init_pts(AVFormatContext *s)
if (s->avoid_negative_ts < 0) {
av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
if (s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) {
- s->avoid_negative_ts = 0;
+ s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_DISABLED;
} else
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE;
}
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 62c5bb40a3..86d836cfeb 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -95,7 +95,7 @@ static const AVOption avformat_options[] = {
{"max_ts_probe", "maximum number of packets to read while waiting for the first timestamp", OFFSET(max_ts_probe), AV_OPT_TYPE_INT, { .i64 = 50 }, 0, INT_MAX, D },
{"avoid_negative_ts", "shift timestamps so they start at 0", OFFSET(avoid_negative_ts), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, E, "avoid_negative_ts"},
{"auto", "enabled when required by target format", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_AVOID_NEG_TS_AUTO }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
-{"disabled", "do not change timestamps", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
+{"disabled", "do not change timestamps", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_AVOID_NEG_TS_DISABLED }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
{"make_non_negative", "shift timestamps so they are non negative", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
{"make_zero", "shift timestamps so they start at 0", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_AVOID_NEG_TS_MAKE_ZERO }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
{"dump_separator", "set information dump field separator", OFFSET(dump_separator), AV_OPT_TYPE_STRING, {.str = ", "}, 0, 0, D|E},
diff --git a/libavformat/tests/movenc.c b/libavformat/tests/movenc.c
index 2af72f11c7..ddcb053bf2 100644
--- a/libavformat/tests/movenc.c
+++ b/libavformat/tests/movenc.c
@@ -455,7 +455,7 @@ int main(int argc, char **argv)
init_count_warnings();
init_out("empty-moov-no-elst-no-adjust");
av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
- av_dict_set(&opts, "avoid_negative_ts", "0", 0);
+ av_dict_set(&opts, "avoid_negative_ts", "disabled", 0);
init(1, 0);
mux_gops(2);
finish();
@@ -578,7 +578,7 @@ int main(int argc, char **argv)
// one before.
av_dict_set(&opts, "movflags", "frag_custom+empty_moov+dash+frag_discont", 0);
av_dict_set(&opts, "fragment_index", "2", 0);
- av_dict_set(&opts, "avoid_negative_ts", "0", 0);
+ av_dict_set(&opts, "avoid_negative_ts", "disabled", 0);
av_dict_set(&opts, "use_editlist", "0", 0);
init(0, 0);
skip_gops(1);
diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c
index 24390e8e74..9348e6680a 100644
--- a/libavformat/webm_chunk.c
+++ b/libavformat/webm_chunk.c
@@ -127,7 +127,7 @@ fail:
s->avoid_negative_ts = oc->avoid_negative_ts;
ffformatcontext(s)->avoid_negative_ts_use_pts =
ffformatcontext(oc)->avoid_negative_ts_use_pts;
- oc->avoid_negative_ts = 0;
+ oc->avoid_negative_ts = AVFMT_AVOID_NEG_TS_DISABLED;
return 0;
}
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 29/31] avformat/mux: Preserve sync even if later packet has negative ts
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (28 preceding siblings ...)
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 28/31] avformat/avformat: Add AVFMT_AVOID_NEG_TS_DISABLED Andreas Rheinhardt
@ 2022-01-18 23:32 ` Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 30/31] avformat/mux: Peek into the muxing queue for avoid_negative_ts Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 31/31] avformat/hls: Remove redundant cast Andreas Rheinhardt
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 23:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
write_packet() has code to shift the packets timestamps
to make them nonnegative or even make them start at ts zero;
this code inspects every packet that is written and if a packet
with negative timestamp (whether this is dts or pts depends upon
another flag; basically: Matroska uses pts, everyone else dts)
is encountered, this is offset to make the timestamp zero.
All further packets will be offset accordingly (with the offset
converted according to the streams' timebases).
This is based around an assumption, namely that the timestamps
are indeed non-decreasing, so that the first packet with negative
timestamps is the first packet with timestamps. This assumption
is often fulfilled given that the default interleavement function
by default interleaves per dts; yet there are scenarios in which
it may not be fulfilled:
a) av_write_frame() instead of av_interleaved_write_frame() is used.
b) The audio_preload option is used.
c) When the timestamps that are made nonnegative/zero are pts
(i.e. with Matroska), because the packet with the smallest dts
is not necessarily the packet with the smallest pts.
d) Possibly with custom interleavement functions.
In these cases the relative sync of the first few packet(s) is offset
relative to the later packets. This contradicts the documentation
("When shifting is enabled, all output timestamps are shifted by
the same amount").
Therefore this commit changes this: As soon as the first packet
with valid timestamps is output, it is checked and recorded whether
the timestamps need to be shifted. Further packets are no longer
checked for needing to be offset; instead they are simply offset.
In the cases above this leads to packets with negative timestamps
(and the appropriate warnings) instead of desync. This will mostly
be fixed in the next commit.
This commit also factors handling the avoid_negative_ts stuff out
of write_packet() in order to be able to return immediately.
Tickets #4536 and #5784 as well as the matroska-avoid-negative-ts-test
are examples of c); as has been said, some timestamps are now negative,
yet the ref file update does not show it because ffmpeg.c sanitizes
the timestamps (-copyts disables it; ffprobe and mkvinfo also show
the original timestamps).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/internal.h | 23 +++--
libavformat/mux.c | 111 +++++++++++++---------
libavformat/options.c | 1 -
tests/fate/matroska.mak | 4 +-
tests/ref/fate/matroska-avoid-negative-ts | 52 +++++-----
5 files changed, 104 insertions(+), 87 deletions(-)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index bffb8e66ff..f24c68703f 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -82,6 +82,17 @@ typedef struct FFFormatContext {
*/
int nb_interleaved_streams;
+ /**
+ * Whether the timestamp shift offset has already been determined.
+ * -1: disabled, 0: not yet determined, 1: determined.
+ */
+ enum {
+ AVOID_NEGATIVE_TS_DISABLED = -1,
+ AVOID_NEGATIVE_TS_UNKNOWN = 0,
+ AVOID_NEGATIVE_TS_KNOWN = 1,
+ } avoid_negative_ts_status;
+#define AVOID_NEGATIVE_TS_ENABLED(status) ((status) >= 0)
+
/**
* The interleavement function in use. Always set for muxers.
*/
@@ -135,18 +146,6 @@ typedef struct FFFormatContext {
*/
int raw_packet_buffer_size;
- /**
- * Offset to remap timestamps to be non-negative.
- * Expressed in timebase units.
- * @see AVStream.mux_ts_offset
- */
- int64_t offset;
-
- /**
- * Timebase for the timestamp offset.
- */
- AVRational offset_timebase;
-
#if FF_API_COMPUTE_PKT_FIELDS2
int missing_ts_warning;
#endif
diff --git a/libavformat/mux.c b/libavformat/mux.c
index a1917878a5..0810b674a7 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -388,6 +388,8 @@ fail:
static int init_pts(AVFormatContext *s)
{
+ FFFormatContext *const si = ffformatcontext(s);
+
/* init PTS generation */
for (unsigned i = 0; i < s->nb_streams; i++) {
AVStream *const st = s->streams[i];
@@ -418,13 +420,16 @@ static int init_pts(AVFormatContext *s)
}
}
+ si->avoid_negative_ts_status = AVOID_NEGATIVE_TS_UNKNOWN;
if (s->avoid_negative_ts < 0) {
av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
if (s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) {
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_DISABLED;
+ si->avoid_negative_ts_status = AVOID_NEGATIVE_TS_DISABLED;
} else
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE;
- }
+ } else if (s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_DISABLED)
+ si->avoid_negative_ts_status = AVOID_NEGATIVE_TS_DISABLED;
return 0;
}
@@ -638,6 +643,64 @@ static void guess_pkt_duration(AVFormatContext *s, AVStream *st, AVPacket *pkt)
}
}
+static void handle_avoid_negative_ts(FFFormatContext *si, FFStream *sti,
+ AVPacket *pkt)
+{
+ AVFormatContext *const s = &si->pub;
+ int64_t offset;
+
+ if (!AVOID_NEGATIVE_TS_ENABLED(si->avoid_negative_ts_status))
+ return;
+
+ if (si->avoid_negative_ts_status == AVOID_NEGATIVE_TS_UNKNOWN) {
+ int use_pts = si->avoid_negative_ts_use_pts;
+ int64_t ts = use_pts ? pkt->pts : pkt->dts;
+
+ if (ts == AV_NOPTS_VALUE)
+ return;
+ if (ts < 0 ||
+ ts > 0 && s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO) {
+ for (unsigned i = 0; i < s->nb_streams; i++) {
+ AVStream *const st2 = s->streams[i];
+ FFStream *const sti2 = ffstream(st2);
+ sti2->mux_ts_offset = av_rescale_q_rnd(-ts,
+ sti->pub.time_base,
+ st2->time_base,
+ AV_ROUND_UP);
+ }
+ }
+ si->avoid_negative_ts_status = AVOID_NEGATIVE_TS_KNOWN;
+ }
+
+ offset = sti->mux_ts_offset;
+
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += offset;
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += offset;
+
+ if (si->avoid_negative_ts_use_pts) {
+ if (pkt->pts != AV_NOPTS_VALUE && pkt->pts < 0) {
+ av_log(s, AV_LOG_WARNING, "failed to avoid negative "
+ "pts %s in stream %d.\n"
+ "Try -avoid_negative_ts 1 as a possible workaround.\n",
+ av_ts2str(pkt->pts),
+ pkt->stream_index
+ );
+ }
+ } else {
+ if (pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) {
+ av_log(s, AV_LOG_WARNING,
+ "Packets poorly interleaved, failed to avoid negative "
+ "timestamp %s in stream %d.\n"
+ "Try -max_interleave_delta 0 as a possible workaround.\n",
+ av_ts2str(pkt->dts),
+ pkt->stream_index
+ );
+ }
+ }
+}
+
/**
* Shift timestamps and call muxer; the original pts/dts are not kept.
*
@@ -663,51 +726,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
if (pkt->pts != AV_NOPTS_VALUE)
pkt->pts += offset;
}
-
- if (s->avoid_negative_ts > 0) {
- int64_t offset = sti->mux_ts_offset;
- int64_t ts = si->avoid_negative_ts_use_pts ? pkt->pts : pkt->dts;
-
- if (si->offset == AV_NOPTS_VALUE && ts != AV_NOPTS_VALUE &&
- (ts < 0 || s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO)) {
- si->offset = -ts;
- si->offset_timebase = st->time_base;
- }
-
- if (si->offset != AV_NOPTS_VALUE && !offset) {
- offset = sti->mux_ts_offset =
- av_rescale_q_rnd(si->offset,
- si->offset_timebase,
- st->time_base,
- AV_ROUND_UP);
- }
-
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += offset;
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += offset;
-
- if (si->avoid_negative_ts_use_pts) {
- if (pkt->pts != AV_NOPTS_VALUE && pkt->pts < 0) {
- av_log(s, AV_LOG_WARNING, "failed to avoid negative "
- "pts %s in stream %d.\n"
- "Try -avoid_negative_ts 1 as a possible workaround.\n",
- av_ts2str(pkt->pts),
- pkt->stream_index
- );
- }
- } else {
- if (pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) {
- av_log(s, AV_LOG_WARNING,
- "Packets poorly interleaved, failed to avoid negative "
- "timestamp %s in stream %d.\n"
- "Try -max_interleave_delta 0 as a possible workaround.\n",
- av_ts2str(pkt->dts),
- pkt->stream_index
- );
- }
- }
- }
+ handle_avoid_negative_ts(si, sti, pkt);
if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) {
AVFrame **frame = (AVFrame **)pkt->data;
diff --git a/libavformat/options.c b/libavformat/options.c
index 1634388acb..2d55d3ad6e 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -174,7 +174,6 @@ AVFormatContext *avformat_alloc_context(void)
return NULL;
}
- si->offset = AV_NOPTS_VALUE;
si->shortest_end = AV_NOPTS_VALUE;
return s;
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 3bc35d0f4c..3d8110a434 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -94,8 +94,8 @@ fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi
# the first packet (with the overall lowest dts) is a video packet,
# whereas an audio packet to be muxed later has the overall lowest pts
# which happens to be negative and therefore needs to be shifted.
-# This is currently buggy (the timestamps of the video frames muxed
-# before the first audio frame are not shifted).
+# This is currently buggy (the timestamps are not shifted properly:
+# the first audio packet has negative timestamps).
# Also tests muxing DOVI.
FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \
AAC_FIXED_DECODER HEVC_DECODER \
diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts
index 9c23f4721c..5bc71c76f7 100644
--- a/tests/ref/fate/matroska-avoid-negative-ts
+++ b/tests/ref/fate/matroska-avoid-negative-ts
@@ -1,4 +1,4 @@
-6048ff1b45660eb544c1f0db450afff5 *tests/data/fate/matroska-avoid-negative-ts.matroska
+e31928477981a8ffad351379f6d5f14a *tests/data/fate/matroska-avoid-negative-ts.matroska
3618353 tests/data/fate/matroska-avoid-negative-ts.matroska
#extradata 0: 551, 0xa18acf66
#tb 0: 1/1000
@@ -12,32 +12,32 @@
#sample_rate 1: 44100
#channel_layout 1: 3
#channel_layout_name 1: stereo
-0, -67, 0, 33, 63375, 0xc76606ab, S=1, 8
-0, -34, 133, 33, 46706, 0x0e08a7e5, F=0x0
-0, 0, 73, 33, 29766, 0x753c031a, F=0x0
+0, -62, 5, 33, 63375, 0xc76606ab, S=1, 8
+0, -29, 138, 33, 46706, 0x0e08a7e5, F=0x0
1, 0, 0, 34, 834, 0x7e7776bd
-1, 35, 35, 34, 836, 0x14a3a0ff
-0, 39, 39, 33, 19409, 0x4b948b6c, F=0x0
-1, 70, 70, 34, 836, 0xf55e9a61
-0, 73, 106, 33, 21086, 0x1b9412ce, F=0x0
-1, 105, 105, 34, 836, 0x415591f1
-0, 106, 273, 33, 62043, 0xc2356b56, F=0x0
-0, 133, 206, 33, 36175, 0x0a7df38c, F=0x0
-1, 140, 140, 34, 836, 0xe26c9bad
-0, 173, 173, 33, 16028, 0xa57fcbe9, F=0x0
-1, 174, 174, 34, 836, 0xbc8c9b66
-0, 206, 239, 33, 15428, 0x9a91f357, F=0x0
-1, 209, 209, 34, 836, 0xddeb9643
-0, 239, 406, 33, 66072, 0xa542b6d7, F=0x0
-1, 244, 244, 34, 836, 0x08a494eb
-0, 273, 339, 33, 34985, 0xbfd8ff45, F=0x0
-1, 279, 279, 34, 836, 0x94f09bb4
-0, 306, 306, 33, 16036, 0xfc39c6ea, F=0x0
-1, 314, 314, 34, 836, 0xd6358a3a
-0, 339, 373, 33, 19893, 0x7e746f4e, F=0x0
-1, 348, 348, 34, 836, 0x76ac91f1
-0, 373, 539, 33, 77576, 0xeba2e5c8, F=0x0
-1, 383, 383, 34, 836, 0xb32a86ac
+0, 5, 72, 33, 29766, 0x753c031a, F=0x0
+1, 34, 34, 34, 836, 0x14a3a0ff
+0, 38, 38, 33, 19409, 0x4b948b6c, F=0x0
+1, 69, 69, 34, 836, 0xf55e9a61
+0, 72, 105, 33, 21086, 0x1b9412ce, F=0x0
+1, 104, 104, 34, 836, 0x415591f1
+0, 105, 272, 33, 62043, 0xc2356b56, F=0x0
+0, 138, 205, 33, 36175, 0x0a7df38c, F=0x0
+1, 139, 139, 34, 836, 0xe26c9bad
+0, 172, 172, 33, 16028, 0xa57fcbe9, F=0x0
+1, 173, 173, 34, 836, 0xbc8c9b66
+0, 205, 238, 33, 15428, 0x9a91f357, F=0x0
+1, 208, 208, 34, 836, 0xddeb9643
+0, 238, 405, 33, 66072, 0xa542b6d7, F=0x0
+1, 243, 243, 34, 836, 0x08a494eb
+0, 272, 338, 33, 34985, 0xbfd8ff45, F=0x0
+1, 278, 278, 34, 836, 0x94f09bb4
+0, 305, 305, 33, 16036, 0xfc39c6ea, F=0x0
+1, 313, 313, 34, 836, 0xd6358a3a
+0, 338, 372, 33, 19893, 0x7e746f4e, F=0x0
+1, 347, 347, 34, 836, 0x76ac91f1
+0, 372, 538, 33, 77576, 0xeba2e5c8, F=0x0
+1, 382, 382, 34, 836, 0xb32a86ac
[STREAM]
[SIDE_DATA]
side_data_type=DOVI configuration record
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 30/31] avformat/mux: Peek into the muxing queue for avoid_negative_ts
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (29 preceding siblings ...)
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 29/31] avformat/mux: Preserve sync even if later packet has negative ts Andreas Rheinhardt
@ 2022-01-18 23:32 ` Andreas Rheinhardt
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 31/31] avformat/hls: Remove redundant cast Andreas Rheinhardt
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 23:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Peeking into the muxing queue can improve the estimate of
the lowest timestamp needed for avoid_negative_ts in case
the lowest timestamp is in a packet other than the first packet
to be muxed.
This fixes tickets #4536 and #5784 as well as the output from
the matroska-avoid-negative-ts FATE-test.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/mux.c | 21 ++++++++-
tests/fate/matroska.mak | 2 -
tests/ref/fate/matroska-avoid-negative-ts | 52 +++++++++++------------
3 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 0810b674a7..53eb56f0af 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -655,16 +655,33 @@ static void handle_avoid_negative_ts(FFFormatContext *si, FFStream *sti,
if (si->avoid_negative_ts_status == AVOID_NEGATIVE_TS_UNKNOWN) {
int use_pts = si->avoid_negative_ts_use_pts;
int64_t ts = use_pts ? pkt->pts : pkt->dts;
+ AVRational tb = sti->pub.time_base;
if (ts == AV_NOPTS_VALUE)
return;
+
+ /* Peek into the muxing queue to improve our estimate
+ * of the lowest timestamp if av_interleaved_write_frame() is used. */
+ for (const PacketListEntry *pktl = si->packet_buffer.head;
+ pktl; pktl = pktl->next) {
+ AVRational cmp_tb = s->streams[pktl->pkt.stream_index]->time_base;
+ int64_t cmp_ts = use_pts ? pktl->pkt.pts : pktl->pkt.dts;
+ if (cmp_ts == AV_NOPTS_VALUE)
+ continue;
+ if (s->output_ts_offset)
+ cmp_ts += av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, cmp_tb);
+ if (av_compare_ts(cmp_ts, cmp_tb, ts, tb) < 0) {
+ ts = cmp_ts;
+ tb = cmp_tb;
+ }
+ }
+
if (ts < 0 ||
ts > 0 && s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO) {
for (unsigned i = 0; i < s->nb_streams; i++) {
AVStream *const st2 = s->streams[i];
FFStream *const sti2 = ffstream(st2);
- sti2->mux_ts_offset = av_rescale_q_rnd(-ts,
- sti->pub.time_base,
+ sti2->mux_ts_offset = av_rescale_q_rnd(-ts, tb,
st2->time_base,
AV_ROUND_UP);
}
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 3d8110a434..e31ce39eda 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -94,8 +94,6 @@ fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi
# the first packet (with the overall lowest dts) is a video packet,
# whereas an audio packet to be muxed later has the overall lowest pts
# which happens to be negative and therefore needs to be shifted.
-# This is currently buggy (the timestamps are not shifted properly:
-# the first audio packet has negative timestamps).
# Also tests muxing DOVI.
FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \
AAC_FIXED_DECODER HEVC_DECODER \
diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts
index 5bc71c76f7..8266a4491f 100644
--- a/tests/ref/fate/matroska-avoid-negative-ts
+++ b/tests/ref/fate/matroska-avoid-negative-ts
@@ -1,4 +1,4 @@
-e31928477981a8ffad351379f6d5f14a *tests/data/fate/matroska-avoid-negative-ts.matroska
+e18a45c95db97f7cdfae28bd002786b6 *tests/data/fate/matroska-avoid-negative-ts.matroska
3618353 tests/data/fate/matroska-avoid-negative-ts.matroska
#extradata 0: 551, 0xa18acf66
#tb 0: 1/1000
@@ -12,32 +12,32 @@ e31928477981a8ffad351379f6d5f14a *tests/data/fate/matroska-avoid-negative-ts.mat
#sample_rate 1: 44100
#channel_layout 1: 3
#channel_layout_name 1: stereo
-0, -62, 5, 33, 63375, 0xc76606ab, S=1, 8
-0, -29, 138, 33, 46706, 0x0e08a7e5, F=0x0
+0, -61, 6, 33, 63375, 0xc76606ab, S=1, 8
+0, -28, 139, 33, 46706, 0x0e08a7e5, F=0x0
1, 0, 0, 34, 834, 0x7e7776bd
-0, 5, 72, 33, 29766, 0x753c031a, F=0x0
-1, 34, 34, 34, 836, 0x14a3a0ff
-0, 38, 38, 33, 19409, 0x4b948b6c, F=0x0
-1, 69, 69, 34, 836, 0xf55e9a61
-0, 72, 105, 33, 21086, 0x1b9412ce, F=0x0
-1, 104, 104, 34, 836, 0x415591f1
-0, 105, 272, 33, 62043, 0xc2356b56, F=0x0
-0, 138, 205, 33, 36175, 0x0a7df38c, F=0x0
-1, 139, 139, 34, 836, 0xe26c9bad
-0, 172, 172, 33, 16028, 0xa57fcbe9, F=0x0
-1, 173, 173, 34, 836, 0xbc8c9b66
-0, 205, 238, 33, 15428, 0x9a91f357, F=0x0
-1, 208, 208, 34, 836, 0xddeb9643
-0, 238, 405, 33, 66072, 0xa542b6d7, F=0x0
-1, 243, 243, 34, 836, 0x08a494eb
-0, 272, 338, 33, 34985, 0xbfd8ff45, F=0x0
-1, 278, 278, 34, 836, 0x94f09bb4
-0, 305, 305, 33, 16036, 0xfc39c6ea, F=0x0
-1, 313, 313, 34, 836, 0xd6358a3a
-0, 338, 372, 33, 19893, 0x7e746f4e, F=0x0
-1, 347, 347, 34, 836, 0x76ac91f1
-0, 372, 538, 33, 77576, 0xeba2e5c8, F=0x0
-1, 382, 382, 34, 836, 0xb32a86ac
+0, 6, 73, 33, 29766, 0x753c031a, F=0x0
+1, 35, 35, 34, 836, 0x14a3a0ff
+0, 39, 39, 33, 19409, 0x4b948b6c, F=0x0
+1, 70, 70, 34, 836, 0xf55e9a61
+0, 73, 106, 33, 21086, 0x1b9412ce, F=0x0
+1, 105, 105, 34, 836, 0x415591f1
+0, 106, 273, 33, 62043, 0xc2356b56, F=0x0
+0, 139, 206, 33, 36175, 0x0a7df38c, F=0x0
+1, 140, 140, 34, 836, 0xe26c9bad
+0, 173, 173, 33, 16028, 0xa57fcbe9, F=0x0
+1, 174, 174, 34, 836, 0xbc8c9b66
+0, 206, 239, 33, 15428, 0x9a91f357, F=0x0
+1, 209, 209, 34, 836, 0xddeb9643
+0, 239, 406, 33, 66072, 0xa542b6d7, F=0x0
+1, 244, 244, 34, 836, 0x08a494eb
+0, 273, 339, 33, 34985, 0xbfd8ff45, F=0x0
+1, 279, 279, 34, 836, 0x94f09bb4
+0, 306, 306, 33, 16036, 0xfc39c6ea, F=0x0
+1, 314, 314, 34, 836, 0xd6358a3a
+0, 339, 373, 33, 19893, 0x7e746f4e, F=0x0
+1, 348, 348, 34, 836, 0x76ac91f1
+0, 373, 539, 33, 77576, 0xeba2e5c8, F=0x0
+1, 383, 383, 34, 836, 0xb32a86ac
[STREAM]
[SIDE_DATA]
side_data_type=DOVI configuration record
--
2.32.0
_______________________________________________
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] 35+ messages in thread* [FFmpeg-devel] [PATCH 31/31] avformat/hls: Remove redundant cast
2022-01-16 22:49 [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow Andreas Rheinhardt
` (30 preceding siblings ...)
2022-01-18 23:32 ` [FFmpeg-devel] [PATCH 30/31] avformat/mux: Peek into the muxing queue for avoid_negative_ts Andreas Rheinhardt
@ 2022-01-18 23:32 ` Andreas Rheinhardt
31 siblings, 0 replies; 35+ messages in thread
From: Andreas Rheinhardt @ 2022-01-18 23:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/hls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 8c526f748f..4568e72cb2 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -2024,7 +2024,7 @@ static int hls_read_header(AVFormatContext *s)
if (seg && seg->key_type == KEY_SAMPLE_AES && pls->is_id3_timestamped &&
pls->audio_setup_info.codec_id != AV_CODEC_ID_NONE) {
void *iter = NULL;
- while ((in_fmt = (const AVInputFormat *)av_demuxer_iterate(&iter)))
+ while ((in_fmt = av_demuxer_iterate(&iter)))
if (in_fmt->raw_codec_id == pls->audio_setup_info.codec_id)
break;
} else {
--
2.32.0
_______________________________________________
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] 35+ messages in thread