enum PixelFormat;\r
\r
namespace caspar { namespace ffmpeg {\r
- \r
-static bool is_double_rate(const std::wstring& filters)\r
-{\r
- if(boost::to_upper_copy(filters).find(L"YADIF=1") != std::string::npos)\r
- return true;\r
- \r
- if(boost::to_upper_copy(filters).find(L"YADIF=3") != std::string::npos)\r
- return true;\r
-\r
- return false;\r
-}\r
-\r
-static bool is_deinterlacing(const std::wstring& filters)\r
-{\r
- if(boost::to_upper_copy(filters).find(L"YADIF") != std::string::npos)\r
- return true; \r
- return false;\r
-} \r
- \r
-static int filter_delay(const std::wstring& filters)\r
-{\r
- if(is_double_rate(filters))\r
- return 1;\r
- \r
- return 0;\r
-}\r
\r
static std::wstring append_filter(const std::wstring& filters, const std::wstring& filter)\r
{\r
std::vector<safe_ptr<AVFrame>> poll_all();\r
\r
std::wstring filter_str() const;\r
+ \r
+ static bool is_double_rate(const std::wstring& filters)\r
+ {\r
+ if(boost::to_upper_copy(filters).find(L"YADIF=1") != std::string::npos)\r
+ return true;\r
+ \r
+ if(boost::to_upper_copy(filters).find(L"YADIF=3") != std::string::npos)\r
+ return true;\r
+\r
+ return false;\r
+ }\r
+\r
+ static bool is_deinterlacing(const std::wstring& filters)\r
+ {\r
+ if(boost::to_upper_copy(filters).find(L"YADIF") != std::string::npos)\r
+ return true; \r
+ return false;\r
+ } \r
+ \r
+ static int delay(const std::wstring& filters)\r
+ {\r
+ return is_double_rate(filters) ? 1 : 1;\r
+ }\r
+\r
+ int delay() const\r
+ {\r
+ return delay(filter_str());\r
+ }\r
+\r
+ bool is_double_rate() const\r
+ {\r
+ return is_double_rate(filter_str());\r
+ }\r
\r
+ bool is_deinterlacing() const\r
+ {\r
+ return is_deinterlacing(filter_str());\r
+ }\r
private:\r
struct implementation;\r
safe_ptr<implementation> impl_;\r
\r
#include "frame_muxer.h"\r
\r
-#include "display_mode.h"\r
-\r
#include "../filter/filter.h"\r
#include "../util/util.h"\r
\r
filter filter_;\r
const std::wstring filter_str_;\r
bool force_deinterlacing_;\r
+ display_mode::type force_deinterlacing_mode_;\r
\r
- implementation(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter_str)\r
+ implementation(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter_str, display_mode::type force_deinterlacing_mode)\r
: display_mode_(display_mode::invalid)\r
, in_fps_(in_fps)\r
, format_desc_(frame_factory->get_video_format_desc())\r
, frame_factory_(frame_factory)\r
, filter_str_(filter_str)\r
, force_deinterlacing_(false)\r
+ , force_deinterlacing_mode_(force_deinterlacing_mode)\r
{\r
video_streams_.push(std::queue<safe_ptr<write_frame>>());\r
audio_streams_.push(core::audio_buffer());\r
case display_mode::simple: \r
case display_mode::deinterlace_bob: \r
case display_mode::deinterlace: \r
- {\r
- frame_buffer_.push(frame1);\r
- break;\r
- }\r
+ {\r
+ frame_buffer_.push(frame1);\r
+ break;\r
+ }\r
case display_mode::interlace: \r
case display_mode::deinterlace_bob_reinterlace: \r
- { \r
- auto frame2 = pop_video();\r
+ { \r
+ auto frame2 = pop_video();\r
\r
- frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc_.field_mode)); \r
- break;\r
- }\r
+ frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc_.field_mode)); \r
+ break;\r
+ }\r
case display_mode::duplicate: \r
- {\r
- auto frame2 = make_safe<core::write_frame>(*frame1);\r
- frame2->audio_data() = pop_audio();\r
+ {\r
+ auto frame2 = make_safe<core::write_frame>(*frame1);\r
+ frame2->audio_data() = pop_audio();\r
\r
- frame_buffer_.push(frame1);\r
- frame_buffer_.push(frame2);\r
- break;\r
- }\r
+ frame_buffer_.push(frame1);\r
+ frame_buffer_.push(frame2);\r
+ break;\r
+ }\r
case display_mode::half: \r
- { \r
- pop_video(); // Throw away\r
+ { \r
+ pop_video(); // Throw away\r
\r
- frame_buffer_.push(frame1);\r
- break;\r
- }\r
- default: \r
- BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("invalid display-mode"));\r
+ frame_buffer_.push(frame1);\r
+ break;\r
+ }\r
}\r
\r
return frame_buffer_.empty() ? nullptr : poll();\r
auto mode = get_mode(*frame);\r
auto fps = in_fps_;\r
\r
- if(is_deinterlacing(filter_str_))\r
+ if(filter::is_deinterlacing(filter_str_))\r
mode = core::field_mode::progressive;\r
\r
- if(is_double_rate(filter_str_))\r
+ if(filter::is_double_rate(filter_str_))\r
fps *= 2;\r
\r
display_mode_ = get_display_mode(mode, fps, format_desc_.field_mode, format_desc_.fps);\r
\r
- if(force_deinterlacing_ || \r
- ((frame->height != 480 || format_desc_.height != 486) && \r
+ if((frame->height != 480 || format_desc_.height != 486) && // don't deinterlace for NTSC DV\r
display_mode_ == display_mode::simple && mode != core::field_mode::progressive && format_desc_.field_mode != core::field_mode::progressive && \r
- frame->height != static_cast<int>(format_desc_.height)))\r
+ frame->height != static_cast<int>(format_desc_.height))\r
{\r
display_mode_ = display_mode::deinterlace_bob_reinterlace; // The frame will most likely be scaled, we need to deinterlace->reinterlace \r
}\r
\r
+ if(force_deinterlacing_ && mode != core::field_mode::progressive && display_mode_ != display_mode::deinterlace && display_mode_ != display_mode::deinterlace_bob) \r
+ { \r
+ if(force_deinterlacing_mode_ == display_mode::deinterlace)\r
+ CASPAR_LOG(warning) << L"[frame_muxer] Forcing non bob deinterlacing.";\r
+ display_mode_ = force_deinterlacing_mode_;\r
+ }\r
+\r
if(display_mode_ == display_mode::deinterlace)\r
filter_str = append_filter(filter_str, L"YADIF=0:-1");\r
else if(display_mode_ == display_mode::deinterlace_bob || display_mode_ == display_mode::deinterlace_bob_reinterlace)\r
\r
if(!boost::iequals(filter_.filter_str(), filter_str))\r
{\r
- for(int n = 0; n < filter_delay(filter_.filter_str()); ++n)\r
+ for(int n = 0; n < filter_.delay(); ++n)\r
{\r
filter_.push(frame);\r
auto av_frame = filter_.poll();\r
break;\r
}\r
\r
- if(is_double_rate(widen(filter_.filter_str()))) // Take into account transformations in filter.\r
+ if(filter_.is_double_rate()) // Take into account transformations in filter.\r
nb_frames *= 2;\r
\r
return nb_frames;\r
}\r
};\r
\r
-frame_muxer::frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)\r
- : impl_(new implementation(in_fps, frame_factory, filter)){}\r
+frame_muxer::frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter, display_mode::type force_deinterlacing_mode)\r
+ : impl_(new implementation(in_fps, frame_factory, filter, force_deinterlacing_mode)){}\r
void frame_muxer::push(const std::shared_ptr<AVFrame>& video_frame, int hints){impl_->push(video_frame, hints);}\r
void frame_muxer::push(const std::shared_ptr<core::audio_buffer>& audio_samples){return impl_->push(audio_samples);}\r
std::shared_ptr<basic_frame> frame_muxer::poll(){return impl_->poll();}\r