diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-02-03 10:31:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-03 10:39:37 +0300 |
commit | 9ab7482657aa6a5b968c894be37a2d16aa301293 (patch) | |
tree | 7a4017bd70effcf0c872568c42a0f5d9d56bbdc0 /source/blender/imbuf/intern/anim_movie.c | |
parent | 31776d8a6703772a2d8f3e1852601e60545b939c (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.
Diffstat (limited to 'source/blender/imbuf/intern/anim_movie.c')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 83 |
1 files changed, 0 insertions, 83 deletions
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) { |