Add s337m probing/reading similarly to spdif.
---
libavformat/wavdec.c | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index d6ab0dde35..b755ab5514 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -43,6 +43,7 @@
#include "riff.h"
#include "w64.h"
#include "spdif.h"
+#include "s337m.h"
typedef struct WAVDemuxContext {
const AVClass *class;
@@ -58,15 +59,17 @@ typedef struct WAVDemuxContext {
int ignore_length;
int max_size;
int spdif;
+ int s337m;
int smv_cur_pt;
int smv_given_first;
int unaligned; // e.g. if an odd number of bytes ID3 tag was prepended
int rifx; // RIFX: integer byte order for parameters is big endian
} WAVDemuxContext;
-static void set_spdif(AVFormatContext *s, WAVDemuxContext *wav)
+static void set_spdif_s337m(AVFormatContext *s, WAVDemuxContext *wav)
{
- if (CONFIG_SPDIF_DEMUXER && s->streams[0]->codecpar->codec_tag == 1) {
+ AVCodecParameters *par = s->streams[0]->codecpar;
+ if ((CONFIG_SPDIF_DEMUXER || CONFIG_S337M_DEMUXER) && par->codec_tag == 1)
{
enum AVCodecID codec;
int len = 1<<16;
int ret = ffio_ensure_seekback(s->pb, len);
@@ -79,10 +82,20 @@ static void set_spdif(AVFormatContext *s, WAVDemuxContext
*wav)
int64_t pos = avio_tell(s->pb);
len = ret = avio_read(s->pb, buf, len);
if (len >= 0) {
- ret = ff_spdif_probe(buf, len, &codec);
- if (ret > AVPROBE_SCORE_EXTENSION) {
- s->streams[0]->codecpar->codec_id = codec;
- wav->spdif = 1;
+ if (CONFIG_SPDIF_DEMUXER) {
+ ret = ff_spdif_probe(buf, len, &codec);
+ if (ret > AVPROBE_SCORE_EXTENSION) {
+ par->codec_id = codec;
+ wav->spdif = 1;
+ }
+ }
+ if (CONFIG_S337M_DEMUXER && !wav->spdif
+ && (par->codec_id == AV_CODEC_ID_PCM_S16LE ||
par->codec_id == AV_CODEC_ID_PCM_S24LE) && par->channels == 2) {
+ ret = ff_s337m_probe(buf, len, &codec,
par->bits_per_coded_sample);
+ if (ret > AVPROBE_SCORE_EXTENSION) {
+ par->codec_id = codec;
+ wav->s337m = 1;
+ }
}
}
avio_seek(s->pb, pos, SEEK_SET);
@@ -91,7 +104,7 @@ static void set_spdif(AVFormatContext *s, WAVDemuxContext
*wav)
}
if (ret < 0)
- av_log(s, AV_LOG_WARNING, "Cannot check for SPDIF\n");
+ av_log(s, AV_LOG_WARNING, "Cannot check for SPDIF/S337M\n");
}
}
@@ -649,7 +662,7 @@ break_loop:
ff_metadata_conv_ctx(s, NULL, wav_metadata_conv);
ff_metadata_conv_ctx(s, NULL, ff_riff_info_conv);
- set_spdif(s, wav);
+ set_spdif_s337m(s, wav);
return 0;
}
@@ -751,6 +764,10 @@ smv_out:
wav->data_end = avio_tell(s->pb) + left;
}
+ if (CONFIG_S337M_DEMUXER && wav->s337m == 1) {
+ size = FFMIN(S337M_MAX_OFFSET, left);
+ ret = ff_s337m_get_packet(s->pb, pkt, size, NULL, s,
st->codecpar->bits_per_coded_sample);
+ } else {
size = wav->max_size;
if (st->codecpar->block_align > 1) {
if (size < st->codecpar->block_align)
@@ -759,6 +776,8 @@ smv_out:
}
size = FFMIN(size, left);
ret = av_get_packet(s->pb, pkt, size);
+ }
+
if (ret < 0)
return ret;
pkt->stream_index = 0;
@@ -947,7 +966,7 @@ static int w64_read_header(AVFormatContext *s)
avio_seek(pb, data_ofs, SEEK_SET);
- set_spdif(s, wav);
+ set_spdif_s337m(s, wav);
return 0;
}
--
2.27.0.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
