2.0. Added new pix_fmt, CASPAR_PIX_FMT_LUMA, for using Y/luma channel as alpha.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1160 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 7c0b3ba78c1c177e7aff01dfcd001f7a31aae799..0ca341aa8e2bd70148474b947736f48c784d09eb 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -253,6 +253,11 @@ struct image_kernel::implementation : boost::noncopyable
                "                       float a  = texture2D(plane[3], gl_TexCoord[0].st).r;                                    \n"\r
                "                       return ycbcra_to_rgba(y, cb, cr, a);                                                                    \n"\r
                "               }                                                                                                                                                       \n"\r
+               "       case 7:         //luma                                                                                                                          \n"\r
+               "               {                                                                                                                                                       \n"\r
+               "                       vec3 y3 = texture2D(plane[0], gl_TexCoord[0].st).rrr;                                   \n"\r
+               "                       return vec4((y3-0.065)/0.859, 1.0);                                                                             \n"\r
+               "               }                                                                                                                                                       \n"\r
                "       }                                                                                                                                                               \n"\r
                "       return vec4(0.0, 0.0, 0.0, 0.0);                                                                                                \n"\r
                "}                                                                                                                                                                      \n"\r

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 4647707e784097ee1eafc334442f98ae80c0f6ed..a6218f6f47a31960e1874f73be18971ef7ec3c5f 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -195,12 +195,19 @@ struct frame_muxer::implementation : boost::noncopyable
 \r
                        CASPAR_LOG(info) << "[frame_muxer] " << display_mode::print(display_mode_);\r
                }\r
+\r
                                \r
                if(hints & core::frame_producer::ALPHA_HINT)\r
