Skip to content
This repository has been archived by the owner on Aug 20, 2020. It is now read-only.

Fixed the compile error #246

Merged
merged 2 commits into from
Jul 24, 2014
Merged

Fixed the compile error #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b448c43
Revert "Temporarily disable HWA decoding support."
qjia7 Jul 17, 2014
0791108
Fixed the compile error
qjia7 Jul 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions media/media_ozone_platform_wayland.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "media/video/video_decode_accelerator.h"
#include "media/ozone/media_ozone_platform.h"
//#include "ozone/media/vaapi_video_decode_accelerator.h"
#include "ozone/media/vaapi_video_decode_accelerator.h"

namespace media {

Expand All @@ -21,10 +21,7 @@ class MediaOzonePlatformWayland : public MediaOzonePlatform {
// MediaOzonePlatform:
virtual media::VideoDecodeAccelerator* CreateVideoDecodeAccelerator(
const base::Callback<bool(void)>& make_context_current) OVERRIDE {
// Temporarily disable the support till
// https://github.com/01org/ozone-wayland/issues/240 is resolved.
//return new VaapiVideoDecodeAccelerator(make_context_current);
return NULL;
return new VaapiVideoDecodeAccelerator(make_context_current);
}

private:
Expand Down
22 changes: 13 additions & 9 deletions media/video.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
'sources': [
'media_ozone_platform_wayland.cc',
'media_ozone_platform_wayland.h',
#'h264_dpb.cc',
#'h264_dpb.h',
#'va_surface.h',
#'vaapi_h264_decoder.cc',
#'vaapi_h264_decoder.h',
#'vaapi_video_decode_accelerator.cc',
#'vaapi_video_decode_accelerator.h',
#'vaapi_wrapper.cc',
#'vaapi_wrapper.h',
'h264_dpb.cc',
'h264_dpb.h',
'va_surface.h',
'vaapi_h264_decoder.cc',
'vaapi_h264_decoder.h',
'vaapi_video_decode_accelerator.cc',
'vaapi_video_decode_accelerator.h',
'vaapi_wrapper.cc',
'vaapi_wrapper.h',
],
'variables': {
'extra_header': 'media/va_wayland_stub_header.fragment',
Expand All @@ -26,8 +26,12 @@
'intermediate_dir': '<(INTERMEDIATE_DIR)',
'output_root': '<(SHARED_INTERMEDIATE_DIR)/va',
},
'dependencies': [
'<(DEPTH)/ui/gl/gl.gyp:gl',
],
'include_dirs': [
'<(DEPTH)/third_party/libva',
'<(DEPTH)/third_party/mesa/src/include',
'<(output_root)',
'<(SHARED_INTERMEDIATE_DIR)/ui/gl',
],
Expand Down