]> git.sesse.net Git - casparcg/blob - modules/screen/consumer/screen_consumer.cpp
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
[casparcg] / modules / screen / consumer / screen_consumer.cpp
1 /*\r
2 * Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
3 *\r
4 * This file is part of CasparCG (www.casparcg.com).\r
5 *\r
6 * CasparCG is free software: you can redistribute it and/or modify\r
7 * it under the terms of the GNU General Public License as published by\r
8 * the Free Software Foundation, either version 3 of the License, or\r
9 * (at your option) any later version.\r
10 *\r
11 * CasparCG is distributed in the hope that it will be useful,\r
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
14 * GNU General Public License for more details.\r
15 *\r
16 * You should have received a copy of the GNU General Public License\r
17 * along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
18 *\r
19 * Author: Robert Nagy, ronag89@gmail.com\r
20 */\r
21 \r
22 #include "screen_consumer.h"\r
23 \r
24 #include <GL/glew.h>\r
25 #include <SFML/Window.hpp>\r
26 \r
27 #include <common/diagnostics/graph.h>\r
28 #include <common/gl/gl_check.h>\r
29 #include <common/log.h>\r
30 #include <common/spl/memory.h>\r
31 #include <common/memory/memshfl.h>\r
32 #include <common/utf.h>\r
33 \r
34 #include <ffmpeg/producer/filter/filter.h>\r
35 \r
36 #include <core/video_format.h>\r
37 #include <core/frame/data_frame.h>\r
38 #include <core/consumer/frame_consumer.h>\r
39 \r
40 #include <boost/timer.hpp>\r
41 #include <boost/circular_buffer.hpp>\r
42 #include <boost/foreach.hpp>\r
43 #include <boost/thread.hpp>\r
44 #include <boost/property_tree/ptree.hpp>\r
45 \r
46 #include <tbb/atomic.h>\r
47 #include <tbb/concurrent_queue.h>\r
48 #include <tbb/parallel_for.h>\r
49 \r
50 #include <boost/assign.hpp>\r
51 \r
52 #include <asmlib.h>\r
53 \r
54 #include <algorithm>\r
55 #include <vector>\r
56 \r
57 #if defined(_MSC_VER)\r
58 #pragma warning (push)\r
59 #pragma warning (disable : 4244)\r
60 #endif\r
61 extern "C" \r
62 {\r
63         #define __STDC_CONSTANT_MACROS\r
64         #define __STDC_LIMIT_MACROS\r
65         #include <libavcodec/avcodec.h>\r
66         #include <libavutil/imgutils.h>\r
67 }\r
68 #if defined(_MSC_VER)\r
69 #pragma warning (pop)\r
70 #endif\r
71 \r
72 namespace caspar { namespace screen {\r
73                 \r
74 enum stretch\r
75 {\r
76         none,\r
77         uniform,\r
78         fill,\r
79         uniform_to_fill\r
80 };\r
81 \r
82 struct configuration\r
83 {\r
84         enum aspect_ratio\r
85         {\r
86                 aspect_4_3 = 0,\r
87                 aspect_16_9,\r
88                 aspect_invalid,\r
89         };\r
90                 \r
91         std::wstring    name;\r
92         int                             screen_index;\r
93         stretch                 stretch;\r
94         bool                    windowed;\r
95         bool                    auto_deinterlace;\r
96         bool                    key_only;\r
97         aspect_ratio    aspect; \r
98         bool                    vsync;\r
99 \r
100         configuration()\r
101                 : name(L"ogl")\r
102                 , screen_index(0)\r
103                 , stretch(fill)\r
104                 , windowed(true)\r
105                 , auto_deinterlace(true)\r
106                 , key_only(false)\r
107                 , aspect(aspect_invalid)\r
108                 , vsync(false)\r
109         {\r
110         }\r
111 };\r
112 \r
113 struct screen_consumer : boost::noncopyable\r
114 {               \r
115         const configuration             config_;\r
116         core::video_format_desc format_desc_;\r
117         int                                             channel_index_;\r
118 \r
119         GLuint                                  texture_;\r
120         std::vector<GLuint>             pbos_;\r
121                         \r
122         float                                   width_;\r
123         float                                   height_;        \r
124         unsigned int                    screen_x_;\r
125         unsigned int                    screen_y_;\r
126         unsigned int                    screen_width_;\r
127         unsigned int                    screen_height_;\r
128         int                                             square_width_;\r
129         int                                             square_height_;                         \r
130         \r
131         sf::Window                              window_;\r
132         \r
133         spl::shared_ptr<diagnostics::graph>     graph_;\r
134         boost::timer                                    perf_timer_;\r
135         boost::timer                                    tick_timer_;\r
136 \r
137         tbb::concurrent_bounded_queue<std::shared_ptr<const core::data_frame>>  frame_buffer_;\r
138 \r
139         boost::thread                   thread_;\r
140         tbb::atomic<bool>               is_running_;\r
141         \r
142         ffmpeg::filter                  filter_;\r
143 public:\r
144         screen_consumer(const configuration& config, const core::video_format_desc& format_desc, int channel_index) \r
145                 : config_(config)\r
146                 , format_desc_(format_desc)\r
147                 , channel_index_(channel_index)\r
148                 , texture_(0)\r
149                 , pbos_(2, 0)   \r
150                 , screen_width_(format_desc.width)\r
151                 , screen_height_(format_desc.height)\r
152                 , square_width_(format_desc.square_width)\r
153                 , square_height_(format_desc.square_height)\r
154                 , filter_(format_desc.field_mode == core::field_mode::progressive || !config.auto_deinterlace ? L"" : L"YADIF=0:-1", boost::assign::list_of(PIX_FMT_BGRA))\r
155         {               \r
156                 if(format_desc_.format == core::video_format::ntsc && config_.aspect == configuration::aspect_4_3)\r
157                 {\r
158                         // Use default values which are 4:3.\r
159                 }\r
160                 else\r
161                 {\r
162                         if(config_.aspect == configuration::aspect_16_9)\r
163                                 square_width_ = (format_desc.height*16)/9;\r
164                         else if(config_.aspect == configuration::aspect_4_3)\r
165                                 square_width_ = (format_desc.height*4)/3;\r
166                 }\r
167 \r
168                 frame_buffer_.set_capacity(2);\r
169                 \r
170                 graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \r
171                 graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
172                 graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
173                 graph_->set_text(print());\r
174                 diagnostics::register_graph(graph_);\r
175                                                                         \r
176                 DISPLAY_DEVICE d_device = {sizeof(d_device), 0};                        \r
177                 std::vector<DISPLAY_DEVICE> displayDevices;\r
178                 for(int n = 0; EnumDisplayDevices(NULL, n, &d_device, NULL); ++n)\r
179                         displayDevices.push_back(d_device);\r
180 \r
181                 if(config_.screen_index >= displayDevices.size())\r
182                         CASPAR_LOG(warning) << print() << L" Invalid screen-index: " << config_.screen_index;\r
183                 \r
184                 DEVMODE devmode = {};\r
185                 if(!EnumDisplaySettings(displayDevices[config_.screen_index].DeviceName, ENUM_CURRENT_SETTINGS, &devmode))\r
186                         CASPAR_LOG(warning) << print() << L" Could not find display settings for screen-index: " << config_.screen_index;\r
187                 \r
188                 screen_x_               = devmode.dmPosition.x;\r
189                 screen_y_               = devmode.dmPosition.y;\r
190                 screen_width_   = config_.windowed ? square_width_ : devmode.dmPelsWidth;\r
191                 screen_height_  = config_.windowed ? square_height_ : devmode.dmPelsHeight;\r
192                 \r
193                 is_running_ = true;\r
194                 thread_ = boost::thread([this]{run();});\r
195         }\r
196         \r
197         ~screen_consumer()\r
198         {\r
199                 is_running_ = false;\r
200                 frame_buffer_.try_push(core::data_frame::empty());\r
201                 thread_.join();\r
202         }\r
203 \r
204         void init()\r
205         {\r
206                 window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), u8(print()), config_.windowed ? sf::Style::Resize | sf::Style::Close : sf::Style::Fullscreen);\r
207                 window_.ShowMouseCursor(false);\r
208                 window_.SetPosition(screen_x_, screen_y_);\r
209                 window_.SetSize(screen_width_, screen_height_);\r
210                 window_.SetActive();\r
211                 \r
212                 if(!GLEW_VERSION_2_1 && glewInit() != GLEW_OK)\r
213                         BOOST_THROW_EXCEPTION(gl::ogl_exception() << msg_info("Failed to initialize GLEW."));\r
214 \r
215                 if(!GLEW_VERSION_2_1)\r
216                         BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 2.1 support."));\r
217 \r
218                 GL(glEnable(GL_TEXTURE_2D));\r
219                 GL(glDisable(GL_DEPTH_TEST));           \r
220                 GL(glClearColor(0.0, 0.0, 0.0, 0.0));\r
221                 GL(glViewport(0, 0, format_desc_.width, format_desc_.height));\r
222                 GL(glLoadIdentity());\r
223                                 \r
224                 calculate_aspect();\r
225                         \r
226                 GL(glGenTextures(1, &texture_));\r
227                 GL(glBindTexture(GL_TEXTURE_2D, texture_));\r
228                 GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));\r
229                 GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));\r
230                 GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP));\r
231                 GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP));\r
232                 GL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, format_desc_.width, format_desc_.height, 0, GL_BGRA, GL_UNSIGNED_BYTE, 0));\r
233                 GL(glBindTexture(GL_TEXTURE_2D, 0));\r
234                                         \r
235                 GL(glGenBuffers(2, pbos_.data()));\r
236                         \r
237                 glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pbos_[0]);\r
238                 glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, format_desc_.size, 0, GL_STREAM_DRAW_ARB);\r
239                 glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pbos_[1]);\r
240                 glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, format_desc_.size, 0, GL_STREAM_DRAW_ARB);\r
241                 glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);\r
242                 \r
243                 auto wglSwapIntervalEXT = reinterpret_cast<void(APIENTRY*)(int)>(wglGetProcAddress("wglSwapIntervalEXT"));\r
244                 if(wglSwapIntervalEXT)\r
245                 {\r
246                         if(config_.vsync)\r
247                         {\r
248                                 wglSwapIntervalEXT(1);\r
249                                 CASPAR_LOG(info) << print() << " Enabled vsync.";\r
250                         }\r
251                         else\r
252                                 wglSwapIntervalEXT(0);\r
253                 }\r
254 \r
255                 CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
256         }\r
257 \r
258         void uninit()\r
259         {               \r
260                 if(texture_)\r
261                         glDeleteTextures(1, &texture_);\r
262 \r
263                 BOOST_FOREACH(auto& pbo, pbos_)\r
264                 {\r
265                         if(pbo)\r
266                                 glDeleteBuffers(1, &pbo);\r
267                 }\r
268         }\r
269 \r
270         void run()\r
271         {\r
272                 try\r
273                 {\r
274                         init();\r
275 \r
276                         while(is_running_)\r
277                         {                       \r
278                                 try\r
279                                 {\r
280                                         sf::Event e;            \r
281                                         while(window_.GetEvent(e))\r
282                                         {\r
283                                                 if(e.Type == sf::Event::Resized)\r
284                                                         calculate_aspect();\r
285                                                 else if(e.Type == sf::Event::Closed)\r
286                                                         is_running_ = false;\r
287                                         }\r
288                         \r
289                                         std::shared_ptr<const core::data_frame> frame;\r
290                                         frame_buffer_.pop(frame);\r
291                                         \r
292                                         perf_timer_.restart();\r
293                                         render(spl::make_shared_ptr(frame));\r
294                                         graph_->set_value("frame-time", perf_timer_.elapsed()*format_desc_.fps*0.5);    \r
295 \r
296                                         window_.Display();\r
297                                         \r
298                                         graph_->set_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);     \r
299                                         tick_timer_.restart();\r
300                                 }\r
301                                 catch(...)\r
302                                 {\r
303                                         CASPAR_LOG_CURRENT_EXCEPTION();\r
304                                         is_running_ = false;\r
305                                 }\r
306                         }\r
307 \r
308                         uninit();\r
309                 }\r
310                 catch(...)\r
311                 {\r
312                         CASPAR_LOG_CURRENT_EXCEPTION();\r
313                 }\r
314         }\r
315         \r
316         spl::shared_ptr<AVFrame> get_av_frame()\r
317         {               \r
318                 spl::shared_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free);      \r
319                 avcodec_get_frame_defaults(av_frame.get());\r
320                                                 \r
321                 av_frame->linesize[0]           = format_desc_.width*4;                 \r
322                 av_frame->format                        = PIX_FMT_BGRA;\r
323                 av_frame->width                         = format_desc_.width;\r
324                 av_frame->height                        = format_desc_.height;\r
325                 av_frame->interlaced_frame      = format_desc_.field_mode != core::field_mode::progressive;\r
326                 av_frame->top_field_first       = format_desc_.field_mode == core::field_mode::upper ? 1 : 0;\r
327 \r
328                 return av_frame;\r
329         }\r
330 \r
331         void render(const spl::shared_ptr<const core::data_frame>& frame)\r
332         {                       \r
333                 if(static_cast<int>(frame->image_data().size()) != format_desc_.size)\r
334                         return;\r
335                                         \r
336                 auto av_frame = get_av_frame();\r
337                 av_frame->data[0] = const_cast<uint8_t*>(frame->image_data().begin());\r
338 \r
339                 filter_.push(av_frame);\r
340                 auto frames = filter_.poll_all();\r
341 \r
342                 if(frames.empty())\r
343                         return;\r
344 \r
345                 av_frame = frames[0];\r
346                 \r
347                 GL(glBindTexture(GL_TEXTURE_2D, texture_));\r
348 \r
349                 GL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbos_[0]));\r
350                 GL(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, format_desc_.width, format_desc_.height, GL_BGRA, GL_UNSIGNED_BYTE, 0));\r
351 \r
352                 GL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbos_[1]));\r
353                 GL(glBufferData(GL_PIXEL_UNPACK_BUFFER, format_desc_.size, 0, GL_STREAM_DRAW));\r
354 \r
355                 auto ptr = reinterpret_cast<char*>(GL2(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY)));\r
356                 if(ptr)\r
357                 {\r
358                         if(config_.key_only)\r
359                         {\r
360                                 tbb::parallel_for(tbb::blocked_range<int>(0, format_desc_.height), [&](const tbb::blocked_range<int>& r)\r
361                                 {\r
362                                         for(int n = r.begin(); n != r.end(); ++n)\r
363                                                 aligned_memshfl(ptr+n*format_desc_.width*4, av_frame->data[0]+n*av_frame->linesize[0], format_desc_.width*4, 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
364                                 });\r
365                         }\r
366                         else\r
367                         {       \r
368                                 tbb::parallel_for(tbb::blocked_range<int>(0, format_desc_.height), [&](const tbb::blocked_range<int>& r)\r
369                                 {\r
370                                         for(int n = r.begin(); n != r.end(); ++n)\r
371                                                 A_memcpy(ptr+n*format_desc_.width*4, av_frame->data[0]+n*av_frame->linesize[0], format_desc_.width*4);\r
372                                 });\r
373                         }\r
374                         \r
375                         GL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); // release the mapped buffer\r
376                 }\r
377 \r
378                 GL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0));\r
379                                 \r
380                 GL(glClear(GL_COLOR_BUFFER_BIT));                       \r
381                 glBegin(GL_QUADS);\r
382                                 glTexCoord2f(0.0f,        1.0f);        glVertex2f(-width_, -height_);\r
383                                 glTexCoord2f(1.0f,        1.0f);        glVertex2f( width_, -height_);\r
384                                 glTexCoord2f(1.0f,        0.0f);        glVertex2f( width_,  height_);\r
385                                 glTexCoord2f(0.0f,        0.0f);        glVertex2f(-width_,  height_);\r
386                 glEnd();\r
387                 \r
388                 GL(glBindTexture(GL_TEXTURE_2D, 0));\r
389 \r
390                 std::rotate(pbos_.begin(), pbos_.begin() + 1, pbos_.end());\r
391         }\r
392 \r
393         bool send(const spl::shared_ptr<const core::data_frame>& frame)\r
394         {\r
395                 if(!frame_buffer_.try_push(frame))\r
396                         graph_->set_tag("dropped-frame");\r
397                 return is_running_;\r
398         }\r
399                 \r
400         std::wstring print() const\r
401         {       \r
402                 return config_.name + L"[" + boost::lexical_cast<std::wstring>(channel_index_) + L"|" + format_desc_.name + L"]";\r
403         }\r
404         \r
405         void calculate_aspect()\r
406         {\r
407                 if(config_.windowed)\r
408                 {\r
409                         screen_height_ = window_.GetHeight();\r
410                         screen_width_ = window_.GetWidth();\r
411                 }\r
412                 \r
413                 GL(glViewport(0, 0, screen_width_, screen_height_));\r
414 \r
415                 std::pair<float, float> target_ratio = None();\r
416                 if(config_.stretch == fill)\r
417                         target_ratio = Fill();\r
418                 else if(config_.stretch == uniform)\r
419                         target_ratio = Uniform();\r
420                 else if(config_.stretch == uniform_to_fill)\r
421                         target_ratio = UniformToFill();\r
422 \r
423                 width_ = target_ratio.first;\r
424                 height_ = target_ratio.second;\r
425         }\r
426                 \r
427         std::pair<float, float> None()\r
428         {\r
429                 float width = static_cast<float>(square_width_)/static_cast<float>(screen_width_);\r
430                 float height = static_cast<float>(square_height_)/static_cast<float>(screen_height_);\r
431 \r
432                 return std::make_pair(width, height);\r
433         }\r
434 \r
435         std::pair<float, float> Uniform()\r
436         {\r
437                 float aspect = static_cast<float>(square_width_)/static_cast<float>(square_height_);\r
438                 float width = std::min(1.0f, static_cast<float>(screen_height_)*aspect/static_cast<float>(screen_width_));\r
439                 float height = static_cast<float>(screen_width_*width)/static_cast<float>(screen_height_*aspect);\r
440 \r
441                 return std::make_pair(width, height);\r
442         }\r
443 \r
444         std::pair<float, float> Fill()\r
445         {\r
446                 return std::make_pair(1.0f, 1.0f);\r
447         }\r
448 \r
449         std::pair<float, float> UniformToFill()\r
450         {\r
451                 float wr = static_cast<float>(square_width_)/static_cast<float>(screen_width_);\r
452                 float hr = static_cast<float>(square_height_)/static_cast<float>(screen_height_);\r
453                 float r_inv = 1.0f/std::min(wr, hr);\r
454 \r
455                 float width = wr*r_inv;\r
456                 float height = hr*r_inv;\r
457 \r
458                 return std::make_pair(width, height);\r
459         }\r
460 };\r
461 \r
462 \r
463 struct screen_consumer_proxy : public core::frame_consumer\r
464 {\r
465         const configuration config_;\r
466         std::unique_ptr<screen_consumer> consumer_;\r
467 \r
468 public:\r
469 \r
470         screen_consumer_proxy(const configuration& config)\r
471                 : config_(config){}\r
472         \r
473         // frame_consumer\r
474 \r
475         virtual void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
476         {\r
477                 consumer_.reset();\r
478                 consumer_.reset(new screen_consumer(config_, format_desc, channel_index));\r
479         }\r
480         \r
481         virtual bool send(const spl::shared_ptr<const core::data_frame>& frame) override\r
482         {\r
483                 return consumer_->send(frame);\r
484         }\r
485         \r
486         virtual std::wstring print() const override\r
487         {\r
488                 return consumer_ ? consumer_->print() : L"[screen_consumer]";\r
489         }\r
490 \r
491         virtual std::wstring name() const override\r
492         {\r
493                 return L"screen";\r
494         }\r
495 \r
496         virtual boost::property_tree::wptree info() const override\r
497         {\r
498                 boost::property_tree::wptree info;\r
499                 info.add(L"type", L"screen");\r
500                 info.add(L"key-only", config_.key_only);\r
501                 info.add(L"windowed", config_.windowed);\r
502                 info.add(L"auto-deinterlace", config_.auto_deinterlace);\r
503                 return info;\r
504         }\r
505 \r
506         virtual bool has_synchronization_clock() const override\r
507         {\r
508                 return false;\r
509         }\r
510         \r
511         virtual int buffer_depth() const override\r
512         {\r
513                 return 2;\r
514         }\r
515 \r
516         virtual int index() const override\r
517         {\r
518                 return 600;\r
519         }\r
520 };      \r
521 \r
522 spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
523 {\r
524         if(params.size() < 1 || params[0] != L"SCREEN")\r
525                 return core::frame_consumer::empty();\r
526         \r
527         configuration config;\r
528                 \r
529         auto device_it = std::find(params.begin(), params.end(), L"DEVICE");\r
530         if(device_it != params.end() && ++device_it != params.end())\r
531                 config.screen_index = boost::lexical_cast<int>(*device_it);\r
532                 \r
533         config.key_only = std::find(params.begin(), params.end(), L"WINDOWED") != params.end();\r
534         config.key_only = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end();\r
535 \r
536         auto name_it    = std::find(params.begin(), params.end(), L"NAME");\r
537         if(name_it != params.end() && ++name_it != params.end())\r
538                 config.name = *name_it;\r
539 \r
540         return spl::make_shared<screen_consumer_proxy>(config);\r
541 }\r
542 \r
543 spl::shared_ptr<core::frame_consumer> create_consumer(const boost::property_tree::wptree& ptree) \r
544 {\r
545         configuration config;\r
546         config.name                             = ptree.get(L"name",     config.name);\r
547         config.screen_index             = ptree.get(L"device",   config.screen_index+1)-1;\r
548         config.windowed                 = ptree.get(L"windowed", config.windowed);\r
549         config.key_only                 = ptree.get(L"key-only", config.key_only);\r
550         config.auto_deinterlace = ptree.get(L"auto-deinterlace", config.auto_deinterlace);\r
551         config.vsync                    = ptree.get(L"vsync", config.vsync);\r
552         \r
553         auto stretch_str = ptree.get(L"stretch", L"default");\r
554         if(stretch_str == L"uniform")\r
555                 config.stretch = stretch::uniform;\r
556         else if(stretch_str == L"uniform_to_fill")\r
557                 config.stretch = stretch::uniform_to_fill;\r
558 \r
559         auto aspect_str = ptree.get(L"aspect-ratio", L"default");\r
560         if(aspect_str == L"16:9")\r
561                 config.aspect = configuration::aspect_16_9;\r
562         else if(aspect_str == L"4:3")\r
563                 config.aspect = configuration::aspect_4_3;\r
564         \r
565         return spl::make_shared<screen_consumer_proxy>(config);\r
566 }\r
567 \r
568 }}