1. ffmpeg
  2. Commit a11282259796562820e2bec371487e19743c7ad6
Browse code

movenc: Add channel layouts for PCM.

Alex Converse authored on 2012/06/24 08:57:56
Showing 5 changed files
libavformat/mov_chan.c
History View file @ a112822
... ... 
@@ -414,6 +414,20 @@ static const enum MovChannelLayoutTag mov_ch_layouts_alac[] = {
414 414 
     0,
415 415 
 };
416 416
417 
+static const enum MovChannelLayoutTag mov_ch_layouts_wav[] = {
418 
+    MOV_CH_LAYOUT_MONO,
419 
+    MOV_CH_LAYOUT_STEREO,
420 
+    MOV_CH_LAYOUT_MATRIXSTEREO,
421 
+    MOV_CH_LAYOUT_MPEG_3_0_A,
422 
+    MOV_CH_LAYOUT_QUADRAPHONIC,
423 
+    MOV_CH_LAYOUT_MPEG_5_0_A,
424 
+    MOV_CH_LAYOUT_MPEG_5_1_A,
425 
+    MOV_CH_LAYOUT_MPEG_6_1_A,
426 
+    MOV_CH_LAYOUT_MPEG_7_1_A,
427 
+    MOV_CH_LAYOUT_MPEG_7_1_C,
428 
+    MOV_CH_LAYOUT_SMPTE_DTV,
429 
+};
430 
+
417 431 
 static const struct {
418 432 
     enum CodecID codec_id;
419 433 
     const enum MovChannelLayoutTag *layouts;
... ... 
@@ -421,6 +435,18 @@ static const struct {
421 421 
     { CODEC_ID_AAC,     mov_ch_layouts_aac      },
422 422 
     { CODEC_ID_AC3,     mov_ch_layouts_ac3      },
423 423 
     { CODEC_ID_ALAC,    mov_ch_layouts_alac     },
424 
+    { CODEC_ID_PCM_U8,    mov_ch_layouts_wav    },
425 
+    { CODEC_ID_PCM_S8,    mov_ch_layouts_wav    },
426 
+    { CODEC_ID_PCM_S16LE, mov_ch_layouts_wav    },
427 
+    { CODEC_ID_PCM_S16BE, mov_ch_layouts_wav    },
428 
+    { CODEC_ID_PCM_S24LE, mov_ch_layouts_wav    },
429 
+    { CODEC_ID_PCM_S24BE, mov_ch_layouts_wav    },
430 
+    { CODEC_ID_PCM_S32LE, mov_ch_layouts_wav    },
431 
+    { CODEC_ID_PCM_S32BE, mov_ch_layouts_wav    },
432 
+    { CODEC_ID_PCM_F32LE, mov_ch_layouts_wav    },
433 
+    { CODEC_ID_PCM_F32BE, mov_ch_layouts_wav    },
434 
+    { CODEC_ID_PCM_F64LE, mov_ch_layouts_wav    },
435 
+    { CODEC_ID_PCM_F64BE, mov_ch_layouts_wav    },
424 436 
     { CODEC_ID_NONE,    NULL                    },
425 437 
 };
426 438
tests/ref/fate/acodec-pcm-s16be
History View file @ a112822
... ... 
@@ -1,4 +1,4 @@
1 
-b023c4792bd206fa96f64a8a012b6eb8 *tests/data/fate/acodec-pcm-s16be.mov
1 
+009a446579dd4cba793723b5e2b93c39 *tests/data/fate/acodec-pcm-s16be.mov
2 2 
 1060097 tests/data/fate/acodec-pcm-s16be.mov
3 3 
 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16be.out.wav
4 4 
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
tests/ref/fate/acodec-pcm-s24be
History View file @ a112822
... ... 
@@ -1,4 +1,4 @@
1 
-3607f8c7029a0c2ca2c8bf2c929518b3 *tests/data/fate/acodec-pcm-s24be.mov
1 
+de27dae0dff0359d8f39449b17d5607f *tests/data/fate/acodec-pcm-s24be.mov
2 2 
 1589297 tests/data/fate/acodec-pcm-s24be.mov
3 3 
 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24be.out.wav
4 4 
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
tests/ref/fate/acodec-pcm-s32be
History View file @ a112822
... ... 
@@ -1,4 +1,4 @@
1 
-2a47292543cb0c25583a49397504e6d1 *tests/data/fate/acodec-pcm-s32be.mov
1 
+2db1e7fe92d4006103691a4b59064dc6 *tests/data/fate/acodec-pcm-s32be.mov
2 2 
 2118497 tests/data/fate/acodec-pcm-s32be.mov
3 3 
 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32be.out.wav
4 4 
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
tests/ref/fate/acodec-pcm-s8
History View file @ a112822
... ... 
@@ -1,4 +1,4 @@
1 
-953eb563c7ea81c1ec73c5a806975e34 *tests/data/fate/acodec-pcm-s8.mov
1 
+9ee95a7fff38831a1cad3b49c33e6ed9 *tests/data/fate/acodec-pcm-s8.mov
2 2 
 530897 tests/data/fate/acodec-pcm-s8.mov
3 3 
 651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-s8.out.wav
4 4 
 stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400