mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );
mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
GlslManager::get_instance()->lock_service( frame );
- Effect* effect = GlslManager::get_effect( MLT_FILTER_SERVICE( filter ), frame );
- if ( effect ) {
- mlt_position position = mlt_filter_get_position( filter, frame );
- mlt_position length = mlt_filter_get_length2( filter, frame );
- RGBTriplet triplet(
- mlt_properties_anim_get_double( properties, "lift_r", position, length ),
- mlt_properties_anim_get_double( properties, "lift_g", position, length ),
- mlt_properties_anim_get_double( properties, "lift_b", position, length )
- );
- bool ok = effect->set_vec3( "lift", (float*) &triplet );
- triplet.r = mlt_properties_anim_get_double( properties, "gamma_r", position, length );
- triplet.g = mlt_properties_anim_get_double( properties, "gamma_g", position, length );
- triplet.b = mlt_properties_anim_get_double( properties, "gamma_b", position, length );
- ok |= effect->set_vec3( "gamma", (float*) &triplet );
- triplet.r = mlt_properties_anim_get_double( properties, "gain_r", position, length );
- triplet.g = mlt_properties_anim_get_double( properties, "gain_g", position, length );
- triplet.b = mlt_properties_anim_get_double( properties, "gain_b", position, length );
- ok |= effect->set_vec3( "gain", (float*) &triplet );
- assert(ok);
- }
+ mlt_position position = mlt_filter_get_position( filter, frame );
+ mlt_position length = mlt_filter_get_length2( filter, frame );
+ mlt_properties_set_double( properties, "movit.parms.vec3.lift[0]",
+ mlt_properties_anim_get_double( properties, "lift_r", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.lift[1]",
+ mlt_properties_anim_get_double( properties, "lift_g", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.lift[2]",
+ mlt_properties_anim_get_double( properties, "lift_b", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.gamma[0]",
+ mlt_properties_anim_get_double( properties, "gamma_r", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.gamma[1]",
+ mlt_properties_anim_get_double( properties, "gamma_g", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.gamma[2]",
+ mlt_properties_anim_get_double( properties, "gamma_b", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.gain[0]",
+ mlt_properties_anim_get_double( properties, "gain_r", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.gain[1]",
+ mlt_properties_anim_get_double( properties, "gain_g", position, length ) );
+ mlt_properties_set_double( properties, "movit.parms.vec3.gain[2]",
+ mlt_properties_anim_get_double( properties, "gain_b", position, length ) );
GlslManager::get_instance()->unlock_service( frame );
*format = mlt_image_glsl;
- return mlt_frame_get_image( frame, image, format, width, height, writable );
+ int error = mlt_frame_get_image( frame, image, format, width, height, writable );
+ GlslManager::set_effect_input( MLT_FILTER_SERVICE( filter ), frame, (mlt_service) *image );
+ GlslManager::set_effect( MLT_FILTER_SERVICE( filter ), frame, new LiftGammaGainEffect );
+ *image = (uint8_t *) MLT_FILTER_SERVICE( filter );
+ return error;
}
static mlt_frame process( mlt_filter filter, mlt_frame frame )
{
- if ( !mlt_frame_is_test_card( frame ) ) {
- if ( !GlslManager::get_effect( MLT_FILTER_SERVICE( filter ), frame ) )
- GlslManager::add_effect( MLT_FILTER_SERVICE( filter ), frame, new LiftGammaGainEffect );
- }
mlt_frame_push_service( frame, filter );
mlt_frame_push_get_image( frame, get_image );
return frame;