-                       try_make_gray(make_safe(video_frame));\r
+                       video_frame->format = make_alpha_format(video_frame->format);\r
+               \r
+               auto format = video_frame->format;\r
+               if(video_frame->format == CASPAR_PIX_FMT_LUMA) // CASPAR_PIX_FMT_LUMA is not valid for filter, change it to GRAY8\r
+                       video_frame->format = PIX_FMT_GRAY8;\r
 \r
                BOOST_FOREACH(auto& av_frame, filter_.execute(video_frame))\r
                {\r
+                       av_frame->format = format;\r
+\r
                        auto frame = make_write_frame(this, av_frame, frame_factory_, hints);\r
 \r
                        // Fix field-order if needed\r

diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index 8019ab3e8061014cb85a362d93b004794f5e895f..de20fe2efc8fa50edfd9777d9d0557583eecf299 100644 (file)
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -41,86 +41,27 @@ core::pixel_format::type get_pixel_format(PixelFormat pix_fmt)
 {\r
        switch(pix_fmt)\r
        {\r
-       case PIX_FMT_GRAY8:             return core::pixel_format::gray;\r
-       case PIX_FMT_BGRA:              return core::pixel_format::bgra;\r
-       case PIX_FMT_ARGB:              return core::pixel_format::argb;\r
-       case PIX_FMT_RGBA:              return core::pixel_format::rgba;\r
-       case PIX_FMT_ABGR:              return core::pixel_format::abgr;\r
-       case PIX_FMT_YUV444P:   return core::pixel_format::ycbcr;\r
-       case PIX_FMT_YUV422P:   return core::pixel_format::ycbcr;\r
-       case PIX_FMT_YUV420P:   return core::pixel_format::ycbcr;\r
-       case PIX_FMT_YUV411P:   return core::pixel_format::ycbcr;\r
-       case PIX_FMT_YUV410P:   return core::pixel_format::ycbcr;\r
-       case PIX_FMT_YUVA420P:  return core::pixel_format::ycbcra;\r
-       default:                                return core::pixel_format::invalid;\r
+       case CASPAR_PIX_FMT_LUMA:       return core::pixel_format::luma;\r
+       case PIX_FMT_GRAY8:                     return core::pixel_format::gray;\r
+       case PIX_FMT_BGRA:                      return core::pixel_format::bgra;\r
+       case PIX_FMT_ARGB:                      return core::pixel_format::argb;\r
+       case PIX_FMT_RGBA:                      return core::pixel_format::rgba;\r
+       case PIX_FMT_ABGR:                      return core::pixel_format::abgr;\r
+       case PIX_FMT_YUV444P:           return core::pixel_format::ycbcr;\r
+       case PIX_FMT_YUV422P:           return core::pixel_format::ycbcr;\r
+       case PIX_FMT_YUV420P:           return core::pixel_format::ycbcr;\r
+       case PIX_FMT_YUV411P:           return core::pixel_format::ycbcr;\r
+       case PIX_FMT_YUV410P:           return core::pixel_format::ycbcr;\r
+       case PIX_FMT_YUVA420P:          return core::pixel_format::ycbcra;\r
+       default:                                        return core::pixel_format::invalid;\r
        }\r
 }\r
 \r
-PixelFormat get_ffmpeg_pixel_format(const core::pixel_format_desc& format_desc)\r
-{\r
-       switch(format_desc.pix_fmt)\r
-       {\r
-       case core::pixel_format::gray: return PIX_FMT_GRAY8;\r
-       case core::pixel_format::bgra: return PIX_FMT_BGRA;\r
-       case core::pixel_format::argb: return PIX_FMT_ARGB;\r
-       case core::pixel_format::rgba: return PIX_FMT_RGBA;\r
-       case core::pixel_format::abgr: return PIX_FMT_ABGR;\r
-       case core::pixel_format::ycbcra: return PIX_FMT_YUVA420P;\r
-       case core::pixel_format::ycbcr:\r
-               auto planes = format_desc.planes;\r
-               if(planes[0].height == planes[1].height)\r
-               {\r
-                       if(planes[0].width == planes[1].width)\r
-                               return PIX_FMT_YUV444P;\r
-                       else if(planes[0].width/2 == planes[1].width)\r
-                               return PIX_FMT_YUV422P;\r
-                       else if(planes[0].width/4 == planes[1].width)\r
-                               return PIX_FMT_YUV411P;\r
-               }\r
-               if(planes[0].height/2 == planes[1].height)\r
-               {\r
-                       if(planes[0].width/2 == planes[1].width)\r
-                               return PIX_FMT_YUV420P;\r
-               }\r
-               if(planes[0].height/4 == planes[1].height)\r
-               {\r
-                       if(planes[0].width/4 == planes[1].width)\r
-                               return PIX_FMT_YUV410P;\r
-               }\r
-       }\r
-       return PIX_FMT_NONE;\r
-}\r
-\r
-safe_ptr<AVFrame> as_av_frame(const safe_ptr<core::write_frame>& frame)\r
-{\r
-       auto desc = frame->get_pixel_format_desc();\r
-       safe_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free);     \r
-       avcodec_get_frame_defaults(av_frame.get());\r
-\r
-       for(size_t n = 0; n < desc.planes.size(); ++n)\r
-       {       \r
-               av_frame->data[n]               = frame->image_data(n).begin();\r
-               av_frame->linesize[n]   = desc.planes[n].width;\r
-       }\r
-\r
-       av_frame->format        = get_ffmpeg_pixel_format(desc);\r
-       av_frame->width         = desc.planes[0].width;\r
-       av_frame->height        = desc.planes[0].height;\r
-\r
-       if(frame->get_type() != core::video_mode::progressive)\r
-       {\r
-               av_frame->interlaced_frame = 1;\r
-               av_frame->top_field_first = frame->get_type() == core::video_mode::upper ? 1 : 0;\r
-       }\r
-\r
-       return av_frame;\r
-}\r
-\r
 core::pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, size_t width, size_t height)\r
 {\r
        // Get linesizes\r
        AVPicture dummy_pict;   \r
-       avpicture_fill(&dummy_pict, nullptr, pix_fmt, width, height);\r
+       avpicture_fill(&dummy_pict, nullptr, pix_fmt == CASPAR_PIX_FMT_LUMA ? PIX_FMT_GRAY8 : pix_fmt, width, height);\r
 \r
        core::pixel_format_desc desc;\r
        desc.pix_fmt = get_pixel_format(pix_fmt);\r
@@ -128,6 +69,7 @@ core::pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, size_t width,
        switch(desc.pix_fmt)\r
        {\r
        case core::pixel_format::gray:\r
+       case core::pixel_format::luma:\r
                {\r
                        desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0], height, 1));                                               \r
                        return desc;\r
