[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46381] trunk/blender/source/blender: Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style
Sergey Sharybin
sergey.vfx at gmail.com
Mon May 7 11:30:15 CEST 2012
Revision: 46381
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46381
Author: nazgul
Date: 2012-05-07 09:30:15 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_writeavi.h
trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
trunk/blender/source/blender/blenkernel/BKE_writeframeserver.h
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/blenkernel/BKE_writeavi.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_writeavi.h 2012-05-07 09:01:55 UTC (rev 46380)
+++ trunk/blender/source/blender/blenkernel/BKE_writeavi.h 2012-05-07 09:30:15 UTC (rev 46381)
@@ -51,8 +51,8 @@
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
}
Modified: trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h 2012-05-07 09:01:55 UTC (rev 46380)
+++ trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h 2012-05-07 09:30:15 UTC (rev 46381)
@@ -66,20 +66,20 @@
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
}
Modified: trunk/blender/source/blender/blenkernel/BKE_writeframeserver.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_writeframeserver.h 2012-05-07 09:01:55 UTC (rev 46380)
+++ trunk/blender/source/blender/blenkernel/BKE_writeframeserver.h 2012-05-07 09:30:15 UTC (rev 46381)
@@ -40,11 +40,11 @@
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
}
Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c 2012-05-07 09:01:55 UTC (rev 46380)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c 2012-05-07 09:30:15 UTC (rev 46381)
@@ -68,7 +68,7 @@
#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 @@
#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 @@
}
/* 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
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2012-05-07 09:01:55 UTC (rev 46380)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2012-05-07 09:30:15 UTC (rev 46381)
@@ -678,7 +678,7 @@
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 @@
* ********************************************************************** */
/* 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 @@
}
}
-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 @@
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 @@
}
#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 @@
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 @@
return success;
}
-void end_ffmpeg(void)
+void BKE_ffmpeg_end(void)
{
unsigned int i;
@@ -1074,7 +1074,7 @@
/* 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 @@
}
}
-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 @@
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 @@
}
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 @@
* 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");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list