Commit d5a12ede authored by Thomas Guillem's avatar Thomas Guillem

video_output: rename android_window to android-display

Since it's a "vout display" module.
parent 38aca24f
...@@ -428,7 +428,8 @@ libomxil_plugin_la_SOURCES = \ ...@@ -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 \ codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c codec/omxil/omxil_core.h \
video_chroma/copy.c video_chroma/copy.c
if HAVE_ANDROID 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 endif
libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil) libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil)
libomxil_plugin_la_LIBADD = $(LIBDL) libomxil_plugin_la_LIBADD = $(LIBDL)
...@@ -448,6 +449,7 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacode ...@@ -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 \ codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c codec/omxil/utils.c \
video_chroma/copy.c \ video_chroma/copy.c \
video_output/android/utils.c video_output/android/utils.h \ 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/hxxx_nal.h packetizer/h264_nal.c packetizer/h264_nal.h \
packetizer/hevc_nal.c packetizer/hevc_nal.h packetizer/hevc_nal.c packetizer/hevc_nal.h
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <OMX_Core.h> #include <OMX_Core.h>
#include <OMX_Component.h> #include <OMX_Component.h>
#include "omxil_utils.h" #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) #define BLOCK_FLAG_CSD (0x01 << BLOCK_FLAG_PRIVATE_SHIFT)
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#if defined(USE_IOMX) #if defined(USE_IOMX)
#include <dlfcn.h> #include <dlfcn.h>
#include <jni.h> #include <jni.h>
#include "../../video_output/android/android_window.h" #include "../../video_output/android/display.h"
#endif #endif
#ifndef NDEBUG #ifndef NDEBUG
......
...@@ -277,14 +277,14 @@ libandroid_native_window_plugin_la_SOURCES = video_output/android/nativewindow.c ...@@ -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_CFLAGS = $(AM_CFLAGS)
libandroid_native_window_plugin_la_LIBADD = $(LIBDL) 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_display_plugin_la_SOURCES = video_output/android/display.c \
libandroid_window_plugin_la_CFLAGS = $(AM_CFLAGS) video_output/android/display.h \
libandroid_window_plugin_la_LIBADD = $(LIBDL) video_output/android/utils.c video_output/android/utils.h
libandroid_window_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS)
libandroid_display_plugin_la_LIBADD = $(LIBDL)
if HAVE_ANDROID if HAVE_ANDROID
vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_window_plugin.la vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_display_plugin.la
vout_LTLIBRARIES += $(LTLIBandroid_window)
if HAVE_EGL if HAVE_EGL
vout_LTLIBRARIES += libegl_android_plugin.la vout_LTLIBRARIES += libegl_android_plugin.la
endif endif
......
/***************************************************************************** /*****************************************************************************
* android_window.c: Android video output module * display.c: Android video output module
***************************************************************************** *****************************************************************************
* Copyright (C) 2014 VLC authors and VideoLAN * Copyright (C) 2014 VLC authors and VideoLAN
* *
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include "android_window.h" #include "display.h"
#include "utils.h" #include "utils.h"
/***************************************************************************** /*****************************************************************************
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define CHROMA_LONGTEXT N_(\ #define CHROMA_LONGTEXT N_(\
"Force use of a specific chroma for output. Default is RGB32.") "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 int Open (vlc_object_t *);
static void Close(vlc_object_t *); static void Close(vlc_object_t *);
static void SubpicturePrepare(vout_display_t *vd, subpicture_t *subpicture); static void SubpicturePrepare(vout_display_t *vd, subpicture_t *subpicture);
...@@ -55,10 +55,9 @@ 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() vlc_module_begin()
set_category(CAT_VIDEO) set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT) set_subcategory(SUBCAT_VIDEO_VOUT)
set_shortname("android_window")
set_description(N_("Android video output")) set_description(N_("Android video output"))
set_capability("vout display", 260) set_capability("vout display", 260)
add_shortcut("androidwindow", "android") add_shortcut("android-display")
add_string(CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true) add_string(CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
set_callbacks(Open, Close) set_callbacks(Open, Close)
vlc_module_end() vlc_module_end()
...@@ -67,7 +66,7 @@ vlc_module_end() ...@@ -67,7 +66,7 @@ vlc_module_end()
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
#define THREAD_NAME "android_window" #define THREAD_NAME "android-display"
static const vlc_fourcc_t subpicture_chromas[] = static const vlc_fourcc_t subpicture_chromas[] =
{ {
...@@ -1129,7 +1128,7 @@ static int Control(vout_display_t *vd, int query, va_list args) ...@@ -1129,7 +1128,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
return VLC_SUCCESS; return VLC_SUCCESS;
} }
default: 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_ZOOM:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
return VLC_EGENERIC; return VLC_EGENERIC;
......
/***************************************************************************** /*****************************************************************************
* android_window.c: Android video output module * display.h: Android video output module
***************************************************************************** *****************************************************************************
* Copyright (C) 2014 VLC authors and VideoLAN * Copyright (C) 2014 VLC authors and VideoLAN
* *
......
...@@ -1140,7 +1140,7 @@ modules/video_filter/transform.c ...@@ -1140,7 +1140,7 @@ modules/video_filter/transform.c
modules/video_filter/vhs.c modules/video_filter/vhs.c
modules/video_filter/wave.c modules/video_filter/wave.c
modules/video_output/aa.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/android/nativewindow.c
modules/video_output/caca.c modules/video_output/caca.c
modules/video_output/caopengllayer.m modules/video_output/caopengllayer.m
......
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