Refactor VDA and hw-accel video decode setting

ecv80 · Dec 16, 2015 · 275cfc0 · 275cfc0
1 parent 8ff42cf
commit 275cfc0
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -312,7 +312,6 @@ SRCS += src/video/video_playback.c \
  src/video/h264_annexb.c \
 
 SRCS-$(CONFIG_VDPAU) += src/video/vdpau.c
-SRCS-$(CONFIG_VDA) += src/video/vda.c
 
 SRCS-$(CONFIG_CEDAR) += \
  src/ui/glw/glw_video_sunxi.c \

diff --git a/configure.osx b/configure.osx
@@ -50,7 +50,6 @@ enable realpath
 enable polarssl
 enable librtmp
 enable dvd
-enable vda
 enable fsevents
 enable webpopup
 

diff --git a/src/arch/android/android_video_codec.c b/src/arch/android/android_video_codec.c
@@ -444,7 +444,7 @@ android_codec_create(media_codec_t *mc, const media_codec_params_t *mcp,
  jmethodID mid;
  const char *type = NULL;
  const char *nicename = NULL;
- if(!video_settings.android_video_accel)
+ if(!video_settings.video_accel)
  return 1;
 
  switch(mc->codec_id) {

diff --git a/src/arch/osx/osx.mk b/src/arch/osx/osx.mk
@@ -14,6 +14,7 @@ SRCS += src/arch/osx/osx_app.m \
  src/fileaccess/fa_funopen.c \
  src/fileaccess/fa_fs.c \
  src/ui/glw/glw_video_vda.c \
+ src/video/vda.c \
 
 
 SRCS-$(CONFIG_WEBPOPUP) += src/arch/osx/osx_webpopup.m

diff --git a/src/video/vda.c b/src/video/vda.c
@@ -351,7 +351,7 @@ video_vda_codec_create(media_codec_t *mc, const media_codec_params_t *mcp,
  CFNumberRef cv_pix_fmt;
  int zero_copy = 1;
 
- if(mc->codec_id != AV_CODEC_ID_H264 || !video_settings.vda)
+ if(mc->codec_id != AV_CODEC_ID_H264 || !video_settings.video_accel)
  return 1;
 
  if(mcp == NULL || mcp->extradata == NULL || mcp->extradata_size == 0 ||

diff --git a/src/video/video_settings.c b/src/video/video_settings.c
@@ -70,19 +70,16 @@ video_settings_init(void)
  NULL);
 #endif
 
-#if ENABLE_VDA
- setting_create(SETTING_BOOL, s, SETTINGS_INITIAL_UPDATE,
- SETTING_TITLE(_p("Enable VDA")),
- SETTING_HTSMSG("vda", store, "videoplayback"),
- SETTING_WRITE_BOOL(&video_settings.vda),
- NULL);
-#endif
-
-#ifdef __ANDROID__
+#if defined(__APPLE__) || defined(__ANDROID__)
  setting_create(SETTING_BOOL, s, SETTINGS_INITIAL_UPDATE,
  SETTING_TITLE(_p("Hardware accelerated decoding")),
  SETTING_HTSMSG("videoaccel", store, "videoplayback"),
- SETTING_WRITE_BOOL(&video_settings.android_video_accel),
+#if defined(__APPLE__)
+ SETTING_VALUE(1),
+#else
+ SETTING_VALUE(0),
+#endif
+ SETTING_WRITE_BOOL(&video_settings.video_accel),
  NULL);
 #endif
 

diff --git a/src/video/video_settings.h b/src/video/video_settings.h
@@ -45,8 +45,7 @@ struct video_settings {
  int vdpau_deinterlace;
  int vdpau_deinterlace_resolution_limit;
  int continuous_playback;
- int vda;
- int android_video_accel;
+ int video_accel;
 
  int seek_back_step;
  int seek_fwd_step;

diff --git a/support/configure.inc b/support/configure.inc
@@ -74,7 +74,6 @@ CONFIG_LIST="
  sqlite_locking
  sqlite_internal
  libav
- vda
  tlsf
  airplay
  webpopup