Commit c633b2cb authored by shivdasp@nvidia.com's avatar shivdasp@nvidia.com

vda: Rename Exynos VDA to V4L2 VDA

This change is the first pass of restructuring
the exynos vda implementation to a more generic
v4l2 vda to facilitate support for other v4l2
based vda.

BUG=chromium-os-partner:24752
TEST=Run video playback, vda_unittest

Review URL: https://codereview.chromium.org/122233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243803 0039d316-1c4b-4281-b951-d872f2087c98
parent d1dea5da
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "content/common/gpu/media/dxva_video_decode_accelerator.h" #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
#include "content/common/gpu/media/exynos_video_decode_accelerator.h" #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
#include "ui/gl/gl_context_glx.h" #include "ui/gl/gl_context_glx.h"
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
...@@ -271,7 +271,7 @@ void GpuVideoDecodeAccelerator::Initialize( ...@@ -271,7 +271,7 @@ void GpuVideoDecodeAccelerator::Initialize(
video_decode_accelerator_.reset(new DXVAVideoDecodeAccelerator( video_decode_accelerator_.reset(new DXVAVideoDecodeAccelerator(
this, make_context_current_)); this, make_context_current_));
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
video_decode_accelerator_.reset(new ExynosVideoDecodeAccelerator( video_decode_accelerator_.reset(new V4L2VideoDecodeAccelerator(
gfx::GLSurfaceEGL::GetHardwareDisplay(), gfx::GLSurfaceEGL::GetHardwareDisplay(),
this, this,
weak_factory_for_io_.GetWeakPtr(), weak_factory_for_io_.GetWeakPtr(),
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include "content/common/gpu/media/dxva_video_decode_accelerator.h" #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
#elif defined(OS_CHROMEOS) #elif defined(OS_CHROMEOS)
#if defined(ARCH_CPU_ARMEL) #if defined(ARCH_CPU_ARMEL)
#include "content/common/gpu/media/exynos_video_decode_accelerator.h" #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
#elif defined(ARCH_CPU_X86_FAMILY) #elif defined(ARCH_CPU_X86_FAMILY)
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
#include "content/common/gpu/media/vaapi_wrapper.h" #include "content/common/gpu/media/vaapi_wrapper.h"
...@@ -546,7 +546,7 @@ void GLRenderingVDAClient::CreateAndStartDecoder() { ...@@ -546,7 +546,7 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
new DXVAVideoDecodeAccelerator(client, base::Bind(&DoNothingReturnTrue))); new DXVAVideoDecodeAccelerator(client, base::Bind(&DoNothingReturnTrue)));
#elif defined(OS_CHROMEOS) #elif defined(OS_CHROMEOS)
#if defined(ARCH_CPU_ARMEL) #if defined(ARCH_CPU_ARMEL)
decoder_.reset(new ExynosVideoDecodeAccelerator( decoder_.reset(new V4L2VideoDecodeAccelerator(
static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()), static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
client, client,
weak_client, weak_client,
......
...@@ -8,7 +8,7 @@ bear.h264: ...@@ -8,7 +8,7 @@ bear.h264:
bear.h264.md5: bear.h264.md5:
MD5s of RGB thumbnail rendered version of bear.h264 decoded with Intel MD5s of RGB thumbnail rendered version of bear.h264 decoded with Intel
VAAPI on Ivy Bridge and Sandy Bridge and Exynos EVDA. VAAPI on Ivy Bridge and Sandy Bridge and V4L2VDA on Exynos.
Written out by video_decode_accelerator_unittest. Written out by video_decode_accelerator_unittest.
These differ between implementations because color space-converted frames are These differ between implementations because color space-converted frames are
not specified to the last bit and GLES shader/texture filtering not specified to the last bit and GLES shader/texture filtering
......
...@@ -8,7 +8,7 @@ npot-video.h264: ...@@ -8,7 +8,7 @@ npot-video.h264:
npot-video.h264.md5: npot-video.h264.md5:
MD5s of RGB thumbnail rendered version of npot-video.h264 decoded with Intel MD5s of RGB thumbnail rendered version of npot-video.h264 decoded with Intel
VAAPI on Ivy Bridge and Sandy Bridge and Exynos EVDA. VAAPI on Ivy Bridge and Sandy Bridge and V4L2VDA on Exynos.
Written out by video_decode_accelerator_unittest. Written out by video_decode_accelerator_unittest.
These differ between implementations because color space-converted frames are These differ between implementations because color space-converted frames are
not specified to the last bit and GLES shader/texture filtering not specified to the last bit and GLES shader/texture filtering
......
...@@ -8,7 +8,7 @@ red-green.h264: ...@@ -8,7 +8,7 @@ red-green.h264:
red-green.h264.md5: red-green.h264.md5:
MD5s of RGB thumbnail rendered version of red-green.h264 decoded with Intel MD5s of RGB thumbnail rendered version of red-green.h264 decoded with Intel
VAAPI on Ivy Bridge and Sandy Bridge and Exynos EVDA. VAAPI on Ivy Bridge and Sandy Bridge and V4L2VDA on Exynos.
Written out by video_decode_accelerator_unittest. Written out by video_decode_accelerator_unittest.
These differ between implementations because color space-converted frames are These differ between implementations because color space-converted frames are
not specified to the last bit and GLES shader/texture filtering not specified to the last bit and GLES shader/texture filtering
......
...@@ -8,7 +8,7 @@ test-25fps.h264: ...@@ -8,7 +8,7 @@ test-25fps.h264:
test-25fps.h264.md5: test-25fps.h264.md5:
MD5s of RGB thumbnail rendered version of test-25fps.h264 decoded with Intel MD5s of RGB thumbnail rendered version of test-25fps.h264 decoded with Intel
VAAPI on Haswell, Ivy Bridge, Sandy Bridge and Exynos EVDA. VAAPI on Haswell, Ivy Bridge, Sandy Bridge and V4L2VDA on Exynos.
Written out by video_decode_accelerator_unittest. Written out by video_decode_accelerator_unittest.
These differ between implementations because color space-converted frames are These differ between implementations because color space-converted frames are
not specified to the last bit and GLES shader/texture filtering not specified to the last bit and GLES shader/texture filtering
...@@ -21,5 +21,5 @@ test-25fps.vp8: ...@@ -21,5 +21,5 @@ test-25fps.vp8:
mkvextract tracks test-25fps.webm 1:test-25fps.vp8 && rm test-25fps.webm mkvextract tracks test-25fps.webm 1:test-25fps.vp8 && rm test-25fps.webm
test-25fps.vp8.md5: test-25fps.vp8.md5:
MD5 of RGB thumbnail rendered version of test-25fps.vp8 decoded with Exynos MD5 of RGB thumbnail rendered version of test-25fps.vp8 decoded with V4L2VDA
EVDA. Written out by video_decode_accelerator_unittest. on Exynos. Written out by video_decode_accelerator_unittest.
...@@ -551,10 +551,10 @@ ...@@ -551,10 +551,10 @@
'../media/media.gyp:media', '../media/media.gyp:media',
], ],
'sources': [ 'sources': [
'common/gpu/media/exynos_video_decode_accelerator.cc',
'common/gpu/media/exynos_video_decode_accelerator.h',
'common/gpu/media/exynos_video_encode_accelerator.cc', 'common/gpu/media/exynos_video_encode_accelerator.cc',
'common/gpu/media/exynos_video_encode_accelerator.h', 'common/gpu/media/exynos_video_encode_accelerator.h',
'common/gpu/media/v4l2_video_decode_accelerator.cc',
'common/gpu/media/v4l2_video_decode_accelerator.h',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/khronos', '<(DEPTH)/third_party/khronos',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment