patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecVDA_cpp 1.7 KB

12345678910111213141516171819202122232425262728293031323334
  1. --- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp 2016-02-20 16:21:19.000000000 +0100
  2. +++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp 2016-03-19 18:38:18.626024634 +0100
  3. @@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(
  4. void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture)
  5. {
  6. - // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
  7. + // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
  8. struct SwsContext *swcontext = sws_getContext(
  9. - m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422,
  10. - m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
  11. - SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
  12. + m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
  13. + m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
  14. + SWS_FAST_BILINEAR, NULL, NULL, NULL);
  15. if (swcontext)
  16. {
  17. uint8_t *src[] = { yuv422_ptr, 0, 0, 0 };
  18. @@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42
  19. void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture)
  20. {
  21. - // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
  22. + // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
  23. struct SwsContext *swcontext = sws_getContext(
  24. - m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA,
  25. - m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
  26. - SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
  27. + m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
  28. + m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
  29. + SWS_FAST_BILINEAR, NULL, NULL, NULL);
  30. if (swcontext)
  31. {
  32. uint8_t *src[] = { bgra_ptr, 0, 0, 0 };