Commit 438610ed authored by aurel's avatar aurel

add audio output sampling freqency reading in matroska


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6946 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 177b641a
...@@ -110,6 +110,8 @@ ...@@ -110,6 +110,8 @@
/* IDs in the trackaudio master */ /* IDs in the trackaudio master */
#define MATROSKA_ID_AUDIOSAMPLINGFREQ 0xB5 #define MATROSKA_ID_AUDIOSAMPLINGFREQ 0xB5
#define MATROSKA_ID_AUDIOOUTSAMPLINGFREQ 0x78B5
#define MATROSKA_ID_AUDIOBITDEPTH 0x6264 #define MATROSKA_ID_AUDIOBITDEPTH 0x6264
#define MATROSKA_ID_AUDIOCHANNELS 0x9F #define MATROSKA_ID_AUDIOCHANNELS 0x9F
...@@ -273,6 +275,7 @@ typedef struct MatroskaAudioTrack { ...@@ -273,6 +275,7 @@ typedef struct MatroskaAudioTrack {
int channels, int channels,
bitdepth, bitdepth,
internal_samplerate,
samplerate; samplerate;
//.. //..
} MatroskaAudioTrack; } MatroskaAudioTrack;
...@@ -1429,6 +1432,16 @@ matroska_add_stream (MatroskaDemuxContext *matroska) ...@@ -1429,6 +1432,16 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
switch (id) { switch (id) {
/* samplerate */ /* samplerate */
case MATROSKA_ID_AUDIOSAMPLINGFREQ: { case MATROSKA_ID_AUDIOSAMPLINGFREQ: {
double num;
if ((res = ebml_read_float(matroska, &id,
&num)) < 0)
break;
audiotrack->internal_samplerate =
audiotrack->samplerate = num;
break;
}
case MATROSKA_ID_AUDIOOUTSAMPLINGFREQ: {
double num; double num;
if ((res = ebml_read_float(matroska, &id, if ((res = ebml_read_float(matroska, &id,
&num)) < 0) &num)) < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment