2007-06-23 20:10:00 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
* video.c: libvlc new API video functions
|
|
|
|
*****************************************************************************
|
LGPL
Re-license almost all of libVLC and libVLCcore to LGPLv2.1+
This move was authorized by the developers, either:
- by e-mail,
- by vote at the VideoLAN Dev Days 2011,
- on the license website,
- in a contract, oral or written.
No objection was raised, so far.
The developers agreeing are:
Justus Piater
Alexis Ballier
Alexander Bethke
Mohammed Adnène Trojette
Alex Converse
Alexey Sokolov
Alexis de Lattre
Andre Pang
Anthony Loiseau
Cyril Deguet
André Weber
Boris Dorès
Brieuc Jeunhomme
Benjamin Drung
Hugo Beauzée-Luyssen
Benoit Steiner
Benjamin Pracht
Bernie Purcell
Przemyslaw Fiala
Arnaud de Bossoreille de Ribou
Brad Smith
Nick Briggs
Christopher Rath
Christophe Courtaut
Christopher Mueller
Clement Chesnin
Andres Krapf
Damien Fouilleul
David Flynn
Sebastien Zwickert
Antoine Cellerier
Jérôme Decoodt
Jérome Decoodt
Dylan Yudaken
Eduard Babayan
Eugenio Jarosiewicz
Elliot Murphy
Eric Petit
Erwan Tulou
Etienne Membrives
Ludovic Fauvet
Fabio Ritrovato
Tobias Güntner
Jakub Wieczorek
Frédéric Crozat
Francois Cartegnie
Laurent Aimar
Florian G. Pflug
Felix Paul Kühne
Frank Enderle
Rafaël Carré
Simon Latapie
Gildas Bazin
Geoffroy Couprie
Julien / Gellule
Gildas Bazin
Arnaud Schauly
Toralf Niebuhr
Vicente Jimenez Aguilar
Derk-Jan Hartman
Henri Fallon
Ilkka Ollakka
Olivier Teulière
Rémi Duraffort
Jakob Leben
Jean-Baptiste Kempf
Jean-Paul Saman
Jean-Philippe Grimaldi
Jean-François Massol
Gaël Hendryckx
Jakob Leben
Jean-Marc Dressler
Jai Menon
Johan Bilien
Johann Ransay
Joris van Rooij
JP Dinger
Jean-Philippe André
Adrien Grand
Juha Jeronen
Juho Vähä-Herttua
Kaarlo Raiha
Kaarlo Raiha
Kamil Baldyga
Keary Griffin
Ken Self
KO Myung-Hun
Pierre Ynard
Filippo Carone
Loïc Minier
Luca Barbato
Lucas C. Villa Real
Lukas Durfina
Adrien Maglo
Marc Ariberti
Mark Lee
Mark Moriarty
Martin Storsjö
Christophe Massiot
Michel Kaempf
Marian Ďurkovič
Mirsal Ennaime
Carlo Calabrò
Damien Lucas
Naohiro Koriyama
Basos G
Pierre Baillet
Vincent Penquerc'h
Olivier Aubert
Pankaj Yadav
Paul Corke
Pierre d'Herbemont
Philippe Morin
Antoine Lejeune
Michael Ploujnikov
Jean-Marc Dressler
Michael Hanselmann
Rafaël Carré
Ramiro Polla
Rémi Denis-Courmont
Renaud Dartus
Richard Shepherd
Faustino Osuna
Arnaud Vallat
Rob Jonson
Robert Jedrzejczyk
Steve Lhomme
Rocky Bernstein
Romain Goyet
Rov Juvano
Sam Hocevar
Martin T. H. Sandsmark
Sebastian Birk
Sébastien Escudier
Vincent Seguin
Fabio Ritrovato
Sigmund Augdal Helberg
Casian Andrei
Srikanth Raju
Hannes Domani
Stéphane Borel
Stephan Krempel
Stephan Assmus
Tony Castley
Pavlov Konstantin
Eric Petit
Tanguy Krotoff
Dennis van Amerongen
Michel Lespinasse
Can Wu
Xavier Marchesini
Sébastien Toque
Christophe Mutricy
Yoann Peronneau
Yohann Martineau
Yuval Tze
Scott Caudle
Clément Stenac
It is possible, that some minor piece of code was badly tracked, for
some reasons (SVN, mainly) or that some small developers did not answer.
However, as an "œuvre collective", defined as in "CPI 113-2 alinéa 3",
and seeing "Cour. Cass. 17 Mai 1978", and seeing that the editor and
the very vast majority of developers have agreed (> 99.99% of the code,
> 99% of developers), we are fine here.
2011-11-28 04:44:15 +08:00
|
|
|
* Copyright (C) 2005-2010 VLC authors and VideoLAN
|
2007-06-23 20:10:00 +08:00
|
|
|
*
|
2008-01-16 18:21:11 +08:00
|
|
|
* $Id$
|
2007-06-23 20:10:00 +08:00
|
|
|
*
|
2009-03-05 01:31:29 +08:00
|
|
|
* Authors: Clément Stenac <zorglub@videolan.org>
|
2007-06-23 20:10:00 +08:00
|
|
|
* Filippo Carone <littlejohn@videolan.org>
|
|
|
|
* Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
|
|
|
|
* Damien Fouilleul <damienf a_t videolan dot org>
|
|
|
|
*
|
LGPL
Re-license almost all of libVLC and libVLCcore to LGPLv2.1+
This move was authorized by the developers, either:
- by e-mail,
- by vote at the VideoLAN Dev Days 2011,
- on the license website,
- in a contract, oral or written.
No objection was raised, so far.
The developers agreeing are:
Justus Piater
Alexis Ballier
Alexander Bethke
Mohammed Adnène Trojette
Alex Converse
Alexey Sokolov
Alexis de Lattre
Andre Pang
Anthony Loiseau
Cyril Deguet
André Weber
Boris Dorès
Brieuc Jeunhomme
Benjamin Drung
Hugo Beauzée-Luyssen
Benoit Steiner
Benjamin Pracht
Bernie Purcell
Przemyslaw Fiala
Arnaud de Bossoreille de Ribou
Brad Smith
Nick Briggs
Christopher Rath
Christophe Courtaut
Christopher Mueller
Clement Chesnin
Andres Krapf
Damien Fouilleul
David Flynn
Sebastien Zwickert
Antoine Cellerier
Jérôme Decoodt
Jérome Decoodt
Dylan Yudaken
Eduard Babayan
Eugenio Jarosiewicz
Elliot Murphy
Eric Petit
Erwan Tulou
Etienne Membrives
Ludovic Fauvet
Fabio Ritrovato
Tobias Güntner
Jakub Wieczorek
Frédéric Crozat
Francois Cartegnie
Laurent Aimar
Florian G. Pflug
Felix Paul Kühne
Frank Enderle
Rafaël Carré
Simon Latapie
Gildas Bazin
Geoffroy Couprie
Julien / Gellule
Gildas Bazin
Arnaud Schauly
Toralf Niebuhr
Vicente Jimenez Aguilar
Derk-Jan Hartman
Henri Fallon
Ilkka Ollakka
Olivier Teulière
Rémi Duraffort
Jakob Leben
Jean-Baptiste Kempf
Jean-Paul Saman
Jean-Philippe Grimaldi
Jean-François Massol
Gaël Hendryckx
Jakob Leben
Jean-Marc Dressler
Jai Menon
Johan Bilien
Johann Ransay
Joris van Rooij
JP Dinger
Jean-Philippe André
Adrien Grand
Juha Jeronen
Juho Vähä-Herttua
Kaarlo Raiha
Kaarlo Raiha
Kamil Baldyga
Keary Griffin
Ken Self
KO Myung-Hun
Pierre Ynard
Filippo Carone
Loïc Minier
Luca Barbato
Lucas C. Villa Real
Lukas Durfina
Adrien Maglo
Marc Ariberti
Mark Lee
Mark Moriarty
Martin Storsjö
Christophe Massiot
Michel Kaempf
Marian Ďurkovič
Mirsal Ennaime
Carlo Calabrò
Damien Lucas
Naohiro Koriyama
Basos G
Pierre Baillet
Vincent Penquerc'h
Olivier Aubert
Pankaj Yadav
Paul Corke
Pierre d'Herbemont
Philippe Morin
Antoine Lejeune
Michael Ploujnikov
Jean-Marc Dressler
Michael Hanselmann
Rafaël Carré
Ramiro Polla
Rémi Denis-Courmont
Renaud Dartus
Richard Shepherd
Faustino Osuna
Arnaud Vallat
Rob Jonson
Robert Jedrzejczyk
Steve Lhomme
Rocky Bernstein
Romain Goyet
Rov Juvano
Sam Hocevar
Martin T. H. Sandsmark
Sebastian Birk
Sébastien Escudier
Vincent Seguin
Fabio Ritrovato
Sigmund Augdal Helberg
Casian Andrei
Srikanth Raju
Hannes Domani
Stéphane Borel
Stephan Krempel
Stephan Assmus
Tony Castley
Pavlov Konstantin
Eric Petit
Tanguy Krotoff
Dennis van Amerongen
Michel Lespinasse
Can Wu
Xavier Marchesini
Sébastien Toque
Christophe Mutricy
Yoann Peronneau
Yohann Martineau
Yuval Tze
Scott Caudle
Clément Stenac
It is possible, that some minor piece of code was badly tracked, for
some reasons (SVN, mainly) or that some small developers did not answer.
However, as an "œuvre collective", defined as in "CPI 113-2 alinéa 3",
and seeing "Cour. Cass. 17 Mai 1978", and seeing that the editor and
the very vast majority of developers have agreed (> 99.99% of the code,
> 99% of developers), we are fine here.
2011-11-28 04:44:15 +08:00
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU Lesser General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2.1 of the License, or
|
2007-06-23 20:10:00 +08:00
|
|
|
* (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
|
LGPL
Re-license almost all of libVLC and libVLCcore to LGPLv2.1+
This move was authorized by the developers, either:
- by e-mail,
- by vote at the VideoLAN Dev Days 2011,
- on the license website,
- in a contract, oral or written.
No objection was raised, so far.
The developers agreeing are:
Justus Piater
Alexis Ballier
Alexander Bethke
Mohammed Adnène Trojette
Alex Converse
Alexey Sokolov
Alexis de Lattre
Andre Pang
Anthony Loiseau
Cyril Deguet
André Weber
Boris Dorès
Brieuc Jeunhomme
Benjamin Drung
Hugo Beauzée-Luyssen
Benoit Steiner
Benjamin Pracht
Bernie Purcell
Przemyslaw Fiala
Arnaud de Bossoreille de Ribou
Brad Smith
Nick Briggs
Christopher Rath
Christophe Courtaut
Christopher Mueller
Clement Chesnin
Andres Krapf
Damien Fouilleul
David Flynn
Sebastien Zwickert
Antoine Cellerier
Jérôme Decoodt
Jérome Decoodt
Dylan Yudaken
Eduard Babayan
Eugenio Jarosiewicz
Elliot Murphy
Eric Petit
Erwan Tulou
Etienne Membrives
Ludovic Fauvet
Fabio Ritrovato
Tobias Güntner
Jakub Wieczorek
Frédéric Crozat
Francois Cartegnie
Laurent Aimar
Florian G. Pflug
Felix Paul Kühne
Frank Enderle
Rafaël Carré
Simon Latapie
Gildas Bazin
Geoffroy Couprie
Julien / Gellule
Gildas Bazin
Arnaud Schauly
Toralf Niebuhr
Vicente Jimenez Aguilar
Derk-Jan Hartman
Henri Fallon
Ilkka Ollakka
Olivier Teulière
Rémi Duraffort
Jakob Leben
Jean-Baptiste Kempf
Jean-Paul Saman
Jean-Philippe Grimaldi
Jean-François Massol
Gaël Hendryckx
Jakob Leben
Jean-Marc Dressler
Jai Menon
Johan Bilien
Johann Ransay
Joris van Rooij
JP Dinger
Jean-Philippe André
Adrien Grand
Juha Jeronen
Juho Vähä-Herttua
Kaarlo Raiha
Kaarlo Raiha
Kamil Baldyga
Keary Griffin
Ken Self
KO Myung-Hun
Pierre Ynard
Filippo Carone
Loïc Minier
Luca Barbato
Lucas C. Villa Real
Lukas Durfina
Adrien Maglo
Marc Ariberti
Mark Lee
Mark Moriarty
Martin Storsjö
Christophe Massiot
Michel Kaempf
Marian Ďurkovič
Mirsal Ennaime
Carlo Calabrò
Damien Lucas
Naohiro Koriyama
Basos G
Pierre Baillet
Vincent Penquerc'h
Olivier Aubert
Pankaj Yadav
Paul Corke
Pierre d'Herbemont
Philippe Morin
Antoine Lejeune
Michael Ploujnikov
Jean-Marc Dressler
Michael Hanselmann
Rafaël Carré
Ramiro Polla
Rémi Denis-Courmont
Renaud Dartus
Richard Shepherd
Faustino Osuna
Arnaud Vallat
Rob Jonson
Robert Jedrzejczyk
Steve Lhomme
Rocky Bernstein
Romain Goyet
Rov Juvano
Sam Hocevar
Martin T. H. Sandsmark
Sebastian Birk
Sébastien Escudier
Vincent Seguin
Fabio Ritrovato
Sigmund Augdal Helberg
Casian Andrei
Srikanth Raju
Hannes Domani
Stéphane Borel
Stephan Krempel
Stephan Assmus
Tony Castley
Pavlov Konstantin
Eric Petit
Tanguy Krotoff
Dennis van Amerongen
Michel Lespinasse
Can Wu
Xavier Marchesini
Sébastien Toque
Christophe Mutricy
Yoann Peronneau
Yohann Martineau
Yuval Tze
Scott Caudle
Clément Stenac
It is possible, that some minor piece of code was badly tracked, for
some reasons (SVN, mainly) or that some small developers did not answer.
However, as an "œuvre collective", defined as in "CPI 113-2 alinéa 3",
and seeing "Cour. Cass. 17 Mai 1978", and seeing that the editor and
the very vast majority of developers have agreed (> 99.99% of the code,
> 99% of developers), we are fine here.
2011-11-28 04:44:15 +08:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License for more details.
|
2007-06-23 20:10:00 +08:00
|
|
|
*
|
LGPL
Re-license almost all of libVLC and libVLCcore to LGPLv2.1+
This move was authorized by the developers, either:
- by e-mail,
- by vote at the VideoLAN Dev Days 2011,
- on the license website,
- in a contract, oral or written.
No objection was raised, so far.
The developers agreeing are:
Justus Piater
Alexis Ballier
Alexander Bethke
Mohammed Adnène Trojette
Alex Converse
Alexey Sokolov
Alexis de Lattre
Andre Pang
Anthony Loiseau
Cyril Deguet
André Weber
Boris Dorès
Brieuc Jeunhomme
Benjamin Drung
Hugo Beauzée-Luyssen
Benoit Steiner
Benjamin Pracht
Bernie Purcell
Przemyslaw Fiala
Arnaud de Bossoreille de Ribou
Brad Smith
Nick Briggs
Christopher Rath
Christophe Courtaut
Christopher Mueller
Clement Chesnin
Andres Krapf
Damien Fouilleul
David Flynn
Sebastien Zwickert
Antoine Cellerier
Jérôme Decoodt
Jérome Decoodt
Dylan Yudaken
Eduard Babayan
Eugenio Jarosiewicz
Elliot Murphy
Eric Petit
Erwan Tulou
Etienne Membrives
Ludovic Fauvet
Fabio Ritrovato
Tobias Güntner
Jakub Wieczorek
Frédéric Crozat
Francois Cartegnie
Laurent Aimar
Florian G. Pflug
Felix Paul Kühne
Frank Enderle
Rafaël Carré
Simon Latapie
Gildas Bazin
Geoffroy Couprie
Julien / Gellule
Gildas Bazin
Arnaud Schauly
Toralf Niebuhr
Vicente Jimenez Aguilar
Derk-Jan Hartman
Henri Fallon
Ilkka Ollakka
Olivier Teulière
Rémi Duraffort
Jakob Leben
Jean-Baptiste Kempf
Jean-Paul Saman
Jean-Philippe Grimaldi
Jean-François Massol
Gaël Hendryckx
Jakob Leben
Jean-Marc Dressler
Jai Menon
Johan Bilien
Johann Ransay
Joris van Rooij
JP Dinger
Jean-Philippe André
Adrien Grand
Juha Jeronen
Juho Vähä-Herttua
Kaarlo Raiha
Kaarlo Raiha
Kamil Baldyga
Keary Griffin
Ken Self
KO Myung-Hun
Pierre Ynard
Filippo Carone
Loïc Minier
Luca Barbato
Lucas C. Villa Real
Lukas Durfina
Adrien Maglo
Marc Ariberti
Mark Lee
Mark Moriarty
Martin Storsjö
Christophe Massiot
Michel Kaempf
Marian Ďurkovič
Mirsal Ennaime
Carlo Calabrò
Damien Lucas
Naohiro Koriyama
Basos G
Pierre Baillet
Vincent Penquerc'h
Olivier Aubert
Pankaj Yadav
Paul Corke
Pierre d'Herbemont
Philippe Morin
Antoine Lejeune
Michael Ploujnikov
Jean-Marc Dressler
Michael Hanselmann
Rafaël Carré
Ramiro Polla
Rémi Denis-Courmont
Renaud Dartus
Richard Shepherd
Faustino Osuna
Arnaud Vallat
Rob Jonson
Robert Jedrzejczyk
Steve Lhomme
Rocky Bernstein
Romain Goyet
Rov Juvano
Sam Hocevar
Martin T. H. Sandsmark
Sebastian Birk
Sébastien Escudier
Vincent Seguin
Fabio Ritrovato
Sigmund Augdal Helberg
Casian Andrei
Srikanth Raju
Hannes Domani
Stéphane Borel
Stephan Krempel
Stephan Assmus
Tony Castley
Pavlov Konstantin
Eric Petit
Tanguy Krotoff
Dennis van Amerongen
Michel Lespinasse
Can Wu
Xavier Marchesini
Sébastien Toque
Christophe Mutricy
Yoann Peronneau
Yohann Martineau
Yuval Tze
Scott Caudle
Clément Stenac
It is possible, that some minor piece of code was badly tracked, for
some reasons (SVN, mainly) or that some small developers did not answer.
However, as an "œuvre collective", defined as in "CPI 113-2 alinéa 3",
and seeing "Cour. Cass. 17 Mai 1978", and seeing that the editor and
the very vast majority of developers have agreed (> 99.99% of the code,
> 99% of developers), we are fine here.
2011-11-28 04:44:15 +08:00
|
|
|
* You should have received a copy of the GNU Lesser 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.
|
2007-06-23 20:10:00 +08:00
|
|
|
*****************************************************************************/
|
|
|
|
|
2009-08-31 21:14:05 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2007-06-23 20:10:00 +08:00
|
|
|
#include <vlc/libvlc.h>
|
2009-05-25 16:47:38 +08:00
|
|
|
#include <vlc/libvlc_media.h>
|
|
|
|
#include <vlc/libvlc_media_player.h>
|
|
|
|
|
|
|
|
#include <vlc_common.h>
|
2007-06-23 20:10:00 +08:00
|
|
|
#include <vlc_input.h>
|
|
|
|
#include <vlc_vout.h>
|
|
|
|
|
2009-05-25 16:47:38 +08:00
|
|
|
#include "media_player_internal.h"
|
2009-09-08 03:13:49 +08:00
|
|
|
#include <assert.h>
|
2009-05-25 16:47:38 +08:00
|
|
|
|
2007-06-23 20:10:00 +08:00
|
|
|
/*
|
2008-06-13 20:54:07 +08:00
|
|
|
* Remember to release the returned vout_thread_t.
|
2007-06-23 20:10:00 +08:00
|
|
|
*/
|
2010-02-02 01:47:45 +08:00
|
|
|
static vout_thread_t **GetVouts( libvlc_media_player_t *p_mi, size_t *n )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input = libvlc_get_input_thread( p_mi );
|
2010-02-02 01:47:45 +08:00
|
|
|
if( !p_input )
|
2010-06-27 22:09:24 +08:00
|
|
|
{
|
|
|
|
*n = 0;
|
2010-02-02 01:47:45 +08:00
|
|
|
return NULL;
|
2010-06-27 22:09:24 +08:00
|
|
|
}
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t **pp_vouts;
|
|
|
|
if (input_Control( p_input, INPUT_GET_VOUTS, &pp_vouts, n))
|
2010-02-01 01:52:07 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
*n = 0;
|
|
|
|
pp_vouts = NULL;
|
2010-02-01 01:52:07 +08:00
|
|
|
}
|
2010-02-02 01:47:45 +08:00
|
|
|
vlc_object_release (p_input);
|
|
|
|
return pp_vouts;
|
|
|
|
}
|
|
|
|
|
|
|
|
static vout_thread_t *GetVout (libvlc_media_player_t *mp, size_t num)
|
|
|
|
{
|
|
|
|
vout_thread_t *p_vout = NULL;
|
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (mp, &n);
|
|
|
|
if (pp_vouts == NULL)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (num < n)
|
|
|
|
p_vout = pp_vouts[num];
|
|
|
|
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
|
|
if (i != num)
|
|
|
|
vlc_object_release (pp_vouts[i]);
|
|
|
|
free (pp_vouts);
|
|
|
|
|
|
|
|
if (p_vout == NULL)
|
|
|
|
err:
|
|
|
|
libvlc_printerr ("Video output not active");
|
2007-06-23 20:10:00 +08:00
|
|
|
return p_vout;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
* Exported functions
|
|
|
|
**********************************************************************/
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
/* This will work even if the video is not currently active */
|
|
|
|
var_SetBool (p_mi, "fullscreen", !!b_fullscreen);
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
/* Apply to current video outputs (if any) */
|
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
|
|
{
|
|
|
|
var_SetBool (pp_vouts[i], "fullscreen", b_fullscreen);
|
|
|
|
vlc_object_release (pp_vouts[i]);
|
|
|
|
}
|
|
|
|
free (pp_vouts);
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_get_fullscreen( libvlc_media_player_t *p_mi )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
return var_GetBool (p_mi, "fullscreen");
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-10 23:50:18 +08:00
|
|
|
bool b_fullscreen = var_ToggleBool (p_mi, "fullscreen");
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
/* Apply to current video outputs (if any) */
|
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
|
|
{
|
|
|
|
vout_thread_t *p_vout = pp_vouts[i];
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
var_SetBool (p_vout, "fullscreen", b_fullscreen);
|
|
|
|
vlc_object_release (p_vout);
|
|
|
|
}
|
|
|
|
free (pp_vouts);
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2009-10-30 05:14:31 +08:00
|
|
|
void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on )
|
|
|
|
{
|
2010-02-01 00:56:56 +08:00
|
|
|
var_SetBool (p_mi, "keyboard-events", !!on);
|
2009-10-30 05:14:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on )
|
|
|
|
{
|
2010-02-01 00:56:56 +08:00
|
|
|
var_SetBool (p_mi, "mouse-events", !!on);
|
2009-10-30 05:14:31 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int
|
|
|
|
libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num,
|
|
|
|
const char *psz_filepath,
|
|
|
|
unsigned int i_width, unsigned int i_height )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2009-09-08 03:13:49 +08:00
|
|
|
assert( psz_filepath );
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t *p_vout = GetVout (p_mi, num);
|
|
|
|
if (p_vout == NULL)
|
|
|
|
return -1;
|
2009-05-20 17:15:43 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
/* FIXME: This is not atomic. Someone else could change the values,
|
|
|
|
* at least in theory. */
|
|
|
|
var_SetInteger( p_vout, "snapshot-width", i_width);
|
2009-05-20 17:15:43 +08:00
|
|
|
var_SetInteger( p_vout, "snapshot-height", i_height );
|
2007-06-23 20:10:00 +08:00
|
|
|
var_SetString( p_vout, "snapshot-path", psz_filepath );
|
|
|
|
var_SetString( p_vout, "snapshot-format", "png" );
|
2010-10-25 23:28:45 +08:00
|
|
|
var_TriggerCallback( p_vout, "video-snapshot" );
|
|
|
|
vlc_object_release( p_vout );
|
2010-02-02 01:47:45 +08:00
|
|
|
return 0;
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
|
|
|
|
unsigned *restrict px, unsigned *restrict py )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-04-18 09:57:26 +08:00
|
|
|
#if 0
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t *p_vout = GetVout (p_mi, num);
|
|
|
|
if (p_vout == NULL)
|
|
|
|
return -1;
|
2008-06-13 21:36:44 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
*px = p_vout->i_window_height;
|
|
|
|
*py = p_vout->i_window_width;
|
|
|
|
vlc_object_release (p_vout);
|
|
|
|
return 0;
|
2010-04-18 09:57:26 +08:00
|
|
|
#else
|
|
|
|
return -1;
|
|
|
|
#endif
|
2010-02-02 01:47:45 +08:00
|
|
|
}
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_get_height( libvlc_media_player_t *p_mi )
|
|
|
|
{
|
|
|
|
unsigned height, width;
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if (libvlc_video_get_size (p_mi, 0, &height, &width))
|
|
|
|
return 0;
|
2008-06-13 21:36:44 +08:00
|
|
|
return height;
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_get_width( libvlc_media_player_t *p_mi )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
unsigned height, width;
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if (libvlc_video_get_size (p_mi, 0, &height, &width))
|
|
|
|
return 0;
|
2008-06-13 21:38:23 +08:00
|
|
|
return width;
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-12 00:26:54 +08:00
|
|
|
int libvlc_video_get_cursor( libvlc_media_player_t *mp, unsigned num,
|
2010-02-14 01:50:51 +08:00
|
|
|
int *restrict px, int *restrict py )
|
2010-02-12 00:26:54 +08:00
|
|
|
{
|
|
|
|
vout_thread_t *p_vout = GetVout (mp, num);
|
|
|
|
if (p_vout == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2010-02-14 01:50:51 +08:00
|
|
|
var_GetCoords (p_vout, "mouse-moved", px, py);
|
2010-02-12 00:26:54 +08:00
|
|
|
vlc_object_release (p_vout);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_mi )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
|
|
vlc_object_release (pp_vouts[i]);
|
|
|
|
free (pp_vouts);
|
|
|
|
return n;
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
float libvlc_video_get_scale( libvlc_media_player_t *mp )
|
2009-05-14 02:43:25 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
float f_scale = var_GetFloat (mp, "scale");
|
|
|
|
if (var_GetBool (mp, "autoscale"))
|
2009-05-14 02:43:25 +08:00
|
|
|
f_scale = 0.;
|
|
|
|
return f_scale;
|
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale )
|
2009-05-14 02:43:25 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
if (f_scale != 0.)
|
|
|
|
var_SetFloat (p_mp, "scale", f_scale);
|
2010-06-27 07:13:57 +08:00
|
|
|
var_SetBool (p_mp, "autoscale", f_scale == 0.);
|
2010-02-02 01:47:45 +08:00
|
|
|
|
|
|
|
/* Apply to current video outputs (if any) */
|
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mp, &n);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
|
|
{
|
|
|
|
vout_thread_t *p_vout = pp_vouts[i];
|
2009-05-14 02:43:25 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if (f_scale != 0.)
|
|
|
|
var_SetFloat (p_vout, "scale", f_scale);
|
2010-06-27 07:13:57 +08:00
|
|
|
var_SetBool (p_vout, "autoscale", f_scale == 0.);
|
2010-02-02 01:47:45 +08:00
|
|
|
vlc_object_release (p_vout);
|
|
|
|
}
|
|
|
|
free (pp_vouts);
|
2009-05-14 02:43:25 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
return var_GetNonEmptyString (p_mi, "aspect-ratio");
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2008-03-30 09:59:32 +08:00
|
|
|
void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
|
2010-02-02 01:47:45 +08:00
|
|
|
const char *psz_aspect )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
if (psz_aspect == NULL)
|
|
|
|
psz_aspect = "";
|
|
|
|
var_SetString (p_mi, "aspect-ratio", psz_aspect);
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
2009-09-08 03:13:49 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t *p_vout = pp_vouts[i];
|
|
|
|
|
|
|
|
var_SetString (p_vout, "aspect-ratio", psz_aspect);
|
|
|
|
vlc_object_release (p_vout);
|
2009-09-08 03:13:49 +08:00
|
|
|
}
|
2010-02-02 01:47:45 +08:00
|
|
|
free (pp_vouts);
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_get_spu( libvlc_media_player_t *p_mi )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
|
2007-06-23 20:10:00 +08:00
|
|
|
vlc_value_t val_list;
|
|
|
|
vlc_value_t val;
|
|
|
|
int i_spu = -1;
|
|
|
|
int i_ret = -1;
|
|
|
|
int i;
|
|
|
|
|
2010-02-01 01:52:07 +08:00
|
|
|
if( !p_input_thread )
|
|
|
|
{
|
|
|
|
libvlc_printerr( "No active input" );
|
|
|
|
return -1;
|
|
|
|
}
|
2007-06-23 20:10:00 +08:00
|
|
|
|
|
|
|
i_ret = var_Get( p_input_thread, "spu-es", &val );
|
|
|
|
if( i_ret < 0 )
|
|
|
|
{
|
|
|
|
vlc_object_release( p_input_thread );
|
2010-07-29 03:03:32 +08:00
|
|
|
libvlc_printerr( "Subtitle information not found" );
|
2010-02-02 01:47:45 +08:00
|
|
|
return -1;
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
|
|
|
|
for( i = 0; i < val_list.p_list->i_count; i++ )
|
|
|
|
{
|
2009-05-20 18:24:05 +08:00
|
|
|
if( val.i_int == val_list.p_list->p_values[i].i_int )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
|
|
|
i_spu = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-05-20 01:51:02 +08:00
|
|
|
var_FreeList( &val_list, NULL );
|
2007-06-23 20:10:00 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
|
|
|
return i_spu;
|
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
|
2009-05-20 18:24:05 +08:00
|
|
|
int i_spu_count;
|
2008-10-12 22:40:30 +08:00
|
|
|
|
|
|
|
if( !p_input_thread )
|
2010-02-02 01:47:45 +08:00
|
|
|
return 0;
|
2008-10-12 22:40:30 +08:00
|
|
|
|
2009-05-21 02:34:36 +08:00
|
|
|
i_spu_count = var_CountChoices( p_input_thread, "spu-es" );
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
2009-05-20 18:24:05 +08:00
|
|
|
return i_spu_count;
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
libvlc_track_description_t *
|
2010-02-01 03:05:24 +08:00
|
|
|
libvlc_video_get_spu_description( libvlc_media_player_t *p_mi )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
return libvlc_get_track_description( p_mi, "spu-es" );
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
|
2010-02-02 01:47:45 +08:00
|
|
|
vlc_value_t list;
|
|
|
|
int i_ret = 0;
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-01 01:52:07 +08:00
|
|
|
if( !p_input_thread )
|
2010-02-02 01:47:45 +08:00
|
|
|
return -1;
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
var_Change (p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &list, NULL);
|
2009-03-07 00:19:13 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if (i_spu > (unsigned)list.p_list->i_count)
|
2009-03-07 00:19:13 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
libvlc_printerr( "Subtitle number out of range (%u/%u)",
|
|
|
|
i_spu, list.p_list->i_count );
|
|
|
|
i_ret = -1;
|
2009-05-20 18:24:05 +08:00
|
|
|
goto end;
|
2008-10-03 19:56:45 +08:00
|
|
|
}
|
2010-02-02 01:47:45 +08:00
|
|
|
var_SetInteger (p_input_thread, "spu-es",
|
|
|
|
list.p_list->p_values[i_spu].i_int);
|
2009-05-20 18:24:05 +08:00
|
|
|
end:
|
2010-02-02 01:47:45 +08:00
|
|
|
vlc_object_release (p_input_thread);
|
|
|
|
var_FreeList (&list, NULL);
|
|
|
|
return i_ret;
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2008-05-07 09:52:51 +08:00
|
|
|
int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
|
2010-02-01 03:05:24 +08:00
|
|
|
const char *psz_subtitle )
|
2008-05-07 09:52:51 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
|
2008-05-07 09:52:51 +08:00
|
|
|
bool b_ret = false;
|
|
|
|
|
|
|
|
if( p_input_thread )
|
|
|
|
{
|
2008-12-09 03:54:28 +08:00
|
|
|
if( !input_AddSubtitle( p_input_thread, psz_subtitle, true ) )
|
2008-05-07 09:52:51 +08:00
|
|
|
b_ret = true;
|
|
|
|
vlc_object_release( p_input_thread );
|
|
|
|
}
|
|
|
|
return b_ret;
|
|
|
|
}
|
|
|
|
|
2008-10-12 22:40:30 +08:00
|
|
|
libvlc_track_description_t *
|
2010-02-01 03:05:24 +08:00
|
|
|
libvlc_video_get_title_description( libvlc_media_player_t *p_mi )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
return libvlc_get_track_description( p_mi, "title" );
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
libvlc_track_description_t *
|
|
|
|
libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi,
|
2010-02-01 03:05:24 +08:00
|
|
|
int i_title )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
|
|
|
char psz_title[12];
|
|
|
|
sprintf( psz_title, "title %2i", i_title );
|
2010-02-01 01:52:07 +08:00
|
|
|
return libvlc_get_track_description( p_mi, psz_title );
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
char *libvlc_video_get_crop_geometry (libvlc_media_player_t *p_mi)
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
return var_GetNonEmptyString (p_mi, "crop");
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2008-03-30 09:59:32 +08:00
|
|
|
void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
|
2010-02-02 01:47:45 +08:00
|
|
|
const char *psz_geometry )
|
2007-06-23 20:10:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
if (psz_geometry == NULL)
|
|
|
|
psz_geometry = "";
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
var_SetString (p_mi, "crop", psz_geometry);
|
2007-06-23 20:10:00 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
|
2009-09-08 03:13:49 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
for (size_t i = 0; i < n; i++)
|
2009-09-08 03:13:49 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t *p_vout = pp_vouts[i];
|
2010-07-02 10:43:25 +08:00
|
|
|
vlc_value_t val;
|
|
|
|
|
|
|
|
/* Make sure the geometry is in the choice list */
|
|
|
|
/* Earlier choices are removed to not grow a long list over time. */
|
|
|
|
/* FIXME: not atomic - lock? */
|
|
|
|
val.psz_string = (char *)psz_geometry;
|
|
|
|
var_Change (p_vout, "crop", VLC_VAR_CLEARCHOICES, NULL, NULL);
|
|
|
|
var_Change (p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &val);
|
2010-02-02 01:47:45 +08:00
|
|
|
var_SetString (p_vout, "crop", psz_geometry);
|
|
|
|
vlc_object_release (p_vout);
|
2009-09-08 03:13:49 +08:00
|
|
|
}
|
2010-02-02 01:47:45 +08:00
|
|
|
free (pp_vouts);
|
2007-06-23 20:10:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-04 22:37:24 +08:00
|
|
|
int libvlc_video_get_teletext( libvlc_media_player_t *p_mi )
|
|
|
|
{
|
2010-02-07 00:56:17 +08:00
|
|
|
return var_GetInteger (p_mi, "vbi-page");
|
2010-02-04 22:37:24 +08:00
|
|
|
}
|
|
|
|
|
2010-02-07 00:56:17 +08:00
|
|
|
void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page )
|
2010-02-04 22:37:24 +08:00
|
|
|
{
|
|
|
|
input_thread_t *p_input_thread;
|
|
|
|
vlc_object_t *p_zvbi = NULL;
|
|
|
|
int telx;
|
|
|
|
|
2010-02-07 00:56:17 +08:00
|
|
|
var_SetInteger (p_mi, "vbi-page", i_page);
|
|
|
|
|
2010-02-04 22:37:24 +08:00
|
|
|
p_input_thread = libvlc_get_input_thread( p_mi );
|
|
|
|
if( !p_input_thread ) return;
|
|
|
|
|
|
|
|
if( var_CountChoices( p_input_thread, "teletext-es" ) <= 0 )
|
|
|
|
{
|
|
|
|
vlc_object_release( p_input_thread );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
telx = var_GetInteger( p_input_thread, "teletext-es" );
|
|
|
|
if( input_GetEsObjects( p_input_thread, telx, &p_zvbi, NULL, NULL )
|
2010-02-07 00:56:17 +08:00
|
|
|
== VLC_SUCCESS )
|
2010-02-04 22:37:24 +08:00
|
|
|
{
|
2010-02-07 00:56:17 +08:00
|
|
|
var_SetInteger( p_zvbi, "vbi-page", i_page );
|
2010-02-04 22:37:24 +08:00
|
|
|
vlc_object_release( p_zvbi );
|
|
|
|
}
|
|
|
|
vlc_object_release( p_input_thread );
|
|
|
|
}
|
|
|
|
|
2010-02-01 03:05:24 +08:00
|
|
|
void libvlc_toggle_teletext( libvlc_media_player_t *p_mi )
|
2007-12-18 17:04:24 +08:00
|
|
|
{
|
2008-09-29 18:56:21 +08:00
|
|
|
input_thread_t *p_input_thread;
|
2007-12-18 17:04:24 +08:00
|
|
|
|
2010-02-01 01:52:07 +08:00
|
|
|
p_input_thread = libvlc_get_input_thread(p_mi);
|
2008-09-29 18:56:21 +08:00
|
|
|
if( !p_input_thread ) return;
|
2007-12-18 17:04:24 +08:00
|
|
|
|
2009-02-14 04:25:53 +08:00
|
|
|
if( var_CountChoices( p_input_thread, "teletext-es" ) <= 0 )
|
2008-09-29 18:56:21 +08:00
|
|
|
{
|
2009-02-14 04:25:53 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
const bool b_selected = var_GetInteger( p_input_thread, "teletext-es" ) >= 0;
|
2009-09-08 03:13:49 +08:00
|
|
|
if( b_selected )
|
2009-02-14 04:25:53 +08:00
|
|
|
{
|
|
|
|
var_SetInteger( p_input_thread, "spu-es", -1 );
|
|
|
|
}
|
2008-09-29 18:56:21 +08:00
|
|
|
else
|
|
|
|
{
|
2009-02-14 04:25:53 +08:00
|
|
|
vlc_value_t list;
|
|
|
|
if( !var_Change( p_input_thread, "teletext-es", VLC_VAR_GETLIST, &list, NULL ) )
|
2008-09-29 18:56:21 +08:00
|
|
|
{
|
2009-02-14 04:25:53 +08:00
|
|
|
if( list.p_list->i_count > 0 )
|
|
|
|
var_SetInteger( p_input_thread, "spu-es", list.p_list->p_values[0].i_int );
|
2008-09-29 18:56:21 +08:00
|
|
|
|
2009-05-20 01:51:02 +08:00
|
|
|
var_FreeList( &list, NULL );
|
2008-09-29 18:56:21 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
vlc_object_release( p_input_thread );
|
2007-12-18 17:04:24 +08:00
|
|
|
}
|
|
|
|
|
2010-02-01 03:05:24 +08:00
|
|
|
int libvlc_video_get_track_count( libvlc_media_player_t *p_mi )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
|
2009-05-20 18:24:05 +08:00
|
|
|
int i_track_count;
|
2008-10-12 22:40:30 +08:00
|
|
|
|
|
|
|
if( !p_input_thread )
|
|
|
|
return -1;
|
|
|
|
|
2009-05-21 02:34:36 +08:00
|
|
|
i_track_count = var_CountChoices( p_input_thread, "video-es" );
|
2009-05-20 18:24:05 +08:00
|
|
|
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
2009-05-20 18:24:05 +08:00
|
|
|
return i_track_count;
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
libvlc_track_description_t *
|
2010-02-01 03:05:24 +08:00
|
|
|
libvlc_video_get_track_description( libvlc_media_player_t *p_mi )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
return libvlc_get_track_description( p_mi, "video-es" );
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_get_track( libvlc_media_player_t *p_mi )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_value_t val_list;
|
|
|
|
vlc_value_t val;
|
|
|
|
int i_track = -1;
|
|
|
|
|
|
|
|
if( !p_input_thread )
|
|
|
|
return -1;
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if( var_Get( p_input_thread, "video-es", &val ) < 0 )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2009-09-08 03:13:49 +08:00
|
|
|
libvlc_printerr( "Video track information not found" );
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
2010-02-01 01:52:07 +08:00
|
|
|
return -1;
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
|
2010-02-02 01:47:45 +08:00
|
|
|
for( int i = 0; i < val_list.p_list->i_count; i++ )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2009-05-20 18:24:05 +08:00
|
|
|
if( val_list.p_list->p_values[i].i_int == val.i_int )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
|
|
|
i_track = i;
|
|
|
|
break;
|
2009-05-20 18:24:05 +08:00
|
|
|
}
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
2009-05-20 01:51:02 +08:00
|
|
|
var_FreeList( &val_list, NULL );
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
|
|
|
return i_track;
|
|
|
|
}
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-01 01:52:07 +08:00
|
|
|
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_value_t val_list;
|
|
|
|
int i_ret = -1;
|
|
|
|
|
|
|
|
if( !p_input_thread )
|
2010-02-02 01:47:45 +08:00
|
|
|
return -1;
|
2008-10-12 22:40:30 +08:00
|
|
|
|
|
|
|
var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
|
2010-02-02 01:47:45 +08:00
|
|
|
for( int i = 0; i < val_list.p_list->i_count; i++ )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2009-09-08 03:13:49 +08:00
|
|
|
if( i_track == val_list.p_list->p_values[i].i_int )
|
2008-10-12 22:40:30 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
if( var_SetInteger( p_input_thread, "video-es", i_track ) < 0 )
|
2009-09-08 03:13:49 +08:00
|
|
|
break;
|
2010-02-02 01:47:45 +08:00
|
|
|
i_ret = 0;
|
2009-05-20 18:24:05 +08:00
|
|
|
goto end;
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
|
|
|
}
|
2009-09-08 03:13:49 +08:00
|
|
|
libvlc_printerr( "Video track number out of range" );
|
2009-05-20 18:24:05 +08:00
|
|
|
end:
|
2009-05-20 01:51:02 +08:00
|
|
|
var_FreeList( &val_list, NULL );
|
2008-10-12 22:40:30 +08:00
|
|
|
vlc_object_release( p_input_thread );
|
2010-02-02 01:47:45 +08:00
|
|
|
return i_ret;
|
2008-10-12 22:40:30 +08:00
|
|
|
}
|
2009-05-29 20:25:45 +08:00
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* libvlc_video_set_deinterlace : enable deinterlace
|
|
|
|
*****************************************************************************/
|
2010-02-02 01:47:45 +08:00
|
|
|
void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
|
|
|
|
const char *psz_mode )
|
|
|
|
{
|
|
|
|
if (psz_mode == NULL)
|
|
|
|
psz_mode = "";
|
|
|
|
if (*psz_mode
|
2011-03-29 03:28:20 +08:00
|
|
|
&& strcmp (psz_mode, "blend") && strcmp (psz_mode, "bob")
|
|
|
|
&& strcmp (psz_mode, "discard") && strcmp (psz_mode, "linear")
|
|
|
|
&& strcmp (psz_mode, "mean") && strcmp (psz_mode, "x")
|
|
|
|
&& strcmp (psz_mode, "yadif") && strcmp (psz_mode, "yadif2x")
|
2011-04-01 02:48:22 +08:00
|
|
|
&& strcmp (psz_mode, "phosphor") && strcmp (psz_mode, "ivtc"))
|
2009-05-29 20:25:45 +08:00
|
|
|
return;
|
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if (*psz_mode)
|
2009-05-29 20:25:45 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
var_SetString (p_mi, "deinterlace-mode", psz_mode);
|
|
|
|
var_SetInteger (p_mi, "deinterlace", 1);
|
2009-05-29 20:25:45 +08:00
|
|
|
}
|
|
|
|
else
|
2010-02-02 01:47:45 +08:00
|
|
|
var_SetInteger (p_mi, "deinterlace", 0);
|
|
|
|
|
|
|
|
size_t n;
|
|
|
|
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
2009-05-29 20:25:45 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t *p_vout = pp_vouts[i];
|
2009-05-29 20:25:45 +08:00
|
|
|
|
2010-02-02 01:47:45 +08:00
|
|
|
if (*psz_mode)
|
|
|
|
{
|
|
|
|
var_SetString (p_vout, "deinterlace-mode", psz_mode);
|
|
|
|
var_SetInteger (p_vout, "deinterlace", 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
var_SetInteger (p_vout, "deinterlace", 0);
|
|
|
|
vlc_object_release (p_vout);
|
|
|
|
}
|
|
|
|
free (pp_vouts);
|
2009-05-29 20:25:45 +08:00
|
|
|
}
|
2009-06-23 15:46:00 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
/* ************** */
|
|
|
|
/* module helpers */
|
|
|
|
/* ************** */
|
|
|
|
|
2009-06-23 15:46:00 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
const char *name )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
vlc_object_t *object;
|
|
|
|
vout_thread_t *vout = GetVout( p_mi, 0 );
|
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
if( vout )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2011-05-27 00:32:40 +08:00
|
|
|
object = vlc_object_find_name( vout, name );
|
2010-01-26 23:06:14 +08:00
|
|
|
vlc_object_release(vout);
|
|
|
|
}
|
2010-02-07 02:18:35 +08:00
|
|
|
else
|
|
|
|
object = NULL;
|
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
if( !object )
|
|
|
|
libvlc_printerr( "%s not enabled", name );
|
|
|
|
return object;
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
typedef const struct {
|
2010-02-07 00:59:43 +08:00
|
|
|
const char name[20];
|
2010-02-01 03:05:24 +08:00
|
|
|
unsigned type;
|
2010-01-26 23:06:14 +08:00
|
|
|
} opt_t;
|
2009-06-23 15:46:00 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
|
|
|
|
static void
|
2010-02-07 02:18:35 +08:00
|
|
|
set_int( libvlc_media_player_t *p_mi, const char *restrict name,
|
|
|
|
const opt_t *restrict opt, int value )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-01-26 23:06:14 +08:00
|
|
|
if( !opt ) return;
|
|
|
|
|
|
|
|
if( !opt->type ) /* the enabler */
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-02-02 01:47:45 +08:00
|
|
|
vout_thread_t *vout = GetVout( p_mi, 0 );
|
2010-01-26 23:06:14 +08:00
|
|
|
if (vout)
|
|
|
|
{
|
|
|
|
vout_EnableFilter( vout, opt->name, value, false );
|
|
|
|
vlc_object_release( vout );
|
|
|
|
}
|
|
|
|
return;
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-07 02:18:35 +08:00
|
|
|
if( opt->type != VLC_VAR_INTEGER )
|
|
|
|
{
|
|
|
|
libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
|
|
|
|
return;
|
|
|
|
}
|
2010-01-26 23:06:14 +08:00
|
|
|
|
2010-02-07 02:18:35 +08:00
|
|
|
var_SetInteger(p_mi, opt->name, value);
|
|
|
|
vlc_object_t *object = get_object( p_mi, name );
|
|
|
|
if( object )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-01-26 23:06:14 +08:00
|
|
|
var_SetInteger(object, opt->name, value);
|
2010-02-07 02:18:35 +08:00
|
|
|
vlc_object_release( object );
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
2010-01-26 23:06:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2010-02-07 02:18:35 +08:00
|
|
|
get_int( libvlc_media_player_t *p_mi, const char *restrict name,
|
|
|
|
const opt_t *restrict opt )
|
2010-01-26 23:06:14 +08:00
|
|
|
{
|
|
|
|
if( !opt ) return 0;
|
2009-08-29 01:15:25 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
switch( opt->type )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
case 0: /* the enabler */
|
|
|
|
{
|
|
|
|
vlc_object_t *object = get_object( p_mi, name );
|
|
|
|
vlc_object_release( object );
|
|
|
|
return object != NULL;
|
|
|
|
}
|
2010-01-26 23:06:14 +08:00
|
|
|
case VLC_VAR_INTEGER:
|
2010-02-07 02:18:35 +08:00
|
|
|
return var_GetInteger(p_mi, opt->name);
|
2010-01-26 23:06:14 +08:00
|
|
|
default:
|
2010-02-07 02:18:35 +08:00
|
|
|
libvlc_printerr( "Invalid argument to %s in %s", name, "get int" );
|
|
|
|
return 0;
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
|
Add adjust filter features to libvlc_media_player/libvlc_video
This patch exposes the adjust module to libvlc_media_player/libvlc_video
and adds a frequently requested featureset: to manipulate brightness,
contrast, gamma, saturation and hue through libvlc. The patch introduces
a new set of functions analogous to
libvlc_video_{get,set}_{marq,logo}_*, hence the use of the function set
should be self explanatory.
New Functions:
* value = libvlc_video_get_adjust_int( p_mi, option );
* libvlc_video_set_adjust_int( p_mi, option, value );
* value = libvlc_video_get_adjust_float( p_mi, option );
* libvlc_video_set_adjust_float( p_mi, option, value );
New Options:
* libvlc_adjust_Enable
* libvlc_adjust_Contrast
* libvlc_adjust_Brightness
* libvlc_adjust_Hue
* libvlc_adjust_Saturation
* libvlc_adjust_Gamma
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
2010-06-24 08:16:04 +08:00
|
|
|
static void
|
|
|
|
set_float( libvlc_media_player_t *p_mi, const char *restrict name,
|
|
|
|
const opt_t *restrict opt, float value )
|
|
|
|
{
|
|
|
|
if( !opt ) return;
|
|
|
|
|
|
|
|
if( opt->type != VLC_VAR_FLOAT )
|
|
|
|
{
|
|
|
|
libvlc_printerr( "Invalid argument to %s in %s", name, "set float" );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
var_SetFloat( p_mi, opt->name, value );
|
|
|
|
|
|
|
|
vlc_object_t *object = get_object( p_mi, name );
|
|
|
|
if( object )
|
|
|
|
{
|
|
|
|
var_SetFloat(object, opt->name, value );
|
|
|
|
vlc_object_release( object );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static float
|
|
|
|
get_float( libvlc_media_player_t *p_mi, const char *restrict name,
|
|
|
|
const opt_t *restrict opt )
|
|
|
|
{
|
|
|
|
if( !opt ) return 0.0;
|
|
|
|
|
|
|
|
|
|
|
|
if( opt->type != VLC_VAR_FLOAT )
|
|
|
|
{
|
|
|
|
libvlc_printerr( "Invalid argument to %s in %s", name, "get float" );
|
|
|
|
return 0.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return var_GetFloat( p_mi, opt->name );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
static void
|
2010-02-07 02:18:35 +08:00
|
|
|
set_string( libvlc_media_player_t *p_mi, const char *restrict name,
|
|
|
|
const opt_t *restrict opt, const char *restrict psz_value )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-01-26 23:06:14 +08:00
|
|
|
if( !opt ) return;
|
|
|
|
|
2010-02-07 02:18:35 +08:00
|
|
|
if( opt->type != VLC_VAR_STRING )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
libvlc_printerr( "Invalid argument to %s in %s", name, "set string" );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
var_SetString( p_mi, opt->name, psz_value );
|
|
|
|
|
|
|
|
vlc_object_t *object = get_object( p_mi, name );
|
|
|
|
if( object )
|
|
|
|
{
|
|
|
|
var_SetString(object, opt->name, psz_value );
|
|
|
|
vlc_object_release( object );
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
2010-01-26 23:06:14 +08:00
|
|
|
}
|
2009-08-29 01:15:25 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
|
|
|
|
static char *
|
2010-02-07 02:18:35 +08:00
|
|
|
get_string( libvlc_media_player_t *p_mi, const char *restrict name,
|
|
|
|
const opt_t *restrict opt )
|
2010-01-26 23:06:14 +08:00
|
|
|
{
|
|
|
|
if( !opt ) return NULL;
|
|
|
|
|
2010-02-07 02:18:35 +08:00
|
|
|
if( opt->type != VLC_VAR_STRING )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
libvlc_printerr( "Invalid argument to %s in %s", name, "get string" );
|
|
|
|
return NULL;
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-07 02:18:35 +08:00
|
|
|
return var_GetString( p_mi, opt->name );
|
|
|
|
}
|
2010-01-26 23:06:14 +08:00
|
|
|
|
2009-06-23 15:46:00 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
static const opt_t *
|
2010-02-07 02:18:35 +08:00
|
|
|
marq_option_bynumber(unsigned option)
|
2010-01-26 23:06:14 +08:00
|
|
|
{
|
2010-02-07 02:09:24 +08:00
|
|
|
static const opt_t optlist[] =
|
2010-01-26 23:06:14 +08:00
|
|
|
{
|
|
|
|
{ "marq", 0 },
|
|
|
|
{ "marq-marquee", VLC_VAR_STRING },
|
|
|
|
{ "marq-color", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-opacity", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-position", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-refresh", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-size", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-timeout", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-x", VLC_VAR_INTEGER },
|
|
|
|
{ "marq-y", VLC_VAR_INTEGER },
|
|
|
|
};
|
|
|
|
enum { num_opts = sizeof(optlist) / sizeof(*optlist) };
|
2009-07-01 21:29:53 +08:00
|
|
|
|
2010-06-24 08:19:32 +08:00
|
|
|
const opt_t *r = option < num_opts ? optlist+option : NULL;
|
2010-01-26 23:06:14 +08:00
|
|
|
if( !r )
|
|
|
|
libvlc_printerr( "Unknown marquee option" );
|
|
|
|
return r;
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
|
|
|
|
2010-02-07 02:18:35 +08:00
|
|
|
static vlc_object_t *get_object( libvlc_media_player_t *, const char *);
|
2010-01-26 23:06:14 +08:00
|
|
|
|
2009-06-23 15:46:00 +08:00
|
|
|
/*****************************************************************************
|
2010-01-26 23:06:14 +08:00
|
|
|
* libvlc_video_get_marquee_int : get a marq option value
|
2009-06-23 15:46:00 +08:00
|
|
|
*****************************************************************************/
|
2010-01-26 23:06:14 +08:00
|
|
|
int libvlc_video_get_marquee_int( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option )
|
2009-06-23 15:46:00 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
return get_int( p_mi, "marq", marq_option_bynumber(option) );
|
2009-06-23 15:46:00 +08:00
|
|
|
}
|
2010-01-19 21:35:10 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
* libvlc_video_get_marquee_string : get a marq option value
|
|
|
|
*****************************************************************************/
|
|
|
|
char * libvlc_video_get_marquee_string( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option )
|
2010-01-26 23:06:14 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
return get_string( p_mi, "marq", marq_option_bynumber(option) );
|
2010-01-26 23:06:14 +08:00
|
|
|
}
|
2010-01-19 21:35:10 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
* libvlc_video_set_marquee_int: enable, disable or set an int option
|
|
|
|
*****************************************************************************/
|
|
|
|
void libvlc_video_set_marquee_int( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option, int value )
|
2010-01-26 23:06:14 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
set_int( p_mi, "marq", marq_option_bynumber(option), value );
|
2010-01-26 23:06:14 +08:00
|
|
|
}
|
2010-01-19 21:35:10 +08:00
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
* libvlc_video_set_marquee_string: set a string option
|
|
|
|
*****************************************************************************/
|
|
|
|
void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option, const char * value )
|
2010-01-19 21:35:10 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
set_string( p_mi, "marq", marq_option_bynumber(option), value );
|
2010-01-19 21:35:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-26 23:06:14 +08:00
|
|
|
/* logo module support */
|
2010-01-19 21:35:10 +08:00
|
|
|
|
|
|
|
|
2010-06-24 08:19:32 +08:00
|
|
|
static const opt_t *
|
2010-02-07 02:18:35 +08:00
|
|
|
logo_option_bynumber( unsigned option )
|
2010-01-19 21:35:10 +08:00
|
|
|
{
|
2010-02-07 02:09:24 +08:00
|
|
|
static const opt_t vlogo_optlist[] =
|
|
|
|
/* depends on libvlc_video_logo_option_t */
|
2010-01-19 21:35:10 +08:00
|
|
|
{
|
|
|
|
{ "logo", 0 },
|
|
|
|
{ "logo-file", VLC_VAR_STRING },
|
|
|
|
{ "logo-x", VLC_VAR_INTEGER },
|
|
|
|
{ "logo-y", VLC_VAR_INTEGER },
|
|
|
|
{ "logo-delay", VLC_VAR_INTEGER },
|
|
|
|
{ "logo-repeat", VLC_VAR_INTEGER },
|
|
|
|
{ "logo-opacity", VLC_VAR_INTEGER },
|
|
|
|
{ "logo-position", VLC_VAR_INTEGER },
|
|
|
|
};
|
|
|
|
enum { num_vlogo_opts = sizeof(vlogo_optlist) / sizeof(*vlogo_optlist) };
|
|
|
|
|
2010-06-24 08:19:32 +08:00
|
|
|
const opt_t *r = option < num_vlogo_opts ? vlogo_optlist+option : NULL;
|
2010-01-19 21:35:10 +08:00
|
|
|
if( !r )
|
2010-01-26 23:06:14 +08:00
|
|
|
libvlc_printerr( "Unknown logo option" );
|
2010-01-19 21:35:10 +08:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option, const char *psz_value )
|
2010-01-19 21:35:10 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
set_string( p_mi,"logo",logo_option_bynumber(option),psz_value );
|
2010-01-19 21:35:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option, int value )
|
2010-01-19 21:35:10 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
set_int( p_mi, "logo", logo_option_bynumber(option), value );
|
2010-01-19 21:35:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int libvlc_video_get_logo_int( libvlc_media_player_t *p_mi,
|
2010-02-07 02:18:35 +08:00
|
|
|
unsigned option )
|
2010-01-19 21:35:10 +08:00
|
|
|
{
|
2010-02-07 02:18:35 +08:00
|
|
|
return get_int( p_mi, "logo", logo_option_bynumber(option) );
|
2010-01-26 23:06:14 +08:00
|
|
|
}
|
2010-01-19 21:35:10 +08:00
|
|
|
|
|
|
|
|
Add adjust filter features to libvlc_media_player/libvlc_video
This patch exposes the adjust module to libvlc_media_player/libvlc_video
and adds a frequently requested featureset: to manipulate brightness,
contrast, gamma, saturation and hue through libvlc. The patch introduces
a new set of functions analogous to
libvlc_video_{get,set}_{marq,logo}_*, hence the use of the function set
should be self explanatory.
New Functions:
* value = libvlc_video_get_adjust_int( p_mi, option );
* libvlc_video_set_adjust_int( p_mi, option, value );
* value = libvlc_video_get_adjust_float( p_mi, option );
* libvlc_video_set_adjust_float( p_mi, option, value );
New Options:
* libvlc_adjust_Enable
* libvlc_adjust_Contrast
* libvlc_adjust_Brightness
* libvlc_adjust_Hue
* libvlc_adjust_Saturation
* libvlc_adjust_Gamma
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
2010-06-24 08:16:04 +08:00
|
|
|
/* adjust module support */
|
|
|
|
|
|
|
|
|
2010-06-24 08:19:32 +08:00
|
|
|
static const opt_t *
|
Add adjust filter features to libvlc_media_player/libvlc_video
This patch exposes the adjust module to libvlc_media_player/libvlc_video
and adds a frequently requested featureset: to manipulate brightness,
contrast, gamma, saturation and hue through libvlc. The patch introduces
a new set of functions analogous to
libvlc_video_{get,set}_{marq,logo}_*, hence the use of the function set
should be self explanatory.
New Functions:
* value = libvlc_video_get_adjust_int( p_mi, option );
* libvlc_video_set_adjust_int( p_mi, option, value );
* value = libvlc_video_get_adjust_float( p_mi, option );
* libvlc_video_set_adjust_float( p_mi, option, value );
New Options:
* libvlc_adjust_Enable
* libvlc_adjust_Contrast
* libvlc_adjust_Brightness
* libvlc_adjust_Hue
* libvlc_adjust_Saturation
* libvlc_adjust_Gamma
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
2010-06-24 08:16:04 +08:00
|
|
|
adjust_option_bynumber( unsigned option )
|
|
|
|
{
|
|
|
|
static const opt_t optlist[] =
|
|
|
|
{
|
|
|
|
{ "adjust", 0 },
|
|
|
|
{ "contrast", VLC_VAR_FLOAT },
|
|
|
|
{ "brightness", VLC_VAR_FLOAT },
|
|
|
|
{ "hue", VLC_VAR_INTEGER },
|
|
|
|
{ "saturation", VLC_VAR_FLOAT },
|
|
|
|
{ "gamma", VLC_VAR_FLOAT },
|
|
|
|
};
|
|
|
|
enum { num_opts = sizeof(optlist) / sizeof(*optlist) };
|
|
|
|
|
2010-06-24 08:19:32 +08:00
|
|
|
const opt_t *r = option < num_opts ? optlist+option : NULL;
|
Add adjust filter features to libvlc_media_player/libvlc_video
This patch exposes the adjust module to libvlc_media_player/libvlc_video
and adds a frequently requested featureset: to manipulate brightness,
contrast, gamma, saturation and hue through libvlc. The patch introduces
a new set of functions analogous to
libvlc_video_{get,set}_{marq,logo}_*, hence the use of the function set
should be self explanatory.
New Functions:
* value = libvlc_video_get_adjust_int( p_mi, option );
* libvlc_video_set_adjust_int( p_mi, option, value );
* value = libvlc_video_get_adjust_float( p_mi, option );
* libvlc_video_set_adjust_float( p_mi, option, value );
New Options:
* libvlc_adjust_Enable
* libvlc_adjust_Contrast
* libvlc_adjust_Brightness
* libvlc_adjust_Hue
* libvlc_adjust_Saturation
* libvlc_adjust_Gamma
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
2010-06-24 08:16:04 +08:00
|
|
|
if( !r )
|
|
|
|
libvlc_printerr( "Unknown adjust option" );
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
|
|
|
|
unsigned option, int value )
|
|
|
|
{
|
|
|
|
set_int( p_mi, "adjust", adjust_option_bynumber(option), value );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
|
|
|
|
unsigned option )
|
|
|
|
{
|
|
|
|
return get_int( p_mi, "adjust", adjust_option_bynumber(option) );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
|
|
|
|
unsigned option, float value )
|
|
|
|
{
|
|
|
|
set_float( p_mi, "adjust", adjust_option_bynumber(option), value );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
|
|
|
|
unsigned option )
|
|
|
|
{
|
|
|
|
return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
|
|
|
|
}
|