diff mbox series

[FFmpeg-devel] avformat/flacdec: set time base for headerless flac

Message ID CAPYw7P5us4heV1_Z0xuJHF_T53O=X6QjF-F=2wiS1ZC8bFe+RA@mail.gmail.com
State New
Headers show
Series [FFmpeg-devel] avformat/flacdec: set time base for headerless flac | expand

Commit Message

Paul B Mahol Sept. 6, 2023, 12:10 a.m. UTC 
Attached.

Comments

Tomas Härdin Sept. 6, 2023, 6:11 a.m. UTC | #1 
ons 2023-09-06 klockan 02:10 +0200 skrev Paul B Mahol:
> +static const uint16_t sr_table[16] = {
> +    0, 1764, 3528, 3840, 160, 320, 441, 480, 640, 882, 960, 1920, 0,
> 0, 0, 0
> +};

Why not premultiply these by 50?

/Tomas
Paul B Mahol Sept. 6, 2023, 7:11 a.m. UTC | #2 
On Wed, Sep 6, 2023 at 8:12 AM Tomas Härdin <git@haerdin.se> wrote:

> ons 2023-09-06 klockan 02:10 +0200 skrev Paul B Mahol:
> > +static const uint16_t sr_table[16] = {
> > +    0, 1764, 3528, 3840, 160, 320, 441, 480, 640, 882, 960, 1920, 0,
> > 0, 0, 0
> > +};
>
> Why not premultiply these by 50?
>

Because that would use 2x more space.


> /Tomas
> _______________________________________________
> 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".
>
Paul B Mahol Sept. 7, 2023, 9:17 a.m. UTC | #3 
will apply
diff mbox series

Patch

From dea5517ee383b4133a11137b99b27ba389e04a47 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Wed, 6 Sep 2023 02:04:10 +0200
Subject: [PATCH] avformat/flacdec: set time base for headerless flac

Fixes #6396.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavformat/flacdec.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index b58ec03963..5104f23110 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -46,11 +46,16 @@  static void reset_index_position(int64_t metadata_head_size, AVStream *st)
         sti->index_entries[i].pos += metadata_head_size;
 }
 
+static const uint16_t sr_table[16] = {
+    0, 1764, 3528, 3840, 160, 320, 441, 480, 640, 882, 960, 1920, 0, 0, 0, 0
+};
+
 static int flac_read_header(AVFormatContext *s)
 {
     int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0;
     uint8_t header[4];
     uint8_t *buffer=NULL;
+    uint32_t marker;
     FLACDecContext *flac = s->priv_data;
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
@@ -61,7 +66,11 @@  static int flac_read_header(AVFormatContext *s)
     /* the parameters will be extracted from the compressed bitstream */
 
     /* if fLaC marker is not found, assume there is no header */
-    if (avio_rl32(s->pb) != MKTAG('f','L','a','C')) {
+    marker = avio_rl32(s->pb);
+    if (marker != MKTAG('f','L','a','C')) {
+        const int sample_rate = 50 * sr_table[(marker >> 16) & 0xF];
+        if (sample_rate)
+            avpriv_set_pts_info(st, 64, 1, sample_rate);
         avio_seek(s->pb, -4, SEEK_CUR);
         return 0;
     }
-- 
2.39.1