Chromium Code Reviews| Index: media/filters/ffmpeg_demuxer.cc |
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
| index d54db072725801e754db463d2a00b5f299d2cf94..d5189c4d77ce2ef742664612a16862af37c408d8 100644 |
| --- a/media/filters/ffmpeg_demuxer.cc |
| +++ b/media/filters/ffmpeg_demuxer.cc |
| @@ -394,6 +394,7 @@ FFmpegDemuxer::FFmpegDemuxer( |
| media_log_(media_log), |
| bitrate_(0), |
| start_time_(kNoTimestamp()), |
| + liveness_(LIVENESS_UNKNOWN), |
| audio_disabled_(false), |
| text_enabled_(false), |
| duration_known_(false), |
| @@ -506,6 +507,11 @@ base::Time FFmpegDemuxer::GetTimelineOffset() const { |
| return timeline_offset_; |
| } |
| +Demuxer::Liveness FFmpegDemuxer::GetLiveness() const { |
| + DCHECK(task_runner_->BelongsToCurrentThread()); |
| + return LIVENESS_UNKNOWN; |
|
acolwell GONE FROM CHROMIUM
2014/04/25 23:30:52
nit: Shouldn't this return liveness_?
Sergey Ulanov
2014/04/26 01:51:03
Yes, it should :)
|
| +} |
| + |
| void FFmpegDemuxer::AddTextStreams() { |
| DCHECK(task_runner_->BelongsToCurrentThread()); |
| @@ -696,6 +702,14 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb, |
| timeline_offset_ = ExtractTimelineOffset(format_context); |
| + if (max_duration == kInfiniteDuration() && !timeline_offset_.is_null()) { |
| + liveness_ = LIVENESS_LIVE; |
| + } else if (max_duration != kInfiniteDuration()) { |
| + liveness_ = LIVENESS_RECORDED; |
| + } else { |
| + liveness_ = LIVENESS_UNKNOWN; |
| + } |
| + |
| // Good to go: set the duration and bitrate and notify we're done |
| // initializing. |
| host_->SetDuration(max_duration); |