Mercurial > mplayer.hg
comparison libmpdemux/demux_mkv.cpp @ 10036:1dfe4dab4a42
Implemented some default values. The corresponding Kax elements are not stored if they are set to their default value.
author | mosu |
---|---|
date | Wed, 30 Apr 2003 20:20:51 +0000 |
parents | 2d31643a3c22 |
children | f4d6cf8c6c93 |
comparison
equal
deleted
inserted
replaced
10035:d4ecf93e236a | 10036:1dfe4dab4a42 |
---|---|
275 sizeof(mkv_track_t *)); | 275 sizeof(mkv_track_t *)); |
276 if (d->tracks == NULL) | 276 if (d->tracks == NULL) |
277 return NULL; | 277 return NULL; |
278 d->tracks[d->num_tracks] = t; | 278 d->tracks[d->num_tracks] = t; |
279 d->num_tracks++; | 279 d->num_tracks++; |
280 | |
281 // Set default values. | |
282 t->default_track = 1; | |
283 t->a_sfreq = 8000.0; | |
284 t->a_channels = 1; | |
280 } | 285 } |
281 | 286 |
282 return t; | 287 return t; |
283 } | 288 } |
284 | 289 |
960 delete l2; | 965 delete l2; |
961 l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el, | 966 l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el, |
962 0xFFFFFFFFL, true, 1); | 967 0xFFFFFFFFL, true, 1); |
963 } | 968 } |
964 | 969 |
970 if (mkv_d->tc_scale == 0) | |
971 mkv_d->tc_scale = MKVD_TIMECODESCALE; | |
972 | |
965 } else if (EbmlId(*l1) == KaxTracks::ClassInfos.GlobalId) { | 973 } else if (EbmlId(*l1) == KaxTracks::ClassInfos.GlobalId) { |
966 // Yep, we've found our KaxTracks element. Now find all tracks | 974 // Yep, we've found our KaxTracks element. Now find all tracks |
967 // contained in this segment. | 975 // contained in this segment. |
968 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment tracks...\n"); | 976 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment tracks...\n"); |
969 | 977 |
1337 | 1345 |
1338 } catch (exception &ex) { | 1346 } catch (exception &ex) { |
1339 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] caught exception\n"); | 1347 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] caught exception\n"); |
1340 return 0; | 1348 return 0; |
1341 } | 1349 } |
1342 | |
1343 if (mkv_d->tc_scale == 0) | |
1344 mkv_d->tc_scale = MKVD_TIMECODESCALE; | |
1345 | 1350 |
1346 if (!check_track_information(mkv_d)) { | 1351 if (!check_track_information(mkv_d)) { |
1347 free_mkv_demuxer(mkv_d); | 1352 free_mkv_demuxer(mkv_d); |
1348 return 0; | 1353 return 0; |
1349 } | 1354 } |