Changeset f13993e1dbd376419c522b9b57293a383fa4fe06
- Timestamp:
- 21/08/04 14:38:53
(4 years ago)
- Author:
- Cyril Deguet <asmax@videolan.org>
- git-committer:
- Cyril Deguet <asmax@videolan.org> 1093091933 +0000
- git-parent:
[1f5ad5198aedd07f680c1252ffb73080dc37a521]
- git-author:
- Cyril Deguet <asmax@videolan.org> 1093091933 +0000
- Message:
- src/audio_output/output.c: check if start_date is null in
aout_OutputNextBuffer(), then do not try to resample or play silences.
Now everything works perfectly with screwed ALSA drivers that always
return zero in snd_pcm_status_get_tstamp() (at last!!!)
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r0011cc9 |
rf13993e |
|
| 307 | 307 | |
|---|
| 308 | 308 | /* Here we suppose that all buffers have the same duration - this is |
|---|
| 309 | | * generally true, and anyway if it's wrong it won't be a disaster. */ |
|---|
| 310 | | if ( p_buffer->start_date > start_date |
|---|
| | 309 | * generally true, and anyway if it's wrong it won't be a disaster. |
|---|
| | 310 | * start_date may be null with some screwed ALSA driver; then do not |
|---|
| | 311 | * try to play silences or resample. |
|---|
| | 312 | */ |
|---|
| | 313 | if ( start_date && p_buffer->start_date > start_date |
|---|
| 311 | 314 | + (p_buffer->end_date - p_buffer->start_date) ) |
|---|
| 312 | 315 | /* |
|---|
| … | … | |
| 327 | 330 | p_aout->output.b_starving = 0; |
|---|
| 328 | 331 | |
|---|
| 329 | | if ( !b_can_sleek && |
|---|
| | 332 | if ( !b_can_sleek && start_date && |
|---|
| 330 | 333 | ( (p_buffer->start_date - start_date > AOUT_PTS_TOLERANCE) |
|---|
| 331 | 334 | || (start_date - p_buffer->start_date > AOUT_PTS_TOLERANCE) ) ) |
|---|
