RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 20:34:58 +00:00
Code Issues Releases Wiki Activity

demux_mkv: do not set bitrate fields for codecs which do not need it

Browse Source 
The only decoders I could find and which (possibly) require this field
are codecs which can be used via VfW only, and realaudio sipr. For VfW
we still passthrough this field.
This commit is contained in:
wm4 2015-06-19 21:46:32 +02:00
parent 8b44be54e7
commit f2cc6ce356
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demux/demux_mkv.c
View File

@ -1418,8 +1418,6 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
/* Common initialization for all RealAudio codecs */
unsigned char *src = track->private_data;
sh_a->bitrate = 0; /* FIXME !? */
int version = AV_RB16(src + 4);
unsigned int flavor = AV_RB16(src + 22);
track->coded_framesize = AV_RB32(src + 24);
@ -1530,18 +1528,14 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
const char *codec = sh->codec;
if (!strcmp(codec, "mp3")) {
sh_a->bitrate = 16000 * 8;
sh_a->block_align = 1152;
track->parse = true;
} else if (!strcmp(codec, "qdmc") || !strcmp(codec, "qdm2")) {
sh_a->bitrate = 16000 * 8;
sh_a->block_align = 1486;
} else if (!strcmp(codec, "aac")) {
sh_a->bitrate = 16000 * 8;
sh_a->block_align = 1024;
} else if (!strcmp(codec, "flac")) {
sh_a->bits_per_coded_sample = 0;
sh_a->bitrate = 0;
sh_a->block_align = 0;
unsigned char *ptr = extradata;
@ -1586,7 +1580,6 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
!strcmp(codec, "dts"))
{
sh_a->bits_per_coded_sample = 0;
sh_a->bitrate = 0;
sh_a->block_align = 0;
}