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