From d5a12edeb0db9a3148a64d3e1e4e82c9d59ac9ef Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Fri, 27 May 2016 17:32:08 +0200 Subject: [PATCH] video_output: rename android_window to android-display Since it's a "vout display" module. --- modules/codec/Makefile.am | 4 +++- modules/codec/omxil/mediacodec.c | 2 +- modules/codec/omxil/omxil.c | 2 +- modules/video_output/Makefile.am | 12 ++++++------ .../android/{android_window.c => display.c} | 13 ++++++------- .../android/{android_window.h => display.h} | 2 +- po/POTFILES.in | 2 +- 7 files changed, 19 insertions(+), 18 deletions(-) rename modules/video_output/android/{android_window.c => display.c} (99%) rename modules/video_output/android/{android_window.h => display.h} (98%) diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 3add254b2f..e43ba76824 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -428,7 +428,8 @@ libomxil_plugin_la_SOURCES = \ codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c codec/omxil/omxil_core.h \ video_chroma/copy.c if HAVE_ANDROID -libomxil_plugin_la_SOURCES += video_output/android/utils.c video_output/android/utils.h +libomxil_plugin_la_SOURCES += video_output/android/utils.c video_output/android/utils.h \ + video_output/android/display.h endif libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil) libomxil_plugin_la_LIBADD = $(LIBDL) @@ -448,6 +449,7 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacode codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c codec/omxil/utils.c \ video_chroma/copy.c \ video_output/android/utils.c video_output/android/utils.h \ + video_output/android/display.h \ packetizer/hxxx_nal.h packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c index cbe4473d1c..605f4c7cfd 100644 --- a/modules/codec/omxil/mediacodec.c +++ b/modules/codec/omxil/mediacodec.c @@ -47,7 +47,7 @@ #include #include #include "omxil_utils.h" -#include "../../video_output/android/android_window.h" +#include "../../video_output/android/display.h" #define BLOCK_FLAG_CSD (0x01 << BLOCK_FLAG_PRIVATE_SHIFT) diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c index b5e6e3c29f..2ffaa6aed7 100644 --- a/modules/codec/omxil/omxil.c +++ b/modules/codec/omxil/omxil.c @@ -45,7 +45,7 @@ #if defined(USE_IOMX) #include #include -#include "../../video_output/android/android_window.h" +#include "../../video_output/android/display.h" #endif #ifndef NDEBUG diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index ccf439e4a2..d1bb161fad 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -277,14 +277,14 @@ libandroid_native_window_plugin_la_SOURCES = video_output/android/nativewindow.c libandroid_native_window_plugin_la_CFLAGS = $(AM_CFLAGS) libandroid_native_window_plugin_la_LIBADD = $(LIBDL) -libandroid_window_plugin_la_SOURCES = video_output/android/android_window.c video_output/android/android_window.h video_output/android/utils.c video_output/android/utils.h -libandroid_window_plugin_la_CFLAGS = $(AM_CFLAGS) -libandroid_window_plugin_la_LIBADD = $(LIBDL) -libandroid_window_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' +libandroid_display_plugin_la_SOURCES = video_output/android/display.c \ + video_output/android/display.h \ + video_output/android/utils.c video_output/android/utils.h +libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS) +libandroid_display_plugin_la_LIBADD = $(LIBDL) if HAVE_ANDROID -vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_window_plugin.la -vout_LTLIBRARIES += $(LTLIBandroid_window) +vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_display_plugin.la if HAVE_EGL vout_LTLIBRARIES += libegl_android_plugin.la endif diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/display.c similarity index 99% rename from modules/video_output/android/android_window.c rename to modules/video_output/android/display.c index 03e51efd6e..d723b41321 100644 --- a/modules/video_output/android/android_window.c +++ b/modules/video_output/android/display.c @@ -1,5 +1,5 @@ /***************************************************************************** - * android_window.c: Android video output module + * display.c: Android video output module ***************************************************************************** * Copyright (C) 2014 VLC authors and VideoLAN * @@ -36,7 +36,7 @@ #include -#include "android_window.h" +#include "display.h" #include "utils.h" /***************************************************************************** @@ -47,7 +47,7 @@ #define CHROMA_LONGTEXT N_(\ "Force use of a specific chroma for output. Default is RGB32.") -#define CFG_PREFIX "androidwindow-" +#define CFG_PREFIX "android-display-" static int Open (vlc_object_t *); static void Close(vlc_object_t *); static void SubpicturePrepare(vout_display_t *vd, subpicture_t *subpicture); @@ -55,10 +55,9 @@ static void SubpicturePrepare(vout_display_t *vd, subpicture_t *subpicture); vlc_module_begin() set_category(CAT_VIDEO) set_subcategory(SUBCAT_VIDEO_VOUT) - set_shortname("android_window") set_description(N_("Android video output")) set_capability("vout display", 260) - add_shortcut("androidwindow", "android") + add_shortcut("android-display") add_string(CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true) set_callbacks(Open, Close) vlc_module_end() @@ -67,7 +66,7 @@ vlc_module_end() * Local prototypes *****************************************************************************/ -#define THREAD_NAME "android_window" +#define THREAD_NAME "android-display" static const vlc_fourcc_t subpicture_chromas[] = { @@ -1129,7 +1128,7 @@ static int Control(vout_display_t *vd, int query, va_list args) return VLC_SUCCESS; } default: - msg_Warn(vd, "Unknown request in android_window"); + msg_Warn(vd, "Unknown request in android-display: %d", query); case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: return VLC_EGENERIC; diff --git a/modules/video_output/android/android_window.h b/modules/video_output/android/display.h similarity index 98% rename from modules/video_output/android/android_window.h rename to modules/video_output/android/display.h index aceb5cbe8a..8d2b97118a 100644 --- a/modules/video_output/android/android_window.h +++ b/modules/video_output/android/display.h @@ -1,5 +1,5 @@ /***************************************************************************** - * android_window.c: Android video output module + * display.h: Android video output module ***************************************************************************** * Copyright (C) 2014 VLC authors and VideoLAN * diff --git a/po/POTFILES.in b/po/POTFILES.in index 73262d064c..db8d119de5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1140,7 +1140,7 @@ modules/video_filter/transform.c modules/video_filter/vhs.c modules/video_filter/wave.c modules/video_output/aa.c -modules/video_output/android/android_window.c +modules/video_output/android/display.c modules/video_output/android/nativewindow.c modules/video_output/caca.c modules/video_output/caopengllayer.m