Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-02-03 10:31:39 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-02-03 10:39:37 +0300
commit9ab7482657aa6a5b968c894be37a2d16aa301293 (patch)
tree7a4017bd70effcf0c872568c42a0f5d9d56bbdc0
parent31776d8a6703772a2d8f3e1852601e60545b939c (diff)
Imbuf: remove libredcode
D1751, remove this library since its quite a specific - only supports an older version of this codec. Also ffmpeg has added support for recent versions of the codec.
-rw-r--r--CMakeLists.txt13
-rw-r--r--build_files/cmake/config/blender_full.cmake1
-rw-r--r--build_files/cmake/config/blender_lite.cmake1
-rw-r--r--extern/CMakeLists.txt4
-rw-r--r--extern/libredcode/AUTHOR1
-rw-r--r--extern/libredcode/CMakeLists.txt46
-rw-r--r--extern/libredcode/LICENSE340
-rw-r--r--extern/libredcode/NOTES23
-rw-r--r--extern/libredcode/codec.c166
-rw-r--r--extern/libredcode/codec.h56
-rw-r--r--extern/libredcode/debayer.c145
-rw-r--r--extern/libredcode/debayer.h33
-rw-r--r--extern/libredcode/format.c248
-rw-r--r--extern/libredcode/format.h46
-rw-r--r--source/blender/imbuf/CMakeLists.txt7
-rw-r--r--source/blender/imbuf/intern/IMB_anim.h9
-rw-r--r--source/blender/imbuf/intern/anim_movie.c83
-rw-r--r--source/blender/imbuf/intern/util.c16
-rw-r--r--source/blender/python/intern/CMakeLists.txt4
-rw-r--r--source/blender/python/intern/bpy_app_build_options.c7
20 files changed, 0 insertions, 1249 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0cd1941b49..69e5359e23d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,6 @@ option_defaults_init(
_init_CODEC_FFMPEG
_init_CYCLES_OSL
_init_IMAGE_OPENEXR
- _init_IMAGE_REDCODE
_init_INPUT_NDOF
_init_JACK
_init_OPENCOLLADA
@@ -173,7 +172,6 @@ if (UNIX AND NOT APPLE)
set(_init_CODEC_FFMPEG OFF)
set(_init_CYCLES_OSL OFF)
set(_init_IMAGE_OPENEXR OFF)
- set(_init_IMAGE_REDCODE OFF)
set(_init_INPUT_NDOF OFF)
set(_init_JACK OFF)
set(_init_OPENCOLLADA OFF)
@@ -309,7 +307,6 @@ option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
option(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
-option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" ${_init_IMAGE_REDCODE})
option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
@@ -632,10 +629,6 @@ if(NOT WITH_SDL AND WITH_GHOST_SDL)
message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
endif()
-if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
- message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
-endif()
-
# python module, needs some different options
if(WITH_PYTHON_MODULE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PLAYER to be OFF")
@@ -2364,11 +2357,6 @@ if(WITH_IMAGE_OPENJPEG)
endif()
endif()
-if(WITH_IMAGE_REDCODE)
- set(REDCODE ${CMAKE_SOURCE_DIR}/extern)
- set(REDCODE_INC ${REDCODE})
-endif()
-
if(NOT WITH_SYSTEM_EIGEN3)
set(EIGEN3_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/Eigen3)
endif()
@@ -3037,7 +3025,6 @@ if(FIRST_RUN)
info_cfg_option(WITH_IMAGE_HDR)
info_cfg_option(WITH_IMAGE_OPENEXR)
info_cfg_option(WITH_IMAGE_OPENJPEG)
- info_cfg_option(WITH_IMAGE_REDCODE)
info_cfg_option(WITH_IMAGE_TIFF)
info_cfg_text("Audio:")
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 5903eb9b3a8..9ef71f85566 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -26,7 +26,6 @@ set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_REDCODE ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_TIFF ON CACHE BOOL "" FORCE)
set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE)
set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index a479506d0d7..8cd2beb6a3a 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -29,7 +29,6 @@ set(WITH_IMAGE_FRAMESERVER OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_HDR OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENEXR OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENJPEG OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_REDCODE OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_TIFF OFF CACHE BOOL "" FORCE)
set(WITH_INPUT_NDOF OFF CACHE BOOL "" FORCE)
set(WITH_INTERNATIONAL OFF CACHE BOOL "" FORCE)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 82b13cc114b..1cce7dc24cc 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -60,10 +60,6 @@ if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG))
add_subdirectory(libopenjpeg)
endif()
-if(WITH_IMAGE_REDCODE)
- add_subdirectory(libredcode)
-endif()
-
if(WITH_LZO AND NOT WITH_SYSTEM_LZO)
add_subdirectory(lzo)
endif()
diff --git a/extern/libredcode/AUTHOR b/extern/libredcode/AUTHOR
deleted file mode 100644
index b3d20a4eb7a..00000000000
--- a/extern/libredcode/AUTHOR
+++ /dev/null
@@ -1 +0,0 @@
-Peter Schlaile * peter at schlaile dot de
diff --git a/extern/libredcode/CMakeLists.txt b/extern/libredcode/CMakeLists.txt
deleted file mode 100644
index c75523741ea..00000000000
--- a/extern/libredcode/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# ***** 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) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
- .
-)
-
-set(INC_SYS
- ../libopenjpeg
-)
-
-set(SRC
- codec.c
- debayer.c
- format.c
-
- codec.h
- debayer.h
- format.h
-)
-
-add_definitions(${OPENJPEG_DEFINES})
-
-blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libredcode/LICENSE b/extern/libredcode/LICENSE
deleted file mode 100644
index 14db8fc79db..00000000000
--- a/extern/libredcode/LICENSE
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/extern/libredcode/NOTES b/extern/libredcode/NOTES
deleted file mode 100644
index 39101e0bd63..00000000000
--- a/extern/libredcode/NOTES
+++ /dev/null
@@ -1,23 +0,0 @@
-This is a redcode decoder written solely by looking at some
-R3D files that are floating around on the web.
-
-This decoder works with the files I tested, but I don't give
-any guarantee (especially, if RED decides to change the
-file format).
-
-That said: I found it a really nice idea of them, to make
-such a clear and comprehensible file layout.
-
-Choosing JPEG2000 as an encoding format and the way, they
-did YCbCr encoding of the sensor data is simply brilliant.
-
-My approach of decoding the sensor data is probably not
-so brilliant, but seems to work rather nicely (and sharply!).
-
-If someone finds a better way and/or RED decides to release
-specification, just go ahead and feel free to change it!
-
-Until that happens: simply enjoy opening RED footage within Blender!
-
--- Peter Schlaile, June 2008
-
diff --git a/extern/libredcode/codec.c b/extern/libredcode/codec.c
deleted file mode 100644
index 70c875ca991..00000000000
--- a/extern/libredcode/codec.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ***** BEGIN GPL LICENSE BLOCK *****
- *
- * Copyright 2008 Peter Schlaile
- *
- * This file is part of libredcode.
- *
- * Libredcode 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.
- *
- * Libredcode 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 libredcode; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#include "codec.h"
-#include "format.h"
-#include "debayer.h"
-
-#include <openjpeg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-static void error_callback(const char *msg, void *client_data)
-{
- FILE *stream = (FILE*)client_data;
- fprintf(stream, "[R3D ERR] %s", msg);
-}
-
-static void warning_callback(const char *msg, void *client_data)
-{
- FILE *stream = (FILE*)client_data;
- fprintf(stream, "[R3D WARN] %s", msg);
-}
-
-static void info_callback(const char *msg, void *client_data)
-{
- (void)client_data;
- fprintf(stdout, "[R3D INFO] %s", msg);
-}
-
-#define J2K_CFMT 0
-#define JP2_CFMT 1
-#define JPT_CFMT 2
-
-struct redcode_frame_raw * redcode_decode_video_raw(
- struct redcode_frame * frame, int scale)
-{
- struct redcode_frame_raw * rv = NULL;
- opj_dparameters_t parameters; /* decompression parameters */
- opj_event_mgr_t event_mgr; /* event manager */
- opj_image_t *image = NULL;
- opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
- opj_cio_t *cio = NULL;
-
- memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
- event_mgr.error_handler = error_callback;
- event_mgr.warning_handler = warning_callback;
- event_mgr.info_handler = info_callback;
-
- opj_set_default_decoder_parameters(&parameters);
-
- parameters.decod_format = JP2_CFMT;
-
- if (scale == 2) {
- parameters.cp_reduce = 1;
- } else if (scale == 4) {
- parameters.cp_reduce = 2;
- } else if (scale == 8) {
- parameters.cp_reduce = 3;
- }
-
- /* JPEG 2000 compressed image data */
-
- /* get a decoder handle */
- dinfo = opj_create_decompress(CODEC_JP2);
-
- /* catch events using our callbacks and give a local context */
- opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
-
- /* setup the decoder decoding parameters using the current image
- and user parameters */
- opj_setup_decoder(dinfo, &parameters);
-
- /* open a byte stream */
- cio = opj_cio_open((opj_common_ptr)dinfo,
- frame->data + frame->offset, frame->length);
-
- image = opj_decode(dinfo, cio);
-
- if(!image) {
- fprintf(stderr,
- "ERROR -> j2k_to_image: failed to decode image!\n");
- opj_destroy_decompress(dinfo);
- opj_cio_close(cio);
- return 0;
- }
-
- /* close the byte stream */
- opj_cio_close(cio);
-
- /* free remaining structures */
- if(dinfo) {
- opj_destroy_decompress(dinfo);
- }
-
- if((image->numcomps * image->x1 * image->y1) == 0) {
- opj_image_destroy(image);
- return 0;
- }
-
- rv = (struct redcode_frame_raw *) calloc(
- 1, sizeof(struct redcode_frame_raw));
-
- rv->data = image;
- rv->width = image->comps[0].w;
- rv->height = image->comps[0].h;
-
- return rv;
-}
-
-int redcode_decode_video_float(struct redcode_frame_raw * frame,
- float * out, int scale)
-{
- int* planes[4];
- int i;
- opj_image_t *image = (opj_image_t*) frame->data;
-
- if (image->numcomps != 4) {
- fprintf(stderr, "R3D: need 4 planes, but got: %d\n",
- image->numcomps);
- return 0;
- }
-
- for (i = 0; i < 4; i++) {
- planes[i] = image->comps[i].data;
- }
-
- if (scale == 1) {
- redcode_ycbcr2rgb_fullscale(
- planes, frame->width, frame->height, out);
- } else if (scale == 2) {
- redcode_ycbcr2rgb_halfscale(
- planes, frame->width, frame->height, out);
- } else if (scale == 4) {
- redcode_ycbcr2rgb_quarterscale(
- planes, frame->width, frame->height, out);
- }
-
- opj_image_destroy(image);
-
- free(frame);
-
- return 1;
-}
-
-
-
diff --git a/extern/libredcode/codec.h b/extern/libredcode/codec.h
deleted file mode 100644
index 6f7092672ee..00000000000
--- a/extern/libredcode/codec.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** BEGIN GPL LICENSE BLOCK *****
- *
- * Copyright 2008 Peter Schlaile
- *
- * This file is part of libredcode.
- *
- * Libredcode 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.
- *
- * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#ifndef __CODEC_H__
-#define __CODEC_H__
-
-struct redcode_frame;
-
-struct redcode_frame_raw {
- void * data;
- int width;
- int height;
-};
-
-/* do the JPEG2000 decompression into YCbCrY planes */
-struct redcode_frame_raw * redcode_decode_video_raw(
- struct redcode_frame * frame, int scale);
-
-/* finally decode RAW frame into out-buffer (which has to be allocated
- in advance)
-
- Keep in mind: frame_raw-width + height is half sized.
- (one pixel contains 2x2 bayer-sensor data)
-
- output-buffer should have room for
-
- scale = 1 : width * height * 4 * 4 * sizeof(float)
- scale = 2 : width * height * 4 * sizeof(float)
- scale = 4 : width * height * sizeof(float)
-
-*/
-
-int redcode_decode_video_float(struct redcode_frame_raw * frame,
- float * out, int scale);
-
-
-#endif
diff --git a/extern/libredcode/debayer.c b/extern/libredcode/debayer.c
deleted file mode 100644
index a236fed1749..00000000000
--- a/extern/libredcode/debayer.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ***** BEGIN GPL LICENSE BLOCK *****
- *
- * Copyright 2008 Peter Schlaile
- *
- * This file is part of libredcode.
- *
- * Libredcode 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.
- *
- * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#include "debayer.h"
-
-/* pretty simple but astonishingly very effective "debayer" function
- */
-
-void redcode_ycbcr2rgb_fullscale(
- int ** planes, int width, int height, float * out)
-{
- int x,y;
- int pix_max = 4096;
- int mask = pix_max - 1;
- float *o;
-
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- int i = x + y*width;
- int i_p = (y > 0) ? i-width : i;
- int i_n = (y < (height-1)) ? i + width : i;
- float y1n = planes[0][i_n] & mask;
- float y1 = planes[0][i] & mask;
- float cb = (planes[1][i] & mask) - pix_max/2;
- float cr = (planes[2][i] & mask) - pix_max/2;
- float y2 = (planes[3][i] & mask);
- float y2p = (planes[3][i_p] & mask);
-
- float b_ = cb /(pix_max/2);
- float r_ = cr /(pix_max/2);
- float g_ = 0.0;
-
- float y_[4] = {y1 / pix_max,
- (y2 + y2p)/2 / pix_max,
- (y1 + y1n)/2 / pix_max,
- y2 / pix_max};
-
- int j;
- int yc = 0;
-
- o = out + (2*height-1-2*y)*2*4*width
- + x*2*4;
-
- for (j = 0; j < 8; j += 4) {
- o[j+0] = r_ + y_[yc];
- o[j+1] = g_ + y_[yc];
- o[j+2] = b_ + y_[yc];
- o[j+3] = 1.0;
- yc++;
- }
-
- o = out + (2*height-1-2*y)*2*4*width
- + x*2*4 - 2*4*width;
-
- for (j = 0; j < 8; j += 4) {
- o[j+0] = r_ + y_[yc];
- o[j+1] = g_ + y_[yc];
- o[j+2] = b_ + y_[yc];
- o[j+3] = 1.0;
- yc++;
- }
- }
- }
-}
-
-void redcode_ycbcr2rgb_halfscale(
- int ** planes, int width, int height, float * out)
-{
- int x,y;
- int pix_max = 4096;
- int mask = pix_max - 1;
-
- for (y = 0; y < height; y++) {
- float *o = out + width * (height - y - 1);
- for (x = 0; x < width; x++) {
- int i = y*height + x;
- float y1 = (planes[0][i] & mask);
- float cb = (planes[1][i] & mask) - pix_max/2;
- float cr = (planes[2][i] & mask) - pix_max/2;
- float y2 = (planes[3][i] & mask);
-
- float b_ = cb /(pix_max/2);
- float r_ = cr /(pix_max/2);
- float g_ = 0.0;
-
- float y = (y1 + y2)/2 / pix_max;
-
- *o++ = r_ + y;
- *o++ = g_ + y;
- *o++ = b_ + y;
- *o++ = 1.0;
- }
- }
-}
-
-
-void redcode_ycbcr2rgb_quarterscale(
- int ** planes, int width, int height, float * out)
-{
- int x,y;
- int pix_max = 4096;
- int mask = pix_max - 1;
-
- for (y = 0; y < height; y += 2) {
- float *o = out + (width/2) * (height/2 - y/2 - 1);
- for (x = 0; x < width; x += 2) {
- int i = y * width + x;
- float y1 = planes[0][i] & mask;
- float cb = (planes[1][i] & mask) - pix_max/2;
- float cr = (planes[2][i] & mask) - pix_max/2;
- float y2 = planes[3][i] & mask;
-
- float b_ = cb /(pix_max/2);
- float r_ = cr /(pix_max/2);
- float g_ = 0.0;
-
- float y = (y1 + y2)/2 / pix_max;
-
- *o++ = r_ + y;
- *o++ = g_ + y;
- *o++ = b_ + y;
- *o++ = 1.0;
- }
- }
-}
-
diff --git a/extern/libredcode/debayer.h b/extern/libredcode/debayer.h
deleted file mode 100644
index 31f3dd01fea..00000000000
--- a/extern/libredcode/debayer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ***** BEGIN GPL LICENSE BLOCK *****
- *
- * Copyright 2008 Peter Schlaile
- *
- * This file is part of libredcode.
- *
- * Libredcode 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.
- *
- * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#ifndef __DEBAYER_H__
-#define __DEBAYER_H__
-
-void redcode_ycbcr2rgb_fullscale(
- int ** planes, int width, int height, float * out);
-void redcode_ycbcr2rgb_halfscale(
- int ** planes, int width, int height, float * out);
-void redcode_ycbcr2rgb_quarterscale(
- int ** planes, int width, int height, float * out);
-
-#endif
diff --git a/extern/libredcode/format.c b/extern/libredcode/format.c
deleted file mode 100644
index 9a3023fa2c0..00000000000
--- a/extern/libredcode/format.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* ***** BEGIN GPL LICENSE BLOCK *****
- *
- * Copyright 2008 Peter Schlaile
- *
- * This file is part of libredcode.
- *
- * Libredcode 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.
- *
- * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "format.h"
-
-struct red_reob {
- unsigned int len;
- unsigned int head;
-
- unsigned int rdvo;
- unsigned int rdvs;
- unsigned int rdao;
- unsigned int rdas;
-
- unsigned int unknown1;
- unsigned int unknown2;
- unsigned int totlen;
-
- unsigned int avgv;
- unsigned int avgs;
-
- unsigned int unknown3;
- unsigned int unknown4;
- unsigned int unknown5;
-};
-
-struct redcode_handle {
- FILE * fp;
- struct red_reob * reob;
- unsigned int * rdvo;
- unsigned int * rdvs;
- unsigned int * rdao;
- unsigned int * rdas;
- long cfra;
- long length;
-};
-
-unsigned int read_be32(unsigned int val)
-{
- unsigned char * v = (unsigned char*) & val;
-
- return (v[0] << 24) | (v[1] << 16) | (v[2] << 8) | v[3];
-}
-
-static unsigned char* read_packet(FILE * fp, char * expect)
-{
- unsigned int len;
- char head[5];
- unsigned char * rv;
-
- fread(&len, 4, 1, fp);
- fread(&head, 4, 1, fp);
-
- head[4] = 0;
-
- len = read_be32(len);
-
- if (strcmp(expect, head) != 0) {
- /* fprintf(stderr, "Read: %s, expect: %s\n", head, expect); */
- return NULL;
- }
-
- rv = (unsigned char*) malloc(len + 8);
-
- memcpy(rv, &len, 4);
- memcpy(rv + 4, &head, 4);
-
- fread(rv + 8, len, 1, fp);
-
- return rv;
-}
-
-static unsigned int * read_index_packet(FILE * fp, char * expect)
-{
- unsigned int * rv = (unsigned int*) read_packet(fp, expect);
- int i;
-
- if (!rv) {
- return NULL;
- }
-
- for (i = 2; i < rv[0]/4; i++) {
- rv[i] = read_be32(rv[i]);
- }
- return rv;
-}
-
-static struct red_reob * read_reob(FILE * fp)
-{
- fseek(fp, -0x38, SEEK_END);
-
- return (struct red_reob *) read_index_packet(fp, "REOB");
-}
-
-static unsigned int * read_index(FILE * fp, unsigned int i, char * expect)
-{
- fseek(fp, i, SEEK_SET);
-
- return (unsigned int*) read_index_packet(fp, expect);
-}
-
-static unsigned char * read_data(FILE * fp, unsigned int i, char * expect)
-{
- fseek(fp, i, SEEK_SET);
-
- return read_packet(fp, expect);
-}
-
-struct redcode_handle * redcode_open(const char * fname)
-{
- struct redcode_handle * rv = NULL;
- struct red_reob * reob = NULL;
- int i;
-
- FILE * fp = fopen(fname, "rb");
-
- if (!fp) {
- return NULL;
- }
-
- reob = read_reob(fp);
- if (!reob) {
- fclose(fp);
- return NULL;
- }
-
- rv = (struct redcode_handle*) calloc(1, sizeof(struct redcode_handle));
-
- rv->fp = fp;
- rv->reob = reob;
- rv->rdvo = read_index(fp, reob->rdvo, "RDVO");
- rv->rdvs = read_index(fp, reob->rdvs, "RDVS");
- rv->rdao = read_index(fp, reob->rdao, "RDAO");
- rv->rdas = read_index(fp, reob->rdas, "RDAS");
-
- if (!rv->rdvo || !rv->rdvs || !rv->rdao || !rv->rdas) {
- redcode_close(rv);
- return NULL;
- }
-
- for (i = 0; i < (rv->rdvo[0] - 8)/4; i++) {
- if (rv->rdvo[i + 2]) {
- rv->length = i;
- }
- }
-
- return rv;
-}
-
-void redcode_close(struct redcode_handle * handle)
-{
- if (handle->reob) {
- free(handle->reob);
- }
- if (handle->rdvo) {
- free(handle->rdvo);
- }
- if (handle->rdvs) {
- free(handle->rdvs);
- }
- if (handle->rdao) {
- free(handle->rdao);
- }
- if (handle->rdas) {
- free(handle->rdas);
- }
- fclose(handle->fp);
- free(handle);
-}
-
-long redcode_get_length(struct redcode_handle * handle)
-{
- return handle->length;
-}
-
-struct redcode_frame * redcode_read_video_frame(
- struct redcode_handle * handle, long frame)
-{
- struct redcode_frame * rv;
- unsigned char * data;
-
- if (frame > handle->rdvo[0]/4 || handle->rdvo[frame + 2] == 0) {
- return NULL;
- }
- data = read_data(handle->fp, handle->rdvo[frame + 2], "REDV");
- if (!data) {
- return NULL;
- }
-
- rv = (struct redcode_frame*) calloc(1, sizeof(struct redcode_frame));
-
- rv->offset = 12+8;
- rv->length = *(unsigned int*)data - rv->offset;
- rv->data = data;
-
- return rv;
-}
-
-struct redcode_frame * redcode_read_audio_frame(
- struct redcode_handle * handle, long frame)
-{
- struct redcode_frame * rv;
- unsigned char * data;
-
- if (frame > handle->rdao[0]/4 || handle->rdao[frame + 2] == 0) {
- return NULL;
- }
- data = read_data(handle->fp, handle->rdao[frame+2], "REDA");
- if (!data) {
- return NULL;
- }
-
- rv = (struct redcode_frame*) calloc(1, sizeof(struct redcode_frame));
-
- rv->offset = 24+8;
- rv->length = *(unsigned int*)data - rv->offset;
- rv->data = data;
-
- return rv;
-}
-
-void redcode_free_frame(struct redcode_frame * frame)
-{
- free(frame->data);
- free(frame);
-}
diff --git a/extern/libredcode/format.h b/extern/libredcode/format.h
deleted file mode 100644
index 473a2b1a8d9..00000000000
--- a/extern/libredcode/format.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ***** BEGIN GPL LICENSE BLOCK *****
- *
- * Copyright 2008 Peter Schlaile
- *
- * This file is part of libredcode.
- *
- * Libredcode 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.
- *
- * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#ifndef __FORMAT_H__
-#define __FORMAT_H__
-
-struct redcode_handle;
-struct redcode_frame {
- unsigned int length;
- unsigned int offset;
- unsigned char * data;
-};
-
-struct redcode_handle * redcode_open(const char * fname);
-void redcode_close(struct redcode_handle * handle);
-
-long redcode_get_length(struct redcode_handle * handle);
-
-struct redcode_frame * redcode_read_video_frame(
- struct redcode_handle * handle, long frame);
-struct redcode_frame * redcode_read_audio_frame(
- struct redcode_handle * handle, long frame);
-
-void redcode_free_frame(struct redcode_frame * frame);
-
-
-#endif
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index abbc5a09040..b32f8c54cd6 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -123,13 +123,6 @@ if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG ${OPENJPEG_DEFINES})
endif()
-if(WITH_IMAGE_REDCODE)
- list(APPEND INC_SYS
- ${REDCODE_INC}
- )
- add_definitions(-DWITH_REDCODE)
-endif()
-
if(WITH_CODEC_AVI)
list(APPEND INC
../avi
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 690ec813407..537cde9ac5c 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -78,10 +78,6 @@
# include <libswscale/swscale.h>
#endif
-#ifdef WITH_REDCODE
-# include "libredcode/format.h"
-#endif
-
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
@@ -111,7 +107,6 @@
#define ANIM_AVI (1 << 6)
#define ANIM_QTIME (1 << 7)
#define ANIM_FFMPEG (1 << 8)
-#define ANIM_REDCODE (1 << 9)
#define MAXNUMSTREAMS 50
@@ -177,10 +172,6 @@ struct anim {
AVPacket next_packet;
#endif
-#ifdef WITH_REDCODE
- struct redcode_handle *redcodeCtx;
-#endif
-
char index_dir[768];
int proxies_tried;
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 4ace72d9fa4..e2da2e46478 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -98,11 +98,6 @@
#endif //WITH_FFMPEG
-#ifdef WITH_REDCODE
-# include "libredcode/format.h"
-# include "libredcode/codec.h"
-#endif
-
#include "IMB_colormanagement.h"
#include "IMB_colormanagement_intern.h"
@@ -216,9 +211,6 @@ static void free_anim_avi(struct anim *anim)
#ifdef WITH_FFMPEG
static void free_anim_ffmpeg(struct anim *anim);
#endif
-#ifdef WITH_REDCODE
-static void free_anim_redcode(struct anim *anim);
-#endif
void IMB_free_anim(struct anim *anim)
{
@@ -239,9 +231,6 @@ void IMB_free_anim(struct anim *anim)
#ifdef WITH_FFMPEG
free_anim_ffmpeg(anim);
#endif
-#ifdef WITH_REDCODE
- free_anim_redcode(anim);
-#endif
IMB_free_indices(anim);
MEM_freeN(anim);
@@ -1164,62 +1153,6 @@ static void free_anim_ffmpeg(struct anim *anim)
#endif
-#ifdef WITH_REDCODE
-
-static int startredcode(struct anim *anim)
-{
- anim->redcodeCtx = redcode_open(anim->name);
- if (!anim->redcodeCtx) {
- return -1;
- }
- anim->duration = redcode_get_length(anim->redcodeCtx);
-
- return 0;
-}
-
-static ImBuf *redcode_fetchibuf(struct anim *anim, int position)
-{
- struct ImBuf *ibuf;
- struct redcode_frame *frame;
- struct redcode_frame_raw *raw_frame;
-
- if (!anim->redcodeCtx) {
- return NULL;
- }
-
- frame = redcode_read_video_frame(anim->redcodeCtx, position);
-
- if (!frame) {
- return NULL;
- }
-
- raw_frame = redcode_decode_video_raw(frame, 1);
-
- redcode_free_frame(frame);
-
- if (!raw_frame) {
- return NULL;
- }
-
- ibuf = IMB_allocImBuf(raw_frame->width * 2,
- raw_frame->height * 2, 32, IB_rectfloat);
-
- redcode_decode_video_float(raw_frame, ibuf->rect_float, 1);
-
- return ibuf;
-}
-
-static void free_anim_redcode(struct anim *anim)
-{
- if (anim->redcodeCtx) {
- redcode_close(anim->redcodeCtx);
- anim->redcodeCtx = 0;
- }
- anim->duration = 0;
-}
-
-#endif
-
/* Try next picture to read */
/* No picture, try to open next animation */
/* Succeed, remove first image from animation */
@@ -1242,10 +1175,6 @@ static ImBuf *anim_getnew(struct anim *anim)
#ifdef WITH_FFMPEG
free_anim_ffmpeg(anim);
#endif
-#ifdef WITH_REDCODE
- free_anim_redcode(anim);
-#endif
-
if (anim->curtype != 0) return (NULL);
anim->curtype = imb_get_anim_type(anim->name);
@@ -1283,12 +1212,6 @@ static ImBuf *anim_getnew(struct anim *anim)
ibuf = IMB_allocImBuf(anim->x, anim->y, 24, 0);
break;
#endif
-#ifdef WITH_REDCODE
- case ANIM_REDCODE:
- if (startredcode(anim)) return (0);
- ibuf = IMB_allocImBuf(8, 8, 32, 0);
- break;
-#endif
}
return(ibuf);
}
@@ -1395,12 +1318,6 @@ struct ImBuf *IMB_anim_absolute(struct anim *anim, int position,
filter_y = 0; /* done internally */
break;
#endif
-#ifdef WITH_REDCODE
- case ANIM_REDCODE:
- ibuf = redcode_fetchibuf(anim, position);
- if (ibuf) anim->curposition = position;
- break;
-#endif
}
if (ibuf) {
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index ca793d04d9b..ba8480b636f 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -373,19 +373,6 @@ static int isffmpeg(const char *filename)
}
#endif
-#ifdef WITH_REDCODE
-static int isredcode(const char *filename)
-{
- struct redcode_handle *h = redcode_open(filename);
- if (!h) {
- return 0;
- }
- redcode_close(h);
- return 1;
-}
-
-#endif
-
int imb_get_anim_type(const char *name)
{
int type;
@@ -424,9 +411,6 @@ int imb_get_anim_type(const char *name)
if (isavi(name)) return (ANIM_AVI);
#endif
-#ifdef WITH_REDCODE
- if (isredcode(name)) return (ANIM_REDCODE);
-#endif
type = IMB_ispic(name);
if (type) {
return ANIM_SEQUENCE;
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 5b39dbb062b..8ce94b8006f 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -199,10 +199,6 @@ if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG)
endif()
-if(WITH_IMAGE_REDCODE)
- add_definitions(-DWITH_REDCODE)
-endif()
-
if(WITH_IMAGE_TIFF)
add_definitions(-DWITH_TIFF)
endif()
diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c
index 692ebf552c7..4c186aab100 100644
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@ -50,7 +50,6 @@ static PyStructSequence_Field app_builtopts_info_fields[] = {
{(char *)"image_hdr", NULL},
{(char *)"image_openexr", NULL},
{(char *)"image_openjpeg", NULL},
- {(char *)"image_redcode", NULL},
{(char *)"image_tiff", NULL},
{(char *)"input_ndof", NULL},
{(char *)"audaspace", NULL},
@@ -190,12 +189,6 @@ static PyObject *make_builtopts_info(void)
SetObjIncref(Py_False);
#endif
-#ifdef WITH_REDCODE
- SetObjIncref(Py_True);
-#else
- SetObjIncref(Py_False);
-#endif
-
#ifdef WITH_TIFF
SetObjIncref(Py_True);
#else