Commit be6efa20 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Libvlc: replace media_instance_destroy_and_detach by media_instance_release.

parent 8b356767
......@@ -83,6 +83,9 @@ libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread(
p_mi->p_libvlc_instance = p_libvlc_instance;
p_mi->i_input_id = p_input->i_object_id;
/* will be released in media_instance_release() */
vlc_object_retain( p_input );
return p_mi;
}
......@@ -113,13 +116,35 @@ void libvlc_media_instance_destroy( libvlc_media_instance_t *p_mi )
}
/**************************************************************************
* Free a Media Instance object (libvlc internal)
* Release a Media Instance object
**************************************************************************/
void libvlc_media_instance_destroy_and_detach( libvlc_media_instance_t *p_mi )
void libvlc_media_instance_release( libvlc_media_instance_t *p_mi )
{
input_thread_t *p_input_thread;
libvlc_exception_t p_e;
/* XXX: locking */
libvlc_exception_init( &p_e );
if( !p_mi )
return;
p_input_thread = libvlc_get_input_thread( p_mi, &p_e );
if( !libvlc_exception_raised( &p_e ) )
{
/* release for previous libvlc_get_input_thread */
vlc_object_release( p_input_thread );
/* release for initial p_input_thread yield (see _new()) */
vlc_object_release( p_input_thread );
/* No one is tracking this input_thread appart us. Destroy it */
if( p_input_thread->i_refcount <= 0 )
input_DestroyThread( p_input_thread );
/* btw, we still have an XXX locking here */
}
libvlc_media_descriptor_destroy( p_mi->p_md );
free( p_mi );
......@@ -145,12 +170,16 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
return;
input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, PLAYING_S );
vlc_object_release( p_input_thread );
return;
}
p_input_thread = input_CreateThread( p_mi->p_libvlc_instance->p_libvlc_int,
p_mi->p_md->p_input_item );
p_mi->i_input_id = p_input_thread->i_object_id;
/* will be released in media_instance_release() */
vlc_object_yield( p_input_thread );
}
/**************************************************************************
......@@ -169,6 +198,7 @@ void libvlc_media_instance_pause( libvlc_media_instance_t *p_mi,
return;
input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, val );
vlc_object_release( p_input_thread );
}
/**************************************************************************
......
......@@ -294,7 +294,7 @@ mediacontrol_get_rate( mediacontrol_Instance *self,
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
i_ret = libvlc_media_instance_get_rate( p_mi, &ex );
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return i_ret / 10;
......@@ -315,7 +315,7 @@ mediacontrol_set_rate( mediacontrol_Instance *self,
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
libvlc_media_instance_set_rate( p_mi, rate * 10, &ex );
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
......@@ -334,7 +334,7 @@ mediacontrol_get_fullscreen( mediacontrol_Instance *self,
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
i_ret = libvlc_get_fullscreen( p_mi, &ex );
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return i_ret;
......@@ -355,6 +355,6 @@ mediacontrol_set_fullscreen( mediacontrol_Instance *self,
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
libvlc_set_fullscreen( p_mi, b_fullscreen, &ex );
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
......@@ -138,7 +138,7 @@ mediacontrol_get_media_position( mediacontrol_Instance *self,
if( an_origin != mediacontrol_AbsolutePosition )
{
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
/* Relative or ModuloPosition make no sense */
RAISE_NULL( mediacontrol_PositionOriginNotSupported,
"Only absolute position is valid." );
......@@ -155,7 +155,7 @@ mediacontrol_get_media_position( mediacontrol_Instance *self,
{
if( ! self->p_playlist->p_input )
{
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
RAISE_NULL( mediacontrol_InternalException,
"No input" );
}
......@@ -164,7 +164,7 @@ mediacontrol_get_media_position( mediacontrol_Instance *self,
a_key,
pos );
}
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
return retval;
}
......@@ -186,7 +186,7 @@ mediacontrol_set_media_position( mediacontrol_Instance *self,
i_pos = mediacontrol_position2microsecond( self->p_playlist->p_input, a_position );
libvlc_media_instance_set_time( p_mi, i_pos / 1000, &ex );
libvlc_media_instance_destroy_and_detach( p_mi );
libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
......
/*****************************************************************************
* video.c: libvlc new API video functions
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
*
* $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
*
* Authors: Cl�ent Stenac <zorglub@videolan.org>
* Filippo Carone <littlejohn@videolan.org>
* Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
* Damien Fouilleul <damienf a_t videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <vlc_input.h>
#include <vlc_vout.h>
/*
* Remember to release the returned vout_thread_t since it is locked at
* the end of this function.
*/
static vout_thread_t *GetVout( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_exception )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_exception );
vout_thread_t *p_vout = NULL;
if( p_input_thread )
{
p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
if( !p_vout )
{
libvlc_exception_raise( p_exception, "No active video output" );
}
vlc_object_release( p_input_thread );
}
return p_vout;
}
/**********************************************************************
* Exported functions
**********************************************************************/
void libvlc_set_fullscreen( libvlc_media_instance_t *p_mi, int b_fullscreen,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
vlc_value_t val; int i_ret;
/* GetVout will raise the exception for us */
if( !p_vout1 )
{
return;
}
if( b_fullscreen ) val.b_bool = VLC_TRUE;
else val.b_bool = VLC_FALSE;
i_ret = var_Set( p_vout1, "fullscreen", val );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting fullscreen value" );
vlc_object_release( p_vout1 );
}
int libvlc_get_fullscreen( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
vlc_value_t val; int i_ret;
/* GetVout will raise the exception for us */
if( !p_vout1 )
return 0;
i_ret = var_Get( p_vout1, "fullscreen", &val );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while looking up fullscreen value" );
return val.b_bool == VLC_TRUE ? 1 : 0;
}
void libvlc_toggle_fullscreen( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
vlc_value_t val; int i_ret;
/* GetVout will raise the exception for us */
if( !p_vout1 )
return;
i_ret = var_Get( p_vout1, "fullscreen", &val );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while looking up fullscreen value" );
val.b_bool = !val.b_bool;
i_ret = var_Set( p_vout1, "fullscreen", val );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting fullscreen value" );
vlc_object_release( p_vout1 );
}
void
libvlc_video_take_snapshot( libvlc_media_instance_t *p_mi, char *psz_filepath,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
input_thread_t *p_input_thread;
/* GetVout will raise the exception for us */
if( !p_vout )
{
return;
}
if( !psz_filepath )
{
libvlc_exception_raise( p_e, "filepath is null" );
return;
}
p_input_thread = (input_thread_t*)vlc_object_get(
p_mi->p_libvlc_instance->p_libvlc_int,
p_mi->i_input_id );
if( !p_input_thread )
{
libvlc_exception_raise( p_e, "Input does not exist" );
return;
}
var_SetString( p_vout, "snapshot-path", psz_filepath );
var_SetString( p_vout, "snapshot-format", "png" );
vout_Control( p_vout, VOUT_SNAPSHOT );
vlc_object_release( p_vout );
vlc_object_release( p_input_thread );
}
int libvlc_video_get_height( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
if( !p_vout1 )
return 0;
vlc_object_release( p_vout1 );
return p_vout1->i_window_height;
}
int libvlc_video_get_width( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
if( !p_vout1 )
return 0;
vlc_object_release( p_vout1 );
return p_vout1->i_window_width;
}
vlc_bool_t libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e);
vlc_bool_t has_vout = VLC_FALSE;
if( p_input_thread )
{
vout_thread_t *p_vout;
p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{
has_vout = VLC_TRUE;
vlc_object_release( p_vout );
}
vlc_object_release( p_input_thread );
}
return has_vout;
}
int libvlc_video_reparent( libvlc_media_instance_t *p_mi, libvlc_drawable_t d,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
{
vout_Control( p_vout , VOUT_REPARENT, d);
vlc_object_release( p_vout );
}
return 0;
}
void libvlc_video_resize( libvlc_media_instance_t *p_mi, int width, int height, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
{
vout_Control( p_vout, VOUT_SET_SIZE, width, height );
vlc_object_release( p_vout );
}
}
void libvlc_video_redraw_rectangle( libvlc_media_instance_t *p_mi,
const libvlc_rectangle_t *area,
libvlc_exception_t *p_e )
{
if( (NULL != area)
&& ((area->bottom - area->top) > 0)
&& ((area->right - area->left) > 0) )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
{
/* tell running vout to redraw area */
vout_Control( p_vout , VOUT_REDRAW_RECT,
area->top, area->left, area->bottom, area->right );
vlc_object_release( p_vout );
}
}
}
/* global video settings */
void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
libvlc_exception_t *p_e )
{
/* set as default for future vout instances */
var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)d);
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e);
if( p_mi )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
{
/* tell running vout to re-parent */
vout_Control( p_vout , VOUT_REPARENT, d);
vlc_object_release( p_vout );
}
libvlc_media_instance_destroy_and_detach(p_mi);
}
}
}
libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
{
libvlc_drawable_t result;
result = var_GetInteger( p_instance->p_libvlc_int, "drawable" );
return result;
}
void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height,
libvlc_exception_t *p_e )
{
/* set as default for future vout instances */
config_PutInt(p_instance->p_libvlc_int, "width", width);
config_PutInt(p_instance->p_libvlc_int, "height", height);
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e);
if( p_mi )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
{
/* tell running vout to re-size */
vout_Control( p_vout , VOUT_SET_SIZE, width, height);
vlc_object_release( p_vout );
}
libvlc_media_instance_destroy_and_detach(p_mi);
}
}
}
void libvlc_video_set_viewport( libvlc_instance_t *p_instance,
const libvlc_rectangle_t *view, const libvlc_rectangle_t *clip,
libvlc_exception_t *p_e )
{
if( NULL == view )
{
libvlc_exception_raise( p_e, "viewport is NULL" );
}
/* if clip is NULL, then use view rectangle as clip */
if( NULL == clip )
clip = view;
/* set as default for future vout instances */
var_SetInteger( p_instance->p_libvlc_int, "drawable-view-top", view->top );
var_SetInteger( p_instance->p_libvlc_int, "drawable-view-left", view->left );
var_SetInteger( p_instance->p_libvlc_int, "drawable-view-bottom", view->bottom );
var_SetInteger( p_instance->p_libvlc_int, "drawable-view-right", view->right );
var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-top", clip->top );
var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-left", clip->left );
var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-bottom", clip->bottom );
var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-right", clip->right );
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e);
if( p_mi )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
{
/* change viewport for running vout */
vout_Control( p_vout , VOUT_SET_VIEWPORT,
view->top, view->left, view->bottom, view->right,
clip->top, clip->left, clip->bottom, clip->right );
vlc_object_release( p_vout );
}
libvlc_media_instance_destroy_and_detach(p_mi);
}
}
}
char *libvlc_video_get_aspect_ratio( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
char *psz_aspect = 0;
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( !p_vout )
return 0;
psz_aspect = var_GetString( p_vout, "aspect-ratio" );
vlc_object_release( p_vout );
return psz_aspect;
}
void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *p_mi,
char *psz_aspect, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
int i_ret = -1;
if( !p_vout )
return;
i_ret = var_SetString( p_vout, "aspect-ratio", psz_aspect );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting aspect-ratio value" );
vlc_object_release( p_vout );
}
int libvlc_video_get_spu( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val_list;
vlc_value_t val;
int i_spu = -1;
int i_ret = -1;
int i;
if( !p_input_thread )
return -1;
i_ret = var_Get( p_input_thread, "spu-es", &val );
if( i_ret < 0 )
{
libvlc_exception_raise( p_e, "Getting subtitle information failed" );
vlc_object_release( p_input_thread );
return i_ret;
}
var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( i = 0; i < val_list.p_list->i_count; i++ )
{
vlc_value_t spu_val = val_list.p_list->p_values[i];
if( val.i_int == spu_val.i_int )
{
i_spu = i;
break;
}
}
vlc_object_release( p_input_thread );
return i_spu;
}
void libvlc_video_set_spu( libvlc_media_instance_t *p_mi, int i_spu,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val_list;
int i_ret = -1;
int i;
if( !p_input_thread )
return;
var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( i = 0; i < val_list.p_list->i_count; i++ )
{
vlc_value_t val = val_list.p_list->p_values[i];
if( i_spu == i )
{
vlc_value_t new_val;
new_val.i_int = val.i_int;
i_ret = var_Set( p_input_thread, "spu-es", new_val );
if( i_ret < 0 )
{
libvlc_exception_raise( p_e, "Setting subtitle value failed" );
}
vlc_object_release( p_input_thread );
return;
}
}
libvlc_exception_raise( p_e, "Subtitle value out of range" );
vlc_object_release( p_input_thread );
}
char *libvlc_video_get_crop_geometry( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
char *psz_geometry = 0;
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( !p_vout )
return 0;
psz_geometry = var_GetString( p_vout, "crop" );
vlc_object_release( p_vout );
return psz_geometry;
}
void libvlc_video_set_crop_geometry( libvlc_media_instance_t *p_mi,
char *psz_geometry, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
int i_ret = -1;
if( !p_vout )
return;
i_ret = var_SetString( p_vout, "crop", psz_geometry );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting crop geometry" );
vlc_object_release( p_vout );
}
int libvlc_video_destroy( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vlc_object_detach( p_vout );
vlc_object_release( p_vout );
vout_Destroy( p_vout );
return 0;
}
libvlc_media_instance_release(p_mi);
libvlc_media_instance_release(p_mi);
libvlc_media_instance_release(p_mi);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment