git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57e590e
)
smacker: set channel layout
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 7 Apr 2012 22:36:49 +0000
(18:36 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 12 Nov 2012 15:33:22 +0000
(10:33 -0500)
libavformat/smacker.c
patch
|
blob
|
history
diff --git
a/libavformat/smacker.c
b/libavformat/smacker.c
index
dcca1af
..
17c7c52
100644
(file)
--- a/
libavformat/smacker.c
+++ b/
libavformat/smacker.c
@@
-24,6
+24,7
@@
*/
#include "libavutil/bswap.h"
*/
#include "libavutil/bswap.h"
+#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
@@
-191,7
+192,13
@@
static int smacker_read_header(AVFormatContext *s)
} else {
ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8;
}
} else {
ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8;
}
- ast[i]->codec->channels = (smk->aflags[i] & SMK_AUD_STEREO) ? 2 : 1;
+ if (smk->aflags[i] & SMK_AUD_STEREO) {
+ ast[i]->codec->channels = 2;
+ ast[i]->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ ast[i]->codec->channels = 1;
+ ast[i]->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ }
ast[i]->codec->sample_rate = smk->rates[i];
ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8)
ast[i]->codec->sample_rate = smk->rates[i];
ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8)