From: Paul B Mahol <onemda@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH] avformat/flacdec: set time base for headerless flac Date: Wed, 6 Sep 2023 02:10:29 +0200 Message-ID: <CAPYw7P5us4heV1_Z0xuJHF_T53O=X6QjF-F=2wiS1ZC8bFe+RA@mail.gmail.com> (raw) [-- Attachment #1: Type: text/plain, Size: 10 bytes --] Attached. [-- Attachment #2: 0001-avformat-flacdec-set-time-base-for-headerless-flac.patch --] [-- Type: text/x-patch, Size: 1690 bytes --] 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 [-- Attachment #3: 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".
next reply other threads:[~2023-09-06 0:03 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-06 0:10 Paul B Mahol [this message] 2023-09-06 6:11 ` Tomas Härdin 2023-09-06 7:11 ` Paul B Mahol 2023-09-07 9:17 ` Paul B Mahol
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAPYw7P5us4heV1_Z0xuJHF_T53O=X6QjF-F=2wiS1ZC8bFe+RA@mail.gmail.com' \ --to=onemda@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git