diff --git a/src/media/libav_utils.cpp b/src/media/libav_utils.cpp index 59ec617feaf3ad6a60582d384f797c75393796b6..2dfd4efcec0b06fa7a8e93296b32ddb1bd53c252 100644 --- a/src/media/libav_utils.cpp +++ b/src/media/libav_utils.cpp @@ -115,7 +115,7 @@ int libav_pixel_format(int fmt) switch (fmt) { case video::VIDEO_PIXFMT_BGRA: return PIXEL_FORMAT(BGRA); case video::VIDEO_PIXFMT_RGBA: return PIXEL_FORMAT(RGBA); - case video::VIDEO_PIXFMT_YUV420P: return PIXEL_FORMAT(YUV420P); + case video::VIDEO_PIXFMT_YUYV422: return PIXEL_FORMAT(YUYV422); } return fmt; } @@ -123,7 +123,7 @@ int libav_pixel_format(int fmt) int ring_pixel_format(int fmt) { switch (fmt) { - case PIXEL_FORMAT(YUV420P): return video::VIDEO_PIXFMT_YUV420P; + case PIXEL_FORMAT(YUYV422): return video::VIDEO_PIXFMT_YUYV422; } return fmt; } diff --git a/src/media/video/video_base.h b/src/media/video/video_base.h index a91314f70bfb0999bea5acc887d69fff76492548..8d694d438ff8b70f943fd6529656e48ae002b2c5 100644 --- a/src/media/video/video_base.h +++ b/src/media/video/video_base.h @@ -50,7 +50,7 @@ namespace ring { namespace video { enum VideoPixelFormat { VIDEO_PIXFMT_BGRA = -1, - VIDEO_PIXFMT_YUV420P = -2, + VIDEO_PIXFMT_YUYV422 = -2, VIDEO_PIXFMT_RGBA = -3, }; diff --git a/src/media/video/video_mixer.cpp b/src/media/video/video_mixer.cpp index 0a08feaf816db43fdd8014514a3d30ed7d25dfcc..f9b0105bedbdc43a73b8222efc08302ab01ae509 100644 --- a/src/media/video/video_mixer.cpp +++ b/src/media/video/video_mixer.cpp @@ -130,7 +130,7 @@ VideoMixer::process() VideoFrame& output = getNewFrame(); try { - output.reserve(VIDEO_PIXFMT_YUV420P, width_, height_); + output.reserve(VIDEO_PIXFMT_YUYV422, width_, height_); } catch (const std::bad_alloc& e) { RING_ERR("VideoFrame::allocBuffer() failed"); return; @@ -231,6 +231,6 @@ VideoMixer::getHeight() const int VideoMixer::getPixelFormat() const -{ return VIDEO_PIXFMT_YUV420P; } +{ return VIDEO_PIXFMT_YUYV422; } }} // namespace ring::video