X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Fframe_muxer.cpp;h=4dfbcebf234e71ad09442994fe0902e9e52d1dca;hb=ffcb75eabba1d77eab8d83447136261462e3e088;hp=9267f7ec7fab4178c61cb12ff5c22be48974d176;hpb=9491fdcbb6047fe75f6611d791c26480819616c7;p=casparcg diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp index 9267f7ec7..4dfbcebf2 100644 --- a/modules/ffmpeg/producer/frame_muxer.cpp +++ b/modules/ffmpeg/producer/frame_muxer.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -82,35 +82,49 @@ struct display_mode } }; -display_mode::type get_display_mode(const core::video_mode::type in_mode, double in_fps, const core::video_mode::type out_mode, double out_fps) +display_mode::type get_display_mode(const core::field_mode::type in_mode, double in_fps, const core::field_mode::type out_mode, double out_fps) { static const auto epsilon = 2.0; + if(in_fps < 20.0 || in_fps > 80.0) + { + //if(out_mode != core::field_mode::progressive && in_mode == core::field_mode::progressive) + // return display_mode::interlace; + + if(out_mode == core::field_mode::progressive && in_mode != core::field_mode::progressive) + { + if(in_fps < 35.0) + return display_mode::deinterlace; + else + return display_mode::deinterlace_bob; + } + } + if(std::abs(in_fps - out_fps) < epsilon) { - if(in_mode != core::video_mode::progressive && out_mode == core::video_mode::progressive) + if(in_mode != core::field_mode::progressive && out_mode == core::field_mode::progressive) return display_mode::deinterlace; - //else if(in_mode == core::video_mode::progressive && out_mode != core::video_mode::progressive) + //else if(in_mode == core::field_mode::progressive && out_mode != core::field_mode::progressive) // simple(); // interlace_duplicate(); else return display_mode::simple; } else if(std::abs(in_fps/2.0 - out_fps) < epsilon) { - if(in_mode != core::video_mode::progressive) + if(in_mode != core::field_mode::progressive) return display_mode::invalid; - if(out_mode != core::video_mode::progressive) + if(out_mode != core::field_mode::progressive) return display_mode::interlace; else return display_mode::half; } else if(std::abs(in_fps - out_fps/2.0) < epsilon) { - if(out_mode != core::video_mode::progressive) + if(out_mode != core::field_mode::progressive) return display_mode::invalid; - if(in_mode != core::video_mode::progressive) + if(in_mode != core::field_mode::progressive) return display_mode::deinterlace_bob; else return display_mode::duplicate; @@ -122,12 +136,12 @@ display_mode::type get_display_mode(const core::video_mode::type in_mode, double struct frame_muxer::implementation : boost::noncopyable { std::deque>> video_streams_; - std::deque> audio_streams_; + std::deque audio_streams_; std::deque> frame_buffer_; display_mode::type display_mode_; const double in_fps_; const video_format_desc format_desc_; - bool auto_mode_; + bool auto_transcode_; size_t audio_sample_count_; size_t video_frame_count_; @@ -144,7 +158,7 @@ struct frame_muxer::implementation : boost::noncopyable , display_mode_(display_mode::invalid) , in_fps_(in_fps) , format_desc_(frame_factory->get_video_format_desc()) - , auto_mode_(env::properties().get("configuration.auto-mode", false)) + , auto_transcode_(env::properties().get("configuration.producers.auto-transcode", false)) , audio_sample_count_(0) , video_frame_count_(0) , frame_factory_(frame_factory) @@ -166,18 +180,17 @@ struct frame_muxer::implementation : boost::noncopyable video_streams_.back().push(make_safe(this)); ++video_frame_count_; display_mode_ = display_mode::simple; - put_frames(frame_buffer_); return; } if(display_mode_ == display_mode::invalid) { - if(auto_mode_) + if(auto_transcode_) { auto in_mode = get_mode(*video_frame); - display_mode_ = get_display_mode(in_mode, in_fps_, format_desc_.mode, format_desc_.fps); + display_mode_ = get_display_mode(in_mode, in_fps_, format_desc_.field_mode, format_desc_.fps); - if(display_mode_ == display_mode::simple && in_mode != core::video_mode::progressive && format_desc_.mode != core::video_mode::progressive && video_frame->height != static_cast(format_desc_.height)) + if(display_mode_ == display_mode::simple && in_mode != core::field_mode::progressive && format_desc_.field_mode != core::field_mode::progressive && video_frame->height != static_cast(format_desc_.height)) display_mode_ = display_mode::deinterlace_bob_reinterlace; // The frame will most likely be scaled, we need to deinterlace->reinterlace if(display_mode_ == display_mode::deinterlace) @@ -188,35 +201,49 @@ struct frame_muxer::implementation : boost::noncopyable else display_mode_ = display_mode::simple; - CASPAR_LOG(info) << "frame_muxer: " << display_mode::print(display_mode_); + if(display_mode_ == display_mode::invalid) + { + CASPAR_LOG(warning) << L"[frame_muxer] Failed to detect display-mode."; + display_mode_ = display_mode::simple; + } + + CASPAR_LOG(info) << "[frame_muxer] " << display_mode::print(display_mode_); } + if(hints & core::frame_producer::ALPHA_HINT) - try_make_gray(make_safe(video_frame)); + video_frame->format = make_alpha_format(video_frame->format); + + auto format = video_frame->format; + if(video_frame->format == CASPAR_PIX_FMT_LUMA) // CASPAR_PIX_FMT_LUMA is not valid for filter, change it to GRAY8 + video_frame->format = PIX_FMT_GRAY8; BOOST_FOREACH(auto& av_frame, filter_.execute(video_frame)) { + av_frame->format = format; + auto frame = make_write_frame(this, av_frame, frame_factory_, hints); // Fix field-order if needed - if(frame->get_type() == core::video_mode::lower && format_desc_.mode == core::video_mode::upper) - frame->get_image_transform().set_fill_translation(0.0f, 0.5/static_cast(frame->get_pixel_format_desc().planes[0].height)); - else if(frame->get_type() == core::video_mode::upper && format_desc_.mode == core::video_mode::lower) - frame->get_image_transform().set_fill_translation(0.0f, -0.5/static_cast(frame->get_pixel_format_desc().planes[0].height)); + if(frame->get_type() == core::field_mode::lower && format_desc_.field_mode == core::field_mode::upper) + frame->get_frame_transform().fill_translation[1] += 1.0/static_cast(format_desc_.height); + else if(frame->get_type() == core::field_mode::upper && format_desc_.field_mode == core::field_mode::lower) + frame->get_frame_transform().fill_translation[1] -= 1.0/static_cast(format_desc_.height); video_streams_.back().push(frame); ++video_frame_count_; - - put_frames(frame_buffer_); } + + if(video_streams_.back().size() > 8) + BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("video-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data.")); } - void push(const std::shared_ptr>& audio_samples) + void push(const std::shared_ptr& audio_samples) { if(!audio_samples) { CASPAR_LOG(debug) << L"audio-chunk-count: " << audio_sample_count_/format_desc_.audio_samples_per_frame; - audio_streams_.push_back(std::vector()); + audio_streams_.push_back(core::audio_buffer()); audio_sample_count_ = 0; return; } @@ -224,7 +251,9 @@ struct frame_muxer::implementation : boost::noncopyable audio_sample_count_ += audio_samples->size(); boost::range::push_back(audio_streams_.back(), *audio_samples); - put_frames(frame_buffer_); + + if(audio_streams_.back().size() > 8*format_desc_.audio_samples_per_frame) + BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("audio-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data.")); } safe_ptr pop() @@ -247,43 +276,55 @@ struct frame_muxer::implementation : boost::noncopyable return frame; } - std::vector pop_audio() + core::audio_buffer pop_audio() { CASPAR_VERIFY(audio_streams_.front().size() >= format_desc_.audio_samples_per_frame); auto begin = audio_streams_.front().begin(); auto end = begin + format_desc_.audio_samples_per_frame; - auto samples = std::vector(begin, end); + auto samples = core::audio_buffer(begin, end); audio_streams_.front().erase(begin, end); return samples; } - + bool video_ready() const - { - return video_frames() > 1 && video_streams_.size() >= audio_streams_.size(); + { + return video_streams_.size() > 1 || (video_streams_.size() >= audio_streams_.size() && video_ready2()); } bool audio_ready() const { - return audio_chunks() > 1 && audio_streams_.size() >= video_streams_.size(); + return audio_streams_.size() > 1 || (audio_streams_.size() >= video_streams_.size() && audio_ready2()); } - size_t video_frames() const - { - return video_streams_.back().size(); + bool video_ready2() const + { + switch(display_mode_) + { + case display_mode::deinterlace_bob_reinterlace: + case display_mode::interlace: + return video_streams_.front().size() >= 2; + default: + return !video_streams_.front().empty(); + } } - - size_t audio_chunks() const + + bool audio_ready2() const { - return audio_streams_.back().size() / format_desc_.audio_samples_per_frame; + switch(display_mode_) + { + case display_mode::duplicate: + return audio_streams_.front().size()/2 >= format_desc_.audio_samples_per_frame; + default: + return audio_streams_.front().size() >= format_desc_.audio_samples_per_frame; + } } - - void put_frames(std::deque>& dest) + + void commit() { - if(video_streams_.size() > 1 && audio_streams_.size() > 1 && - (video_streams_.front().empty() || audio_streams_.front().empty())) + if(video_streams_.size() > 1 && audio_streams_.size() > 1 && (!video_ready2() || !audio_ready2())) { if(!video_streams_.front().empty() || !audio_streams_.front().empty()) CASPAR_LOG(debug) << "Truncating: " << video_streams_.front().size() << L" video-frames, " << audio_streams_.front().size() << L" audio-samples."; @@ -292,27 +333,24 @@ struct frame_muxer::implementation : boost::noncopyable audio_streams_.pop_front(); } - if(video_streams_.front().empty() || audio_streams_.front().size() < format_desc_.audio_samples_per_frame) + if(!video_ready2() || !audio_ready2()) return; switch(display_mode_) { - case display_mode::simple: return simple(dest); - case display_mode::duplicate: return duplicate(dest); - case display_mode::half: return half(dest); - case display_mode::interlace: return interlace(dest); - case display_mode::deinterlace_bob: return simple(dest); - case display_mode::deinterlace_bob_reinterlace: return interlace(dest); - case display_mode::deinterlace: return simple(dest); + case display_mode::simple: return simple(frame_buffer_); + case display_mode::duplicate: return duplicate(frame_buffer_); + case display_mode::half: return half(frame_buffer_); + case display_mode::interlace: return interlace(frame_buffer_); + case display_mode::deinterlace_bob: return simple(frame_buffer_); + case display_mode::deinterlace_bob_reinterlace: return interlace(frame_buffer_); + case display_mode::deinterlace: return simple(frame_buffer_); default: BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("invalid display-mode")); } } - + void simple(std::deque>& dest) - { - if(video_streams_.front().empty() || audio_streams_.front().size() < format_desc_.audio_samples_per_frame) - return; - + { auto frame1 = pop_video(); frame1->audio_data() = pop_audio(); @@ -321,9 +359,6 @@ struct frame_muxer::implementation : boost::noncopyable void duplicate(std::deque>& dest) { - if(video_streams_.front().empty() || audio_streams_.front().size()/2 < format_desc_.audio_samples_per_frame) - return; - auto frame = pop_video(); auto frame1 = make_safe(*frame); // make a copy @@ -337,10 +372,7 @@ struct frame_muxer::implementation : boost::noncopyable } void half(std::deque>& dest) - { - if(video_streams_.front().size() < 2 || audio_streams_.front().size() < format_desc_.audio_samples_per_frame) - return; - + { auto frame1 = pop_video(); frame1->audio_data() = pop_audio(); @@ -350,27 +382,41 @@ struct frame_muxer::implementation : boost::noncopyable } void interlace(std::deque>& dest) - { - if(video_streams_.front().size() < 2 || audio_streams_.front().size() < format_desc_.audio_samples_per_frame) - return; - + { auto frame1 = pop_video(); frame1->audio_data() = pop_audio(); auto frame2 = pop_video(); - dest.push_back(core::basic_frame::interlace(frame1, frame2, format_desc_.mode)); + dest.push_back(core::basic_frame::interlace(frame1, frame2, format_desc_.field_mode)); + } + + int64_t calc_nb_frames(int64_t nb_frames) const + { + switch(display_mode_) + { + case display_mode::interlace: + case display_mode::half: + return nb_frames/2; + case display_mode::duplicate: + case display_mode::deinterlace_bob: + return nb_frames*2; + default: + return nb_frames; + } } }; frame_muxer::frame_muxer(double in_fps, const safe_ptr& frame_factory) : impl_(new implementation(in_fps, frame_factory)){} void frame_muxer::push(const std::shared_ptr& video_frame, int hints){impl_->push(video_frame, hints);} -void frame_muxer::push(const std::shared_ptr>& audio_samples){return impl_->push(audio_samples);} +void frame_muxer::push(const std::shared_ptr& audio_samples){return impl_->push(audio_samples);} +void frame_muxer::commit(){impl_->commit();} safe_ptr frame_muxer::pop(){return impl_->pop();} size_t frame_muxer::size() const {return impl_->size();} bool frame_muxer::empty() const {return impl_->size() == 0;} bool frame_muxer::video_ready() const{return impl_->video_ready();} bool frame_muxer::audio_ready() const{return impl_->audio_ready();} +int64_t frame_muxer::calc_nb_frames(int64_t nb_frames) const {return impl_->calc_nb_frames(nb_frames);} } \ No newline at end of file