jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 06:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc-pvr: update XVBA patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-12-17 21:14:24 +01:00
parent 32f947b944
commit 9e4ae1cda7
1 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-d967ec3-901-xvba_support-0544e5e7a21976cbc68bcff40a349b2063daa10d.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-d967ec3-901-xvba_support-998f7aa89895d07639089ff42e8d173de05fef91.patch
View File

@ -93,7 +93,7 @@ index e7045ba..e495665 100755
--enable-pthreads \ --enable-pthreads \
--enable-runtime-cpudetect \ --enable-runtime-cpudetect \
diff --git a/language/English/strings.xml b/language/English/strings.xml diff --git a/language/English/strings.xml b/language/English/strings.xml
index 090a1b9..c7de09b 100644 index 090a1b9..7a976cf 100644
--- a/language/English/strings.xml --- a/language/English/strings.xml
+++ b/language/English/strings.xml +++ b/language/English/strings.xml
@@ -1232,6 +1232,8 @@ @@ -1232,6 +1232,8 @@
@ -101,7 +101,7 @@ index 090a1b9..c7de09b 100644
<string id="13431">Pixel Shaders</string> <string id="13431">Pixel Shaders</string>
<string id="13432">Allow hardware acceleration (VideoToolbox)</string> <string id="13432">Allow hardware acceleration (VideoToolbox)</string>
+ <string id="13433">Allow hardware acceleration (XVBA)</string> + <string id="13433">Allow hardware acceleration (XVBA)</string>
+ <string id="13434">Use XvBA shared surfaces (highly experimental)</string> + <string id="13434">Use XvBA shared surfaces</string>
<string id="13500">A/V sync method</string> <string id="13500">A/V sync method</string>
<string id="13501">Audio clock</string> <string id="13501">Audio clock</string>
@ -1970,10 +1970,10 @@ index 1dce256..8b7d5fb 100644
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp
new file mode 100644 new file mode 100644
index 0000000..c3b1ee7 index 0000000..25c0fb9
--- /dev/null --- /dev/null
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp
@@ -0,0 +1,1342 @@ @@ -0,0 +1,1360 @@
+/* +/*
+ * Copyright (C) 2005-2011 Team XBMC + * Copyright (C) 2005-2011 Team XBMC
+ * http://www.xbmc.org + * http://www.xbmc.org
@ -2656,11 +2656,13 @@ index 0000000..c3b1ee7
+ +
+ for (unsigned int i=0; i<missing; ++i) + for (unsigned int i=0; i<missing; ++i)
+ { + {
+ if (Success != g_XVBA_vtable.CreateDecodeBuffers(&bufferInput, &bufferOutput) + { CSingleLock lock(m_apiSec);
+ || bufferOutput.num_of_buffers_in_list != 1) + if (Success != g_XVBA_vtable.CreateDecodeBuffers(&bufferInput, &bufferOutput)
+ { + || bufferOutput.num_of_buffers_in_list != 1)
+ SetError(__FUNCTION__, "failed to create data control buffer", __LINE__); + {
+ return false; + SetError(__FUNCTION__, "failed to create data control buffer", __LINE__);
+ return false;
+ }
+ } + }
+ m_xvbaBufferPool.data_control_buffers.push_back(bufferOutput.buffer_list); + m_xvbaBufferPool.data_control_buffers.push_back(bufferOutput.buffer_list);
+ } + }
@ -2757,10 +2759,12 @@ index 0000000..c3b1ee7
+ startInput.size = sizeof(startInput); + startInput.size = sizeof(startInput);
+ startInput.session = xvba->m_xvbaSession; + startInput.session = xvba->m_xvbaSession;
+ startInput.target_surface = render->surface; + startInput.target_surface = render->surface;
+ if (Success != g_XVBA_vtable.StartDecodePicture(&startInput)) + { CSingleLock lock(xvba->m_apiSec);
+ { + if (Success != g_XVBA_vtable.StartDecodePicture(&startInput))
+ xvba->SetError(__FUNCTION__, "failed to start decoding", __LINE__); + {
+ return; + xvba->SetError(__FUNCTION__, "failed to start decoding", __LINE__);
+ return;
+ }
+ } + }
+ XVBA_Decode_Picture_Input picInput; + XVBA_Decode_Picture_Input picInput;
+ picInput.size = sizeof(picInput); + picInput.size = sizeof(picInput);
@ -2775,10 +2779,12 @@ index 0000000..c3b1ee7
+ picInput.num_of_buffers_in_list = 2; + picInput.num_of_buffers_in_list = 2;
+ } + }
+ +
+ if (Success != g_XVBA_vtable.DecodePicture(&picInput)) + { CSingleLock lock(xvba->m_apiSec);
+ { + if (Success != g_XVBA_vtable.DecodePicture(&picInput))
+ xvba->SetError(__FUNCTION__, "failed to decode picture 1", __LINE__); + {
+ return; + xvba->SetError(__FUNCTION__, "failed to decode picture 1", __LINE__);
+ return;
+ }
+ } + }
+ +
+ if (!xvba->EnsureDataControlBuffers(render->num_slices)) + if (!xvba->EnsureDataControlBuffers(render->num_slices))
@ -2843,19 +2849,23 @@ index 0000000..c3b1ee7
+ list[0]->data_offset = 0; + list[0]->data_offset = 0;
+ list[1] = xvba->m_xvbaBufferPool.data_control_buffers[i]; + list[1] = xvba->m_xvbaBufferPool.data_control_buffers[i];
+ list[1]->data_size_in_buffer = sizeof(*dataControl); + list[1]->data_size_in_buffer = sizeof(*dataControl);
+ if (Success != g_XVBA_vtable.DecodePicture(&picInput)) + { CSingleLock lock(xvba->m_apiSec);
+ { + if (Success != g_XVBA_vtable.DecodePicture(&picInput))
+ xvba->SetError(__FUNCTION__, "failed to decode picture 2", __LINE__); + {
+ return; + xvba->SetError(__FUNCTION__, "failed to decode picture 2", __LINE__);
+ return;
+ }
+ } + }
+ } + }
+ XVBA_Decode_Picture_End_Input endInput; + XVBA_Decode_Picture_End_Input endInput;
+ endInput.size = sizeof(endInput); + endInput.size = sizeof(endInput);
+ endInput.session = xvba->m_xvbaSession; + endInput.session = xvba->m_xvbaSession;
+ if (Success != g_XVBA_vtable.EndDecodePicture(&endInput)) + { CSingleLock lock(xvba->m_apiSec);
+ { + if (Success != g_XVBA_vtable.EndDecodePicture(&endInput))
+ xvba->SetError(__FUNCTION__, "failed to decode picture 3", __LINE__); + {
+ return; + xvba->SetError(__FUNCTION__, "failed to decode picture 3", __LINE__);
+ return;
+ }
+ } + }
+ +
+ // decode sync and error + // decode sync and error
@ -2869,10 +2879,12 @@ index 0000000..c3b1ee7
+ int64_t start = CurrentHostCounter(); + int64_t start = CurrentHostCounter();
+ while (1) + while (1)
+ { + {
+ if (Success != g_XVBA_vtable.SyncSurface(&syncInput, &syncOutput)) + { CSingleLock lock(xvba->m_apiSec);
+ { + if (Success != g_XVBA_vtable.SyncSurface(&syncInput, &syncOutput))
+ xvba->SetError(__FUNCTION__, "failed sync surface 1", __LINE__); + {
+ return; + xvba->SetError(__FUNCTION__, "failed sync surface 1", __LINE__);
+ return;
+ }
+ } + }
+ if (!(syncOutput.status_flags & XVBA_STILL_PENDING)) + if (!(syncOutput.status_flags & XVBA_STILL_PENDING))
+ break; + break;
@ -2945,10 +2957,12 @@ index 0000000..c3b1ee7
+ surfaceInput.height = xvba->m_surfaceHeight; + surfaceInput.height = xvba->m_surfaceHeight;
+ surfaceInput.session = xvba->m_xvbaSession; + surfaceInput.session = xvba->m_xvbaSession;
+ surfaceOutput.size = sizeof(surfaceOutput); + surfaceOutput.size = sizeof(surfaceOutput);
+ if (Success != g_XVBA_vtable.CreateSurface(&surfaceInput, &surfaceOutput)) + { CSingleLock lock(xvba->m_apiSec);
+ { + if (Success != g_XVBA_vtable.CreateSurface(&surfaceInput, &surfaceOutput))
+ xvba->SetError(__FUNCTION__, "failed to create video surface", __LINE__); + {
+ return -1; + xvba->SetError(__FUNCTION__, "failed to create video surface", __LINE__);
+ return -1;
+ }
+ } + }
+ CSingleLock lock(xvba->m_videoSurfaceSec); + CSingleLock lock(xvba->m_videoSurfaceSec);
+ render->surface = surfaceOutput.surface; + render->surface = surfaceOutput.surface;
@ -3157,9 +3171,11 @@ index 0000000..c3b1ee7
+ input.target_width = m_surfaceWidth; + input.target_width = m_surfaceWidth;
+ input.target_height = m_surfaceHeight; + input.target_height = m_surfaceHeight;
+ input.target_parameter = target; + input.target_parameter = target;
+ if (Success != g_XVBA_vtable.GetSurface(&input)) + { CSingleLock lock(m_apiSec);
+ { + if (Success != g_XVBA_vtable.GetSurface(&input))
+ CLog::Log(LOGERROR,"(XVBA::CopyYV12) failed to get surface"); + {
+ CLog::Log(LOGERROR,"(XVBA::CopyYV12) failed to get surface");
+ }
+ } + }
+ +
+ if (m_presentPicture->render) + if (m_presentPicture->render)
@ -3242,10 +3258,12 @@ index 0000000..c3b1ee7
+ transInput.src_surface = m_flipBuffer[index].outPic->render->surface; + transInput.src_surface = m_flipBuffer[index].outPic->render->surface;
+ transInput.target_surface = m_flipBuffer[index].glSurface[i]; + transInput.target_surface = m_flipBuffer[index].glSurface[i];
+ transInput.flag = field; + transInput.flag = field;
+ if (Success != g_XVBA_vtable.TransferSurface(&transInput)) + { CSingleLock lock(m_apiSec);
+ { + if (Success != g_XVBA_vtable.TransferSurface(&transInput))
+ CLog::Log(LOGERROR,"(XVBA) failed to transfer surface"); + {
+ return -1; + CLog::Log(LOGERROR,"(XVBA) failed to transfer surface");
+ return -1;
+ }
+ } + }
+ } + }
+ +
@ -3318,10 +3336,10 @@ index 0000000..c3b1ee7
+#endif +#endif
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h
new file mode 100644 new file mode 100644
index 0000000..8dfc1c2 index 0000000..b3c5f5b
--- /dev/null --- /dev/null
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h
@@ -0,0 +1,157 @@ @@ -0,0 +1,158 @@
+/* +/*
+ * Copyright (C) 2005-2011 Team XBMC + * Copyright (C) 2005-2011 Team XBMC
+ * http://www.xbmc.org + * http://www.xbmc.org
@ -3471,6 +3489,7 @@ index 0000000..8dfc1c2
+ GLuint glTexture[3]; + GLuint glTexture[3];
+ }; + };
+ CCriticalSection m_outPicSec, m_videoSurfaceSec; + CCriticalSection m_outPicSec, m_videoSurfaceSec;
+ CCriticalSection m_apiSec;
+ OutputPicture m_allOutPic[NUM_OUTPUT_PICS]; + OutputPicture m_allOutPic[NUM_OUTPUT_PICS];
+ std::deque<OutputPicture*> m_freeOutPic; + std::deque<OutputPicture*> m_freeOutPic;
+ std::deque<OutputPicture*> m_usedOutPic; + std::deque<OutputPicture*> m_usedOutPic;