Commit e61dee00 authored by Thomas Guillem's avatar Thomas Guillem

core: move viewpoint to vlc_viewpoint.h

parent e89ca614
......@@ -27,6 +27,7 @@
#include <vlc_common.h>
#include <vlc_fourcc.h>
#include <vlc_text_style.h>
#include <vlc_viewpoint.h>
/**
* \file
......@@ -314,10 +315,6 @@ typedef enum video_chroma_location_t
CHROMA_LOCATION_BOTTOM_CENTER,
} video_chroma_location_t;
#define FIELD_OF_VIEW_DEGREES_DEFAULT 80.f
#define FIELD_OF_VIEW_DEGREES_MAX 150.f
#define FIELD_OF_VIEW_DEGREES_MIN 20.f
/**
* video format description
*/
......
/*****************************************************************************
* vlc_viewpoint.h: viewpoint struct and helpers
*****************************************************************************
* Copyright (C) 2017 VLC authors and VideoLAN
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef VLC_VIEWPOINT_H_
#define VLC_VIEWPOINT_H_ 1
#include <vlc_common.h>
/**
* \defgroup output Output
* \ingroup output
*
* @{
* \file
* Video and audio viewpoint struct and helpers
*/
#define FIELD_OF_VIEW_DEGREES_DEFAULT 80.f
#define FIELD_OF_VIEW_DEGREES_MAX 150.f
#define FIELD_OF_VIEW_DEGREES_MIN 20.f
/**
* Viewpoints
*/
struct vlc_viewpoint_t {
float yaw; /* yaw in degrees */
float pitch; /* pitch in degrees */
float roll; /* roll in degrees */
float fov; /* field of view in degrees */
};
static inline void vlc_viewpoint_init( vlc_viewpoint_t *p_vp )
{
p_vp->yaw = p_vp->pitch = p_vp->roll = 0.0f;
p_vp->fov = FIELD_OF_VIEW_DEGREES_DEFAULT;
}
/**@}*/
#endif /* VLC_VIEWPOINT_H_ */
......@@ -82,22 +82,6 @@ struct vout_thread_t {
#define VOUT_ALIGN_BOTTOM 0x0008
#define VOUT_ALIGN_VMASK 0x000C
/**
* Viewpoints
*/
struct vlc_viewpoint_t {
float yaw; /* yaw in degrees */
float pitch; /* pitch in degrees */
float roll; /* roll in degrees */
float fov; /* field of view in degrees */
};
static inline void vlc_viewpoint_init( vlc_viewpoint_t *p_vp )
{
p_vp->yaw = p_vp->pitch = p_vp->roll = 0.0f;
p_vp->fov = FIELD_OF_VIEW_DEGREES_DEFAULT;
}
/*****************************************************************************
* Prototypes
*****************************************************************************/
......
......@@ -32,6 +32,7 @@
#include <vlc_mouse.h>
#include <vlc_vout.h>
#include <vlc_vout_window.h>
#include <vlc_viewpoint.h>
/**
* \defgroup video_display Video output display
......
......@@ -32,7 +32,7 @@
#include <vlc/vlc.h>
#include <vlc/libvlc_media.h>
#include <vlc_input.h>
#include <vlc_vout.h>
#include <vlc_viewpoint.h>
#include "../modules/audio_filter/equalizer_presets.h"
......
......@@ -34,7 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_filter.h>
#include <vlc_vout.h>
#include <vlc_viewpoint.h>
#include <vlc_keys.h>
#include <new>
......
......@@ -36,7 +36,7 @@
#include <vlc_interface.h>
#include <vlc_input.h>
#include <vlc_aout.h>
#include <vlc_vout.h>
#include <vlc_viewpoint.h>
#include <vlc_vout_osd.h>
#include <vlc_playlist.h>
#include <vlc_keys.h>
......
......@@ -38,6 +38,7 @@
#include <vlc_opengl.h>
#include <vlc_memory.h>
#include <vlc_vout.h>
#include <vlc_viewpoint.h>
#include "vout_helper.h"
#include "internal.h"
......
......@@ -95,6 +95,7 @@ pluginsinclude_HEADERS = \
../include/vlc_tls.h \
../include/vlc_url.h \
../include/vlc_variables.h \
../include/vlc_viewpoint.h \
../include/vlc_vlm.h \
../include/vlc_video_splitter.h \
../include/vlc_vout.h \
......
......@@ -25,7 +25,7 @@
# define LIBVLC_AOUT_INTERNAL_H 1
# include <vlc_atomic.h>
# include <vlc_vout.h> /* for vlc_viewpoint_t */
# include <vlc_viewpoint.h>
/* Max input rate factor (1/4 -> 4) */
# define AOUT_MAX_INPUT_RATE (4)
......
......@@ -29,7 +29,7 @@
#include <vlc_access.h>
#include <vlc_demux.h>
#include <vlc_input.h>
#include <vlc_vout.h>
#include <vlc_viewpoint.h>
#include <libvlc.h>
#include "input_interface.h"
#include "misc/interrupt.h"
......
......@@ -25,6 +25,7 @@
#define LIBVLC_VOUT_INTERNAL_CONTROL_H
#include <vlc_vout_window.h>
#include <vlc_viewpoint.h>
/* */
enum {
......
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