@@ -161,13 +103,20 @@ core::pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, size_t width,
        }\r
 }\r
 \r
-bool try_make_gray(const safe_ptr<AVFrame>& frame)\r
+int make_alpha_format(int format)\r
 {\r
-       auto pix_fmt = get_pixel_format(static_cast<PixelFormat>(frame->format));\r
-       if(pix_fmt == PIX_FMT_RGBA || pix_fmt == PIX_FMT_BGRA)\r
-               frame->format = PIX_FMT_GRAY8;\r
-\r
-       return pix_fmt != core::pixel_format::invalid;\r
+       switch(get_pixel_format(static_cast<PixelFormat>(format)))\r
+       {\r
+       case core::pixel_format::luma:\r
+       case core::pixel_format::gray:\r
+       case core::pixel_format::invalid:\r
+               return format;\r
+       case core::pixel_format::ycbcr:\r
+       case core::pixel_format::ycbcra:\r
+               return CASPAR_PIX_FMT_LUMA;\r
+       default:\r
+       return PIX_FMT_GRAY8;\r
+       }\r
 }\r
 \r
 safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints)\r
@@ -178,9 +127,8 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
        const auto height = decoded_frame->height;\r
        auto desc                 = get_pixel_format_desc(static_cast<PixelFormat>(decoded_frame->format), width, height);\r
        \r
-       // TODO: Can't handle YUV as alpha\r
-       if(hints & core::frame_producer::ALPHA_HINT && (desc.pix_fmt == core::pixel_format::ycbcr || desc.pix_fmt == core::pixel_format::ycbcra))\r
-               desc.pix_fmt = core::pixel_format::invalid;\r
+       if(hints & core::frame_producer::ALPHA_HINT)\r
+               desc = get_pixel_format_desc(static_cast<PixelFormat>(make_alpha_format(decoded_frame->format)), width, height);\r
 \r
        if(desc.pix_fmt == core::pixel_format::invalid)\r
        {\r
@@ -223,10 +171,7 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
        }\r
        else\r
        {\r
-               if(hints & core::frame_producer::ALPHA_HINT)\r
-                       desc = get_pixel_format_desc(PIX_FMT_GRAY8, width, height);\r
-               \r
-               auto write = frame_factory->create_frame(tag, desc.pix_fmt != core::pixel_format::invalid ? desc : get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
+               auto write = frame_factory->create_frame(tag, desc);\r
                write->set_type(get_mode(*decoded_frame));\r
 \r
                for(int n = 0; n < static_cast<int>(desc.planes.size()); ++n)\r

diff --git a/modules/ffmpeg/producer/util.h b/modules/ffmpeg/producer/util.h
index 20aeb587036e72597d78b71486ebc0e72d9fbc1f..75b890c443ad1bf6a41d8c8bca6c7e159574f1fd 100644 (file)
--- a/modules/ffmpeg/producer/util.h
+++ b/modules/ffmpeg/producer/util.h
@@ -5,6 +5,11 @@
 #include <core/video_format.h>\r
 #include <core/producer/frame/pixel_format.h>\r
 \r
+extern "C"\r
+{\r
+       #include <libavutil/pixfmt.h>\r
+}\r
+\r
 struct AVFrame;\r
 enum PixelFormat;\r
 \r
@@ -18,12 +23,12 @@ struct frame_factory;
 \r
 }\r
 \r
+static const PixelFormat       CASPAR_PIX_FMT_LUMA = PIX_FMT_MONOBLACK;\r
+\r
 core::video_mode::type         get_mode(AVFrame& frame);\r
 core::pixel_format::type       get_pixel_format(PixelFormat pix_fmt);\r
 core::pixel_format_desc                get_pixel_format_desc(PixelFormat pix_fmt, size_t width, size_t height);\r
-PixelFormat                                    get_ffmpeg_pixel_format(const core::pixel_format_desc& format_desc);\r
-safe_ptr<AVFrame>                      as_av_frame(const safe_ptr<core::write_frame>& frame);\r
-bool                                           try_make_gray(const safe_ptr<AVFrame>& frame);\r
+int                                                    make_alpha_format(int format);\r
 safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints);\r
 \r
 }
\ No newline at end of file