RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

truehd: support up to 3 substreams. 

Originally committed as revision 18072 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2009-03-20 13:02:15 +00:00
parent 952e2083bc
commit 932cee5d67
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mlp.h
View File

@ -34,10 +34,10 @@
*/
#define MAX_MATRICES 15
/** Maximum number of substreams that can be decoded. This could also be set
* higher, but I haven't seen any examples with more than two.
/** Maximum number of substreams that can be decoded.
* MLP's limit is 2. TrueHD supports at least up to 3.
*/
#define MAX_SUBSTREAMS 2
#define MAX_SUBSTREAMS 3
/** maximum sample frequency seen in files */
#define MAX_SAMPLERATE 192000

4
libavcodec/mlpdec.c
View File

@ -280,6 +280,10 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
if (mh.num_substreams == 0)
return -1;
if (m->avctx->codec_id == CODEC_ID_MLP && mh.num_substreams > 2) {
av_log(m->avctx, AV_LOG_ERROR, "MLP only supports up to 2 substreams.\n");
return -1;
}
if (mh.num_substreams > MAX_SUBSTREAMS) {
av_log(m->avctx, AV_LOG_ERROR,
"Number of substreams %d is larger than the maximum supported "