Commit 1657da9d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

lib: correct and uniformize audio/video track IDs (fixes #7645)

(cherry picked from commit 2c5ee1707b1962ee3f47dbe4abb7c199aeccc022)
parent d6f426a0
...@@ -1143,7 +1143,7 @@ LIBVLC_API libvlc_track_description_t * ...@@ -1143,7 +1143,7 @@ LIBVLC_API libvlc_track_description_t *
* Get current video track. * Get current video track.
* *
* \param p_mi media player * \param p_mi media player
* \return the video track (int) or -1 if none * \return the video track ID (int) or -1 if no active input
*/ */
LIBVLC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi ); LIBVLC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi );
...@@ -1151,7 +1151,7 @@ LIBVLC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi ); ...@@ -1151,7 +1151,7 @@ LIBVLC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi );
* Set video track. * Set video track.
* *
* \param p_mi media player * \param p_mi media player
* \param i_track the track (int) * \param i_track the track ID (i_id field from track description)
* \return 0 on success, -1 if out of range * \return 0 on success, -1 if out of range
*/ */
LIBVLC_API LIBVLC_API
...@@ -1521,7 +1521,7 @@ LIBVLC_API libvlc_track_description_t * ...@@ -1521,7 +1521,7 @@ LIBVLC_API libvlc_track_description_t *
* Get current audio track. * Get current audio track.
* *
* \param p_mi media player * \param p_mi media player
* \return the audio track (int), or -1 if none. * \return the audio track ID or -1 if no active input.
*/ */
LIBVLC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi ); LIBVLC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi );
...@@ -1529,7 +1529,7 @@ LIBVLC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi ); ...@@ -1529,7 +1529,7 @@ LIBVLC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi );
* Set current audio track. * Set current audio track.
* *
* \param p_mi media player * \param p_mi media player
* \param i_track the track (int) * \param i_track the track ID (i_id field from track description)
* \return 0 on success, -1 on error * \return 0 on success, -1 on error
*/ */
LIBVLC_API int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track ); LIBVLC_API int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track );
......
...@@ -384,33 +384,12 @@ libvlc_track_description_t * ...@@ -384,33 +384,12 @@ libvlc_track_description_t *
int libvlc_audio_get_track( libvlc_media_player_t *p_mi ) int libvlc_audio_get_track( libvlc_media_player_t *p_mi )
{ {
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
vlc_value_t val_list;
vlc_value_t val;
int i_track = -1;
int i;
if( !p_input_thread ) if( !p_input_thread )
return -1; return -1;
if( var_Get( p_input_thread, "audio-es", &val ) < 0 ) int id = var_GetInteger( p_input_thread, "audio-es" );
{
vlc_object_release( p_input_thread );
libvlc_printerr( "Audio track information not found" );
return -1;
}
var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( i = 0; i < val_list.p_list->i_count; i++ )
{
if( val_list.p_list->p_values[i].i_int == val.i_int )
{
i_track = i;
break;
}
}
var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return i_track; return id;
} }
/***************************************************************************** /*****************************************************************************
...@@ -420,30 +399,23 @@ int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track ) ...@@ -420,30 +399,23 @@ int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track )
{ {
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
vlc_value_t val_list; vlc_value_t val_list;
vlc_value_t newval;
int i_ret; int i_ret;
if( !p_input_thread ) if( !p_input_thread )
return -1; return -1;
var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL ); var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
if( (i_track < 0) || (i_track > val_list.p_list->i_count) ) for( int i = 0; i < val_list.p_list->i_count; i++ )
{ {
libvlc_printerr( "Audio track out of range" ); if( i_track == val_list.p_list->p_values[i].i_int )
i_ret = -1; {
goto end; if( var_SetInteger( p_input_thread, "audio-es", i_track ) < 0 )
} break;
i_ret = 0;
newval = val_list.p_list->p_values[i_track]; goto end;
i_ret = var_Set( p_input_thread, "audio-es", newval ); }
if( i_ret < 0 )
{
libvlc_printerr( "Audio track out of range" ); /* Race... */
i_ret = -1;
goto end;
} }
i_ret = 0; libvlc_printerr( "Track identifier not found" );
end: end:
var_FreeList( &val_list, NULL ); var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
......
...@@ -543,32 +543,13 @@ libvlc_track_description_t * ...@@ -543,32 +543,13 @@ libvlc_track_description_t *
int libvlc_video_get_track( libvlc_media_player_t *p_mi ) int libvlc_video_get_track( libvlc_media_player_t *p_mi )
{ {
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
vlc_value_t val_list;
vlc_value_t val;
int i_track = -1;
if( !p_input_thread ) if( !p_input_thread )
return -1; return -1;
if( var_Get( p_input_thread, "video-es", &val ) < 0 ) int id = var_GetInteger( p_input_thread, "video-es" );
{
libvlc_printerr( "Video track information not found" );
vlc_object_release( p_input_thread );
return -1;
}
var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( int i = 0; i < val_list.p_list->i_count; i++ )
{
if( val_list.p_list->p_values[i].i_int == val.i_int )
{
i_track = i;
break;
}
}
var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return i_track; return id;
} }
int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track ) int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track )
...@@ -591,7 +572,7 @@ int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track ) ...@@ -591,7 +572,7 @@ int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track )
goto end; goto end;
} }
} }
libvlc_printerr( "Video track number out of range" ); libvlc_printerr( "Track identifier not found" );
end: end:
var_FreeList( &val_list, NULL ); var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
......
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