Sergey Sharybin
ed2ddc9f70
This commit makes it so CameraIntrinsics is no longer hardcoded to use the traditional polynomial radial distortion model. Currently the distortion code has generic logic which is shared between different distortion models, but had no other models until now. This moves everything specific to the polynomial radial distortion to a subclass PolynomialDistortionCameraIntrinsics(), and adds a new division distortion model suitable for cameras such as the GoPro which have much stronger distortion due to their fisheye lens. This also cleans up the internal API of CameraIntrinsics to make it easier to understand and reduces old C-style code. New distortion model is available in the Lens panel of MCE. - Polynomial is the old well-known model - Division is the new one which s intended to deal better with huge distortion. Coefficients of this model works independent from each other and for division model one probably want to have positive values to have a barrel distortion.
99 lines
3.8 KiB
C++
99 lines
3.8 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU 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.
|
|
*
|
|
* The Original Code is Copyright (C) 2011 Blender Foundation.
|
|
* All rights reserved.
|
|
*
|
|
* Contributor(s): Blender Foundation,
|
|
* Sergey Sharybin
|
|
* Keir Mierle
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/blenkernel/tracking_private.h
|
|
* \ingroup bke
|
|
*
|
|
* This file contains declarations of function which are used
|
|
* by multiple tracking files but which should not be public.
|
|
*/
|
|
|
|
#ifndef __TRACKING_PRIVATE_H__
|
|
#define __TRACKING_PRIVATE_H__
|
|
|
|
#include "BLI_threads.h"
|
|
|
|
struct GHash;
|
|
struct MovieTracking;
|
|
struct MovieTrackingMarker;
|
|
|
|
struct libmv_CameraIntrinsicsOptions;
|
|
|
|
/*********************** Tracks map *************************/
|
|
|
|
typedef struct TracksMap {
|
|
char object_name[MAX_NAME];
|
|
bool is_camera;
|
|
|
|
int num_tracks;
|
|
int customdata_size;
|
|
|
|
char *customdata;
|
|
MovieTrackingTrack *tracks;
|
|
|
|
struct GHash *hash;
|
|
|
|
int ptr;
|
|
|
|
/* Spin lock is used to sync context during tracking. */
|
|
SpinLock spin_lock;
|
|
} TracksMap;
|
|
|
|
struct TracksMap *tracks_map_new(const char *object_name, bool is_camera, int num_tracks, int customdata_size);
|
|
int tracks_map_get_size(struct TracksMap *map);
|
|
void tracks_map_get_indexed_element(struct TracksMap *map, int index, struct MovieTrackingTrack **track, void **customdata);
|
|
void tracks_map_insert(struct TracksMap *map, struct MovieTrackingTrack *track, void *customdata);
|
|
void tracks_map_free(struct TracksMap *map, void (*customdata_free)(void *customdata));
|
|
void tracks_map_merge(struct TracksMap *map, struct MovieTracking *tracking);
|
|
|
|
/*********************** Space transformation functions *************************/
|
|
|
|
void tracking_get_search_origin_frame_pixel(int frame_width, int frame_height,
|
|
const struct MovieTrackingMarker *marker,
|
|
float frame_pixel[2]);
|
|
|
|
void tracking_get_marker_coords_for_tracking(int frame_width, int frame_height,
|
|
const struct MovieTrackingMarker *marker,
|
|
double search_pixel_x[5], double search_pixel_y[5]);
|
|
|
|
void tracking_set_marker_coords_from_tracking(int frame_width, int frame_height, struct MovieTrackingMarker *marker,
|
|
const double search_pixel_x[5], const double search_pixel_y[5]);
|
|
|
|
/*********************** General purpose utility functions *************************/
|
|
|
|
void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker,
|
|
bool before, bool overwrite);
|
|
|
|
void tracking_cameraIntrinscisOptionsFromTracking(struct MovieTracking *tracking,
|
|
int calibration_width, int calibration_height,
|
|
struct libmv_CameraIntrinsicsOptions *camera_intrinsics_options);
|
|
|
|
void tracking_trackingCameraFromIntrinscisOptions(struct MovieTracking *tracking,
|
|
const struct libmv_CameraIntrinsicsOptions *camera_intrinsics_options);
|
|
|
|
#endif /* __TRACKING_PRIVATE_H__ */
|