Mercurial > libavformat.hg
changeset 5832:cf9f77508e9c libavformat
matroskadec: add support for SIPR audio tracks
| author | aurel |
|---|---|
| date | Fri, 12 Mar 2010 23:49:06 +0000 |
| parents | 6ff00deb94fb |
| children | c4d0166d9128 |
| files | Makefile matroska.c matroskadec.c |
| diffstat | 3 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Mar 12 23:35:59 2010 +0000 +++ b/Makefile Fri Mar 12 23:49:06 2010 +0000 @@ -100,7 +100,7 @@ OBJS-$(CONFIG_M4V_DEMUXER) += raw.o OBJS-$(CONFIG_M4V_MUXER) += raw.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ - riff.o isom.o + riff.o isom.o rm.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ riff.o isom.o avc.o flacenc.o OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
--- a/matroska.c Fri Mar 12 23:35:59 2010 +0000 +++ b/matroska.c Fri Mar 12 23:49:06 2010 +0000 @@ -45,7 +45,7 @@ {"A_REAL/28_8" , CODEC_ID_RA_288}, {"A_REAL/ATRC" , CODEC_ID_ATRAC3}, {"A_REAL/COOK" , CODEC_ID_COOK}, -// {"A_REAL/SIPR" , CODEC_ID_SIPRO}, + {"A_REAL/SIPR" , CODEC_ID_SIPR}, {"A_TRUEHD" , CODEC_ID_TRUEHD}, {"A_TTA1" , CODEC_ID_TTA}, {"A_VORBIS" , CODEC_ID_VORBIS},
--- a/matroskadec.c Fri Mar 12 23:35:59 2010 +0000 +++ b/matroskadec.c Fri Mar 12 23:49:06 2010 +0000 @@ -33,6 +33,7 @@ /* For ff_codec_get_id(). */ #include "riff.h" #include "isom.h" +#include "rm.h" #include "matroska.h" #include "libavcodec/mpeg4audio.h" #include "libavutil/intfloat_readwrite.h" @@ -1312,10 +1313,12 @@ track->audio.out_samplerate = 8000; track->audio.channels = 1; } else if (codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK || - codec_id == CODEC_ID_ATRAC3) { + codec_id == CODEC_ID_ATRAC3 || codec_id == CODEC_ID_SIPR) { + int flavor; init_put_byte(&b, track->codec_priv.data,track->codec_priv.size, 0, NULL, NULL, NULL, NULL); - url_fskip(&b, 24); + url_fskip(&b, 22); + flavor = get_be16(&b); track->audio.coded_framesize = get_be32(&b); url_fskip(&b, 12); track->audio.sub_packet_h = get_be16(&b); @@ -1326,6 +1329,11 @@ st->codec->block_align = track->audio.coded_framesize; track->codec_priv.size = 0; } else { + if (codec_id == CODEC_ID_SIPR && flavor < 4) { + const int sipr_bit_rate[4] = { 6504, 8496, 5000, 16000 }; + track->audio.sub_packet_size = ff_sipr_subpk_size[flavor]; + st->codec->bit_rate = sipr_bit_rate[flavor]; + } st->codec->block_align = track->audio.sub_packet_size; extradata_offset = 78; } @@ -1638,6 +1646,7 @@ for (n = 0; n < laces; n++) { if ((st->codec->codec_id == CODEC_ID_RA_288 || st->codec->codec_id == CODEC_ID_COOK || + st->codec->codec_id == CODEC_ID_SIPR || st->codec->codec_id == CODEC_ID_ATRAC3) && st->codec->block_align && track->audio.sub_packet_size) { int a = st->codec->block_align; @@ -1653,11 +1662,15 @@ for (x=0; x<h/2; x++) memcpy(track->audio.buf+x*2*w+y*cfs, data+x*cfs, cfs); + else if (st->codec->codec_id == CODEC_ID_SIPR) + memcpy(track->audio.buf + y*w, data, w); else for (x=0; x<w/sps; x++) memcpy(track->audio.buf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), data+x*sps, sps); if (++track->audio.sub_packet_cnt >= h) { + if (st->codec->codec_id == CODEC_ID_SIPR) + ff_rm_reorder_sipr_data(track->audio.buf, h, w); track->audio.sub_packet_cnt = 0; track->audio.pkt_cnt = h*w / a; }