archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style

Browse Source
This commit is contained in:
Sergey Sharybin
2012-05-07 09:30:15 +00:00
parent f618bada2b
commit 69fc654f94
11 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_writeavi.h
View File

@@ -51,8 +51,8 @@ typedef struct bMovieHandle {
void (*get_movie_path)(char *string, struct RenderData *rd); /* optional */
} bMovieHandle;
bMovieHandle *BKE_get_movie_handle(const char imtype);
void BKE_makeanimstring(char *string, struct RenderData *rd);
bMovieHandle *BKE_movie_handle_get(const char imtype);
void BKE_movie_filepath_get(char *string, struct RenderData *rd);
#ifdef __cplusplus
}

24
source/blender/blenkernel/BKE_writeffmpeg.h
View File

@@ -66,20 +66,20 @@ struct RenderData;
struct ReportList;
struct Scene;
extern int start_ffmpeg(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
extern void end_ffmpeg(void);
extern int append_ffmpeg(struct RenderData *rd, int start_frame, int frame, int *pixels,
int rectx, int recty, struct ReportList *reports);
void filepath_ffmpeg(char* string, struct RenderData* rd);
int BKE_ffmpeg_start(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
void BKE_ffmpeg_end(void);
int BKE_ffmpeg_append(struct RenderData *rd, int start_frame, int frame, int *pixels,
int rectx, int recty, struct ReportList *reports);
void BKE_ffmpeg_filepath_get(char* string, struct RenderData* rd);
extern void ffmpeg_set_preset(struct RenderData *rd, int preset);
extern void ffmpeg_verify_image_type(struct RenderData *rd, struct ImageFormatData *imf);
extern void ffmpeg_verify_codec_settings(struct RenderData *rd);
extern int ffmpeg_alpha_channel_supported(struct RenderData *rd);
void BKE_ffmpeg_preset_set(struct RenderData *rd, int preset);
void BKE_ffmpeg_image_type_verify(struct RenderData *rd, struct ImageFormatData *imf);
void BKE_ffmpeg_codec_settings_verify(struct RenderData *rd);
int BKE_ffmpeg_alpha_channel_is_supported(struct RenderData *rd);
extern struct IDProperty *ffmpeg_property_add(struct RenderData *Rd, const char *type, int opt_index, int parent_index);
extern int ffmpeg_property_add_string(struct RenderData *rd, const char *type, const char *str);
extern void ffmpeg_property_del(struct RenderData *rd, void *type, void *prop_);
struct IDProperty *BKE_ffmpeg_property_add(struct RenderData *Rd, const char *type, int opt_index, int parent_index);
int BKE_ffmpeg_property_add_string(struct RenderData *rd, const char *type, const char *str);
void BKE_ffmpeg_property_del(struct RenderData *rd, void *type, void *prop_);
#ifdef __cplusplus
}

10
source/blender/blenkernel/BKE_writeframeserver.h
View File

@@ -40,11 +40,11 @@ struct RenderData;
struct ReportList;
struct Scene;
extern int start_frameserver(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
extern void end_frameserver(void);
extern int append_frameserver(struct RenderData *rd, int start_frame, int frame, int *pixels,
int rectx, int recty, struct ReportList *reports);
extern int frameserver_loop(struct RenderData *rd, struct ReportList *reports);
int BKE_frameserver_start(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
void BKE_frameserver_end(void);
int BKE_frameserver_append(struct RenderData *rd, int start_frame, int frame, int *pixels,
int rectx, int recty, struct ReportList *reports);
int BKE_frameserver_loop(struct RenderData *rd, struct ReportList *reports);
#ifdef __cplusplus
}

22
source/blender/blenkernel/intern/writeavi.c
View File

@@ -68,7 +68,7 @@ static void filepath_avi(char *string, RenderData *rd);
#include "BKE_writeframeserver.h"
bMovieHandle *BKE_get_movie_handle(const char imtype)
bMovieHandle *BKE_movie_handle_get(const char imtype)
{
static bMovieHandle mh;
@@ -97,18 +97,18 @@ bMovieHandle *BKE_get_movie_handle(const char imtype)
#endif
#ifdef WITH_FFMPEG
if (ELEM4(imtype, R_IMF_IMTYPE_FFMPEG, R_IMF_IMTYPE_H264, R_IMF_IMTYPE_XVID, R_IMF_IMTYPE_THEORA)) {
mh.start_movie = start_ffmpeg;
mh.append_movie = append_ffmpeg;
mh.end_movie = end_ffmpeg;
mh.get_movie_path = filepath_ffmpeg;
mh.start_movie = BKE_ffmpeg_start;
mh.append_movie = BKE_ffmpeg_append;
mh.end_movie = BKE_ffmpeg_end;
mh.get_movie_path = BKE_ffmpeg_filepath_get;
}
#endif
#ifdef WITH_FRAMESERVER
if (imtype == R_IMF_IMTYPE_FRAMESERVER) {
mh.start_movie = start_frameserver;
mh.append_movie = append_frameserver;
mh.end_movie = end_frameserver;
mh.get_next_frame = frameserver_loop;
mh.start_movie = BKE_frameserver_start;
mh.append_movie = BKE_frameserver_append;
mh.end_movie = BKE_frameserver_end;
mh.get_next_frame = BKE_frameserver_loop;
}
#endif
@@ -228,9 +228,9 @@ static void end_avi(void)
}
/* similar to BKE_makepicstring() */
void BKE_makeanimstring(char *string, RenderData *rd)
void BKE_movie_filepath_get(char *string, RenderData *rd)
{
bMovieHandle *mh= BKE_get_movie_handle(rd->im_format.imtype);
bMovieHandle *mh= BKE_movie_handle_get(rd->im_format.imtype);
if (mh->get_movie_path)
mh->get_movie_path(string, rd);
else

86
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -678,7 +678,7 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
do_init_ffmpeg();
/* Determine the correct filename */
filepath_ffmpeg(name, rd);
BKE_ffmpeg_filepath_get(name, rd);
fprintf(stderr, "Starting output to %s(ffmpeg)...\n"
" Using type=%d, codec=%d, audio_codec=%d,\n"
" video_bitrate=%d, audio_bitrate=%d,\n"
@@ -884,7 +884,7 @@ void flush_ffmpeg(void)
* ********************************************************************** */
/* Get the output filename-- similar to the other output formats */
void filepath_ffmpeg(char* string, RenderData* rd)
void BKE_ffmpeg_filepath_get(char* string, RenderData* rd)
{
char autosplit[20];
@@ -925,7 +925,7 @@ void filepath_ffmpeg(char* string, RenderData* rd)
}
}
int start_ffmpeg(struct Scene *scene, RenderData *rd, int rectx, int recty, ReportList *reports)
int BKE_ffmpeg_start(struct Scene *scene, RenderData *rd, int rectx, int recty, ReportList *reports)
{
int success;
@@ -949,7 +949,7 @@ int start_ffmpeg(struct Scene *scene, RenderData *rd, int rectx, int recty, Repo
return success;
}
void end_ffmpeg(void);
void BKE_ffmpeg_end(void);
#ifdef WITH_AUDASPACE
static void write_audio_frames(double to_pts)
@@ -965,7 +965,7 @@ static void write_audio_frames(double to_pts)
}
#endif
int append_ffmpeg(RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports)
int BKE_ffmpeg_append(RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports)
{
AVFrame* avframe;
int success = 1;
@@ -983,7 +983,7 @@ int append_ffmpeg(RenderData *rd, int start_frame, int frame, int *pixels, int r
if (ffmpeg_autosplit) {
if (avio_tell(outfile->pb) > FFMPEG_AUTOSPLIT_SIZE) {
end_ffmpeg();
BKE_ffmpeg_end();
ffmpeg_autosplit_count++;
success &= start_ffmpeg_impl(rd, rectx, recty, reports);
}
@@ -996,7 +996,7 @@ int append_ffmpeg(RenderData *rd, int start_frame, int frame, int *pixels, int r
return success;
}
void end_ffmpeg(void)
void BKE_ffmpeg_end(void)
{
unsigned int i;
@@ -1074,7 +1074,7 @@ void end_ffmpeg(void)
/* properties */
void ffmpeg_property_del(RenderData *rd, void *type, void *prop_)
void BKE_ffmpeg_property_del(RenderData *rd, void *type, void *prop_)
{
struct IDProperty *prop = (struct IDProperty *) prop_;
IDProperty * group;
@@ -1091,7 +1091,7 @@ void ffmpeg_property_del(RenderData *rd, void *type, void *prop_)
}
}
IDProperty *ffmpeg_property_add(RenderData *rd, const char *type, int opt_index, int parent_index)
IDProperty *BKE_ffmpeg_property_add(RenderData *rd, const char *type, int opt_index, int parent_index)
{
AVCodecContext c;
const AVOption * o;
@@ -1184,7 +1184,7 @@ static const AVOption *my_av_find_opt(void *v, const char *name,
return NULL;
}
int ffmpeg_property_add_string(RenderData *rd, const char * type, const char * str)
int BKE_ffmpeg_property_add_string(RenderData *rd, const char * type, const char * str)
{
AVCodecContext c;
const AVOption * o = 0;
@@ -1220,12 +1220,12 @@ int ffmpeg_property_add_string(RenderData *rd, const char * type, const char * s
}
if (param && o->type != FF_OPT_TYPE_CONST && o->unit) {
p = my_av_find_opt(&c, param, o->unit, 0, 0);
prop = ffmpeg_property_add(rd,
prop = BKE_ffmpeg_property_add(rd,
(char*) type, p - c.av_class->option,
o - c.av_class->option);
}
else {
prop = ffmpeg_property_add(rd,
prop = BKE_ffmpeg_property_add(rd,
(char*) type, o - c.av_class->option, 0);
}
@@ -1268,37 +1268,37 @@ static void ffmpeg_set_expert_options(RenderData *rd)
* Use CABAC coder. Using "coder:1", which should be equivalent,
* crashes Blender for some reason. Either way - this is no big deal.
*/
ffmpeg_property_add_string(rd, "video", "coder:vlc");
BKE_ffmpeg_property_add_string(rd, "video", "coder:vlc");
/*
* The other options were taken from the libx264-default.preset
* included in the ffmpeg distribution.
*/
// ffmpeg_property_add_string(rd, "video", "flags:loop"); // this breaks compatibility for QT
ffmpeg_property_add_string(rd, "video", "cmp:chroma");
ffmpeg_property_add_string(rd, "video", "partitions:parti4x4");
ffmpeg_property_add_string(rd, "video", "partitions:partp8x8");
ffmpeg_property_add_string(rd, "video", "partitions:partb8x8");
ffmpeg_property_add_string(rd, "video", "me:hex");
ffmpeg_property_add_string(rd, "video", "subq:6");
ffmpeg_property_add_string(rd, "video", "me_range:16");
ffmpeg_property_add_string(rd, "video", "qdiff:4");
ffmpeg_property_add_string(rd, "video", "keyint_min:25");
ffmpeg_property_add_string(rd, "video", "sc_threshold:40");
ffmpeg_property_add_string(rd, "video", "i_qfactor:0.71");
ffmpeg_property_add_string(rd, "video", "b_strategy:1");
ffmpeg_property_add_string(rd, "video", "bf:3");
ffmpeg_property_add_string(rd, "video", "refs:2");
ffmpeg_property_add_string(rd, "video", "qcomp:0.6");
ffmpeg_property_add_string(rd, "video", "directpred:3");
ffmpeg_property_add_string(rd, "video", "trellis:0");
ffmpeg_property_add_string(rd, "video", "flags2:wpred");
ffmpeg_property_add_string(rd, "video", "flags2:dct8x8");
ffmpeg_property_add_string(rd, "video", "flags2:fastpskip");
ffmpeg_property_add_string(rd, "video", "wpredp:2");
BKE_ffmpeg_property_add_string(rd, "video", "cmp:chroma");
BKE_ffmpeg_property_add_string(rd, "video", "partitions:parti4x4");
BKE_ffmpeg_property_add_string(rd, "video", "partitions:partp8x8");
BKE_ffmpeg_property_add_string(rd, "video", "partitions:partb8x8");
BKE_ffmpeg_property_add_string(rd, "video", "me:hex");
BKE_ffmpeg_property_add_string(rd, "video", "subq:6");
BKE_ffmpeg_property_add_string(rd, "video", "me_range:16");
BKE_ffmpeg_property_add_string(rd, "video", "qdiff:4");
BKE_ffmpeg_property_add_string(rd, "video", "keyint_min:25");
BKE_ffmpeg_property_add_string(rd, "video", "sc_threshold:40");
BKE_ffmpeg_property_add_string(rd, "video", "i_qfactor:0.71");
BKE_ffmpeg_property_add_string(rd, "video", "b_strategy:1");
BKE_ffmpeg_property_add_string(rd, "video", "bf:3");
BKE_ffmpeg_property_add_string(rd, "video", "refs:2");
BKE_ffmpeg_property_add_string(rd, "video", "qcomp:0.6");
BKE_ffmpeg_property_add_string(rd, "video", "directpred:3");
BKE_ffmpeg_property_add_string(rd, "video", "trellis:0");
BKE_ffmpeg_property_add_string(rd, "video", "flags2:wpred");
BKE_ffmpeg_property_add_string(rd, "video", "flags2:dct8x8");
BKE_ffmpeg_property_add_string(rd, "video", "flags2:fastpskip");
BKE_ffmpeg_property_add_string(rd, "video", "wpredp:2");
if (rd->ffcodecdata.flags & FFMPEG_LOSSLESS_OUTPUT)
ffmpeg_property_add_string(rd, "video", "cqp:0");
BKE_ffmpeg_property_add_string(rd, "video", "cqp:0");
}
#if 0 /* disabled for after release */
else if (codec_id == CODEC_ID_DNXHD) {
@@ -1308,7 +1308,7 @@ static void ffmpeg_set_expert_options(RenderData *rd)
#endif
}
void ffmpeg_set_preset(RenderData *rd, int preset)
void BKE_ffmpeg_preset_set(RenderData *rd, int preset)
{
int isntsc = (rd->frs_sec != 25);
@@ -1402,7 +1402,7 @@ void ffmpeg_set_preset(RenderData *rd, int preset)
ffmpeg_set_expert_options(rd);
}
void ffmpeg_verify_image_type(RenderData *rd, ImageFormatData *imf)
void BKE_ffmpeg_image_type_verify(RenderData *rd, ImageFormatData *imf)
{
int audio= 0;
@@ -1414,7 +1414,7 @@ void ffmpeg_verify_image_type(RenderData *rd, ImageFormatData *imf)
rd->ffcodecdata.codec = CODEC_ID_MPEG2VIDEO;
ffmpeg_set_preset(rd, FFMPEG_PRESET_DVD);
BKE_ffmpeg_preset_set(rd, FFMPEG_PRESET_DVD);
}
if (rd->ffcodecdata.type == FFMPEG_OGG) {
rd->ffcodecdata.type = FFMPEG_MPEG2;
@@ -1424,19 +1424,19 @@ void ffmpeg_verify_image_type(RenderData *rd, ImageFormatData *imf)
}
else if (imf->imtype == R_IMF_IMTYPE_H264) {
if (rd->ffcodecdata.codec != CODEC_ID_H264) {
ffmpeg_set_preset(rd, FFMPEG_PRESET_H264);
BKE_ffmpeg_preset_set(rd, FFMPEG_PRESET_H264);
audio= 1;
}
}
else if (imf->imtype == R_IMF_IMTYPE_XVID) {
if (rd->ffcodecdata.codec != CODEC_ID_MPEG4) {
ffmpeg_set_preset(rd, FFMPEG_PRESET_XVID);
BKE_ffmpeg_preset_set(rd, FFMPEG_PRESET_XVID);
audio= 1;
}
}
else if (imf->imtype == R_IMF_IMTYPE_THEORA) {
if (rd->ffcodecdata.codec != CODEC_ID_THEORA) {
ffmpeg_set_preset(rd, FFMPEG_PRESET_THEORA);
BKE_ffmpeg_preset_set(rd, FFMPEG_PRESET_THEORA);
audio= 1;
}
}
@@ -1447,12 +1447,12 @@ void ffmpeg_verify_image_type(RenderData *rd, ImageFormatData *imf)
}
}
void ffmpeg_verify_codec_settings(RenderData *rd)
void BKE_ffmpeg_codec_settings_verify(RenderData *rd)
{
ffmpeg_set_expert_options(rd);
}
int ffmpeg_alpha_channel_supported(RenderData *rd)
int BKE_ffmpeg_alpha_channel_is_supported(RenderData *rd)
{
int codec = rd->ffcodecdata.codec;

8
source/blender/blenkernel/intern/writeframeserver.c
View File

@@ -110,7 +110,7 @@ static int closesocket(int fd)
}
#endif
int start_frameserver(struct Scene *scene, RenderData *UNUSED(rd), int rectx, int recty, ReportList *reports)
int BKE_frameserver_start(struct Scene *scene, RenderData *UNUSED(rd), int rectx, int recty, ReportList *reports)
{
struct sockaddr_in addr;
int arg = 1;
@@ -258,7 +258,7 @@ static int handle_request(RenderData *rd, char * req)
return -1;
}
int frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
int BKE_frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
{
fd_set readfds;
struct timeval tv;
@@ -371,7 +371,7 @@ static void serve_ppm(int *pixels, int rectx, int recty)
connsock = -1;
}
int append_frameserver(RenderData *UNUSED(rd), int UNUSED(start_frame), int frame, int *pixels,
int BKE_frameserver_append(RenderData *UNUSED(rd), int UNUSED(start_frame), int frame, int *pixels,
int rectx, int recty, ReportList *UNUSED(reports))
{
fprintf(stderr, "Serving frame: %d\n", frame);
@@ -386,7 +386,7 @@ int append_frameserver(RenderData *UNUSED(rd), int UNUSED(start_frame), int fram
return 0;
}
void end_frameserver(void)
void BKE_frameserver_end(void)
{
if (connsock != -1) {
closesocket(connsock);

2
source/blender/editors/render/render_opengl.c
View File

@@ -451,7 +451,7 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
scene = oglrender->scene;
oglrender->reports = op->reports;
oglrender->mh = BKE_get_movie_handle(scene->r.im_format.imtype);
oglrender->mh = BKE_movie_handle_get(scene->r.im_format.imtype);
if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
if (!oglrender->mh->start_movie(scene, &scene->r, oglrender->sizex, oglrender->sizey, oglrender->reports)) {
screen_opengl_render_end(C, oglrender);

2
source/blender/editors/screen/screendump.c
View File

@@ -315,7 +315,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
{
ScreenshotJob *sj= sjv;
RenderData rd= sj->scene->r;
bMovieHandle *mh= BKE_get_movie_handle(sj->scene->r.im_format.imtype);
bMovieHandle *mh= BKE_movie_handle_get(sj->scene->r.im_format.imtype);
/* we need this as local variables for renderdata */
rd.frs_sec= U.scrcastfps;

8
source/blender/makesrna/intern/rna_scene.c
View File

@@ -707,7 +707,7 @@ static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value)
Scene *scene = ptr->id.data;
RenderData *rd = &scene->r;
#ifdef WITH_FFMPEG
ffmpeg_verify_image_type(rd, imf);
BKE_ffmpeg_image_type_verify(rd, imf);
#endif
#ifdef WITH_QUICKTIME
quicktime_verify_image_type(rd, imf);
@@ -750,7 +750,7 @@ static EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext *C, P
Scene *scene = ptr->id.data;
RenderData *rd = &scene->r;
if (ffmpeg_alpha_channel_supported(rd))
if (BKE_ffmpeg_alpha_channel_is_supported(rd))
chan_flag |= IMA_CHAN_FLAG_ALPHA;
}
#endif
@@ -941,7 +941,7 @@ static void rna_FFmpegSettings_lossless_output_set(PointerRNA *ptr, int value)
else
rd->ffcodecdata.flags &= ~FFMPEG_LOSSLESS_OUTPUT;
ffmpeg_verify_codec_settings(rd);
BKE_ffmpeg_codec_settings_verify(rd);
}
static void rna_FFmpegSettings_codec_settings_update(Main *UNUSED(bmain), Scene *UNUSED(scene_unused), PointerRNA *ptr)
@@ -949,7 +949,7 @@ static void rna_FFmpegSettings_codec_settings_update(Main *UNUSED(bmain), Scene
Scene *scene = (Scene *) ptr->id.data;
RenderData *rd = &scene->r;
ffmpeg_verify_codec_settings(rd);
BKE_ffmpeg_codec_settings_verify(rd);
}
#endif

2
source/blender/makesrna/intern/rna_scene_api.c
View File

@@ -75,7 +75,7 @@ static void rna_Scene_update_tagged(Scene *scene)
static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name)
{
if (BKE_imtype_is_movie(rd->im_format.imtype))
BKE_makeanimstring(name, rd);
BKE_movie_filepath_get(name, rd);
else
BKE_makepicstring(name, rd->pic, G.main->name, (frame == INT_MIN) ? rd->cfra : frame, rd->im_format.imtype,
rd->scemode & R_EXTENSION, TRUE);

2
source/blender/render/intern/source/pipeline.c
View File

@@ -2131,7 +2131,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
/* saves images to disk */
void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_override, unsigned int lay, int sfra, int efra, int tfra)
{
bMovieHandle *mh= BKE_get_movie_handle(scene->r.im_format.imtype);
bMovieHandle *mh= BKE_movie_handle_get(scene->r.im_format.imtype);
int cfrao= scene->r.cfra;
int nfra, totrendered= 0, totskipped= 0;