[FFmpeg-devel] [PATCH 2/2] avformat/flvdec: make key frame timestamps more accurate

[FFmpeg-devel] [PATCH 2/2] avformat/flvdec: make key frame timestamps more accurate

[Zhao Zhili]

From: Zhao Zhili <zhilizhao@tencent.com>

There is an implicit cast from double to int64_t in time unit of
second.
---
 libavformat/flvdec.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index c5d3c63bd0..a78d720295 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -146,9 +146,9 @@ static void add_keyframes_index(AVFormatContext *s)
     if (ffstream(stream)->nb_index_entries == 0) {
         for (i = 0; i < flv->keyframe_count; i++) {
             av_log(s, AV_LOG_TRACE, "keyframe filepositions = %"PRId64" times = %"PRId64"\n",
-                   flv->keyframe_filepositions[i], flv->keyframe_times[i] * 1000);
+                   flv->keyframe_filepositions[i], flv->keyframe_times[i]);
             av_add_index_entry(stream, flv->keyframe_filepositions[i],
-                flv->keyframe_times[i] * 1000, 0, 0, AVINDEX_KEYFRAME);
+                flv->keyframe_times[i], 0, 0, AVINDEX_KEYFRAME);
         }
     } else
         av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n");
@@ -461,9 +461,13 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
             d = av_int2double(avio_rb64(ioc));
             if (isnan(d) || d < INT64_MIN || d > INT64_MAX)
                 goto invalid;
-            if (current_array == &times && (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000))
-                goto invalid;
-            current_array[0][i] = d;
+            if (current_array == &times) {
+                if (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000)
+                    goto invalid;
+                current_array[0][i] = d * 1000;
+            } else {
+                current_array[0][i] = d;
+            }
         }
         if (times && filepositions) {
             // All done, exiting at a position allowing amf_parse_object
@@ -476,7 +480,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
     if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) {
         for (i = 0; i < FFMIN(2,fileposlen); i++) {
             flv->validate_index[i].pos = filepositions[i];
-            flv->validate_index[i].dts = times[i] * 1000;
+            flv->validate_index[i].dts = times[i];
             flv->validate_count        = i + 1;
         }
         flv->keyframe_times = times;
-- 
2.35.3

_______________________________________________
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".

[FFmpeg-devel] [PATCH 3/3] avformat/flvenc: fix shadowed variable ts

[Zhao Zhili]

From: Zhao Zhili <zhilizhao@tencent.com>

---
 libavformat/flvenc.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 1c4ffb985a..5d574fa790 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -993,12 +993,9 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
                 flv->videosize += (avio_tell(pb) - cur_offset);
                 flv->lasttimestamp = pkt->dts / 1000.0;
                 if (pkt->flags & AV_PKT_FLAG_KEY) {
-                    double ts = flv->lasttimestamp;
-                    int64_t pos = cur_offset;
-
-                    flv->lastkeyframetimestamp = ts;
-                    flv->lastkeyframelocation = pos;
-                    ret = flv_append_keyframe_info(s, flv, ts, pos);
+                    flv->lastkeyframetimestamp = flv->lasttimestamp;
+                    flv->lastkeyframelocation = cur_offset;
+                    ret = flv_append_keyframe_info(s, flv, flv->lasttimestamp, cur_offset);
                     if (ret < 0)
                         goto fail;
                 }
-- 
2.35.3

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH 2/2] avformat/flvdec: make key frame timestamps more accurate

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 4867 bytes --]

On Thu, Jul 14, 2022 at 12:48:14PM +0800, Zhao Zhili wrote:
> From: Zhao Zhili <zhilizhao@tencent.com>
> 
> There is an implicit cast from double to int64_t in time unit of
> second.
> ---
>  libavformat/flvdec.c | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> index c5d3c63bd0..a78d720295 100644
> --- a/libavformat/flvdec.c
> +++ b/libavformat/flvdec.c
> @@ -146,9 +146,9 @@ static void add_keyframes_index(AVFormatContext *s)
>      if (ffstream(stream)->nb_index_entries == 0) {
>          for (i = 0; i < flv->keyframe_count; i++) {
>              av_log(s, AV_LOG_TRACE, "keyframe filepositions = %"PRId64" times = %"PRId64"\n",
> -                   flv->keyframe_filepositions[i], flv->keyframe_times[i] * 1000);
> +                   flv->keyframe_filepositions[i], flv->keyframe_times[i]);
>              av_add_index_entry(stream, flv->keyframe_filepositions[i],
> -                flv->keyframe_times[i] * 1000, 0, 0, AVINDEX_KEYFRAME);
> +                flv->keyframe_times[i], 0, 0, AVINDEX_KEYFRAME);
>          }
>      } else
>          av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n");
> @@ -461,9 +461,13 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
>              d = av_int2double(avio_rb64(ioc));
>              if (isnan(d) || d < INT64_MIN || d > INT64_MAX)
>                  goto invalid;
> -            if (current_array == &times && (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000))
> -                goto invalid;
> -            current_array[0][i] = d;
> +            if (current_array == &times) {
> +                if (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000)
> +                    goto invalid;
> +                current_array[0][i] = d * 1000;
> +            } else {
> +                current_array[0][i] = d;
> +            }
>          }
>          if (times && filepositions) {
>              // All done, exiting at a position allowing amf_parse_object
> @@ -476,7 +480,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
>      if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) {
>          for (i = 0; i < FFMIN(2,fileposlen); i++) {
>              flv->validate_index[i].pos = filepositions[i];
> -            flv->validate_index[i].dts = times[i] * 1000;
> +            flv->validate_index[i].dts = times[i];
>              flv->validate_count        = i + 1;
>          }
>          flv->keyframe_times = times;

can be simplified like this:


diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index a78d720295..3155b2a517 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -428,6 +428,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
            amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
         int64_t **current_array;
         unsigned int arraylen;
+        int factor;
 
         // Expect array object in context
         if (avio_r8(ioc) != AMF_DATA_TYPE_ARRAY)
@@ -440,10 +441,12 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
         if       (!strcmp(KEYFRAMES_TIMESTAMP_TAG , str_val) && !times) {
             current_array = &times;
             timeslen      = arraylen;
+            factor        = 1000;
         } else if (!strcmp(KEYFRAMES_BYTEOFFSET_TAG, str_val) &&
                    !filepositions) {
             current_array = &filepositions;
             fileposlen    = arraylen;
+            factor        = 1;
         } else
             // unexpected metatag inside keyframes, will not use such
             // metadata for indexing
@@ -458,16 +461,10 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m
             double d;
             if (avio_r8(ioc) != AMF_DATA_TYPE_NUMBER)
                 goto invalid;
-            d = av_int2double(avio_rb64(ioc));
+            d = av_int2double(avio_rb64(ioc)) * factor;
             if (isnan(d) || d < INT64_MIN || d > INT64_MAX)
                 goto invalid;
-            if (current_array == &times) {
-                if (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000)
-                    goto invalid;
-                current_array[0][i] = d * 1000;
-            } else {
-                current_array[0][i] = d;
-            }
+            current_array[0][i] = d;
         }
         if (times && filepositions) {
             // All done, exiting at a position allowing amf_parse_object
[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 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".