[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44095] trunk/blender/source/blender: Fix quicktime export being broken in various ways: callback was missing
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Feb 13 21:47:30 CET 2012
Revision: 44095
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44095
Author: blendix
Date: 2012-02-13 20:47:29 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Fix quicktime export being broken in various ways: callback was missing
parameter, codec RNA wrapping was wrong, and there was a python script error.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/quicktime_export.h
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2012-02-13 19:00:02 UTC (rev 44094)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2012-02-13 20:47:29 UTC (rev 44095)
@@ -1516,7 +1516,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
- RNA_def_enum(ot->srna, "type", gameproperty_type_items, 2, "Type", "Type of game property to add");
+ RNA_def_enum(ot->srna, "type", gameproperty_type_items, GPROP_FLOAT, "Type", "Type of game property to add");
RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the game property to add");
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-02-13 19:00:02 UTC (rev 44094)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-02-13 20:47:29 UTC (rev 44095)
@@ -821,16 +821,16 @@
#ifdef WITH_QUICKTIME
static int rna_RenderSettings_qtcodecsettings_codecType_get(PointerRNA *ptr)
{
- RenderData *rd= (RenderData*)ptr->data;
+ QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
- return quicktime_rnatmpvalue_from_videocodectype(rd->qtcodecsettings.codecType);
+ return quicktime_rnatmpvalue_from_videocodectype(settings->codecType);
}
static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, int value)
{
- RenderData *rd= (RenderData*)ptr->data;
+ QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
- rd->qtcodecsettings.codecType = quicktime_videocodecType_from_rnatmpvalue(value);
+ settings->codecType = quicktime_videocodecType_from_rnatmpvalue(value);
}
static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr,
@@ -863,16 +863,16 @@
#ifdef USE_QTKIT
static int rna_RenderSettings_qtcodecsettings_audiocodecType_get(PointerRNA *ptr)
{
- RenderData *rd= (RenderData*)ptr->data;
+ QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
- return quicktime_rnatmpvalue_from_audiocodectype(rd->qtcodecsettings.audiocodecType);
+ return quicktime_rnatmpvalue_from_audiocodectype(settings->audiocodecType);
}
static void rna_RenderSettings_qtcodecsettings_audiocodecType_set(PointerRNA *ptr, int value)
{
- RenderData *rd= (RenderData*)ptr->data;
+ QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
- rd->qtcodecsettings.audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
+ settings->audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
}
static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *C, PointerRNA *ptr,
Modified: trunk/blender/source/blender/quicktime/apple/qtkit_export.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_export.m 2012-02-13 19:00:02 UTC (rev 44094)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_export.m 2012-02-13 20:47:29 UTC (rev 44095)
@@ -595,8 +595,7 @@
return success;
}
-
-int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports)
+int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSBitmapImageRep *blBitmapFormatImage;
@@ -604,14 +603,12 @@
OSStatus err = noErr;
unsigned char *from_Ptr,*to_Ptr;
int y,from_i,to_i;
- BOOL alpha = (rd->im_format.planes == R_IMF_PLANES_RGBA)? YES: NO;
-
/* Create bitmap image rep in blender format (32bit RGBA) */
blBitmapFormatImage = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
pixelsWide:rectx
pixelsHigh:recty
- bitsPerSample:8 samplesPerPixel:4 hasAlpha:alpha isPlanar:NO
+ bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO
colorSpaceName:NSCalibratedRGBColorSpace
bitmapFormat:NSAlphaNonpremultipliedBitmapFormat
bytesPerRow:rectx*4
Modified: trunk/blender/source/blender/quicktime/apple/quicktime_export.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_export.c 2012-02-13 19:00:02 UTC (rev 44094)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c 2012-02-13 20:47:29 UTC (rev 44095)
@@ -604,7 +604,7 @@
}
-int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports)
+int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports)
{
QT_DoAddVideoSamplesToMedia(frame, pixels, rectx, recty, reports);
return 1;
Modified: trunk/blender/source/blender/quicktime/quicktime_export.h
===================================================================
--- trunk/blender/source/blender/quicktime/quicktime_export.h 2012-02-13 19:00:02 UTC (rev 44094)
+++ trunk/blender/source/blender/quicktime/quicktime_export.h 2012-02-13 20:47:29 UTC (rev 44095)
@@ -57,7 +57,7 @@
struct wmOperatorType;
int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports); //for movie handle (BKE writeavi.c now)
-int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, struct ReportList *reports);
+int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, struct ReportList *reports);
void end_qt(void);
void filepath_qt(char *string, struct RenderData *rd);
More information about the Bf-blender-cvs
mailing list