@@ -41,6 +41,7 @@
#include "riff.h"
#include "w64.h"
#include "spdif.h"
+#include "s337m.h"
typedef struct WAVDemuxContext {
const AVClass *class;
@@ -55,15 +56,17 @@ typedef struct WAVDemuxContext {
int audio_eof;
int ignore_length;
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);
@@ -76,10 +79,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) {
+ s->streams[0]->codecpar->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) {
+ s->streams[0]->codecpar->codec_id = codec;
+ wav->s337m = 1;
+ }
}
}
avio_seek(s->pb, pos, SEEK_SET);
@@ -596,7 +609,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;
}
@@ -700,6 +713,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 = MAX_SIZE;
if (st->codecpar->block_align > 1) {
if (size < st->codecpar->block_align)
@@ -708,6 +725,8 @@ smv_out:
}
size = FFMIN(size, left);
ret = av_get_packet(s->pb, pkt, size);
+ }
+
if (ret < 0)
return ret;
pkt->stream_index = 0;
@@ -895,7 +914,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;
}