griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix quicktime export being broken in various ways: callback was missing

Browse Source 
parameter, codec RNA wrapping was wrong, and there was a python script error.
This commit is contained in:
Brecht Van Lommel
2012-02-13 20:47:29 +00:00
parent 62fa555b8e
commit 0fbff1be3e
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_edit.c
View File

@@ -1516,7 +1516,7 @@ void OBJECT_OT_game_property_new(wmOperatorType *ot)
/* 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");
}

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

@@ -821,16 +821,16 @@ static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str)
#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 @@ static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bCon
#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,

7
source/blender/quicktime/apple/qtkit_export.m
View File

@@ -595,8 +595,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R
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 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect
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

2
source/blender/quicktime/apple/quicktime_export.c
View File

@@ -604,7 +604,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R
}
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;

2
source/blender/quicktime/quicktime_export.h
View File

@@ -57,7 +57,7 @@ struct Scene;
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);