X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Faudio%2Faudio_decoder.cpp;h=ae9ef01c45b33e6e59e0c95cc279c706162442ab;hb=81908c20a405191305f4f643c7a96b44e00861f8;hp=00848a1696d05eeb1ecfa598255597c99120aa1d;hpb=2706cdd69036c066dab0757171bbed4eeea6c584;p=casparcg diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp index 00848a169..ae9ef01c4 100644 --- a/modules/ffmpeg/producer/audio/audio_decoder.cpp +++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp @@ -57,12 +57,10 @@ struct audio_decoder::implementation : boost::noncopyable std::queue> packets_; int64_t nb_frames_; - double duration_; public: explicit implementation(const safe_ptr& context, const core::video_format_desc& format_desc) : format_desc_(format_desc) , nb_frames_(0) - , duration_(std::numeric_limits::max()) { try { @@ -75,11 +73,6 @@ public: buffer1_.resize(AVCODEC_MAX_AUDIO_FRAME_SIZE*2); - //nb_frames_ = context->streams[index_]->nb_frames; - //if(nb_frames_ == 0) - // nb_frames_ = context->streams[index_]->duration / (codec_context_->channels*codec_context_->sample_rate); - duration_ = context->streams[index_]->duration / static_cast(codec_context_->sample_rate); - if(codec_context_->sample_rate != static_cast(format_desc_.audio_sample_rate) || codec_context_->channels != static_cast(format_desc_.audio_channels) || codec_context_->sample_fmt != AV_SAMPLE_FMT_S16) @@ -195,5 +188,4 @@ void audio_decoder::push(const std::shared_ptr& packet){impl_->push(pa bool audio_decoder::ready() const{return impl_->ready();} std::vector>> audio_decoder::poll(){return impl_->poll();} int64_t audio_decoder::nb_frames() const{return impl_->nb_frames_;} -double audio_decoder::duration() const {return impl_->duration_;} } \ No newline at end of file