| Index: trunk/src/media/ffmpeg/ffmpeg_common.cc
|
| ===================================================================
|
| --- trunk/src/media/ffmpeg/ffmpeg_common.cc (revision 264802)
|
| +++ trunk/src/media/ffmpeg/ffmpeg_common.cc (working copy)
|
| @@ -298,6 +298,12 @@
|
| codec_context->seek_preroll * 1000000.0 / codec_context->sample_rate);
|
| }
|
|
|
| + base::TimeDelta codec_delay;
|
| + if (codec_context->delay > 0) {
|
| + codec_delay = base::TimeDelta::FromMicroseconds(
|
| + codec_context->delay * 1000000.0 / codec_context->sample_rate);
|
| + }
|
| +
|
| config->Initialize(codec,
|
| sample_format,
|
| channel_layout,
|
| @@ -307,7 +313,7 @@
|
| is_encrypted,
|
| record_stats,
|
| seek_preroll,
|
| - codec_context->delay);
|
| + codec_delay);
|
| if (codec != kCodecOpus) {
|
| DCHECK_EQ(av_get_bytes_per_sample(codec_context->sample_fmt) * 8,
|
| config->bits_per_channel());
|
|
|