mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Do not add any audio source when still image

Browse source 
We now have a backgroud so no problem with that.

Fix the testsuite accordingly

Fix #657514
This commit is contained in:
Thibault Saunier 2011-11-30 20:13:09 -03:00
parent 6ed88075d9
commit 0c872c4340
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ges/ges-timeline-file-source.c
View file

@ -356,8 +356,8 @@ ges_timeline_filesource_create_track_object (GESTimelineObject * obj,
if (priv->is_image) {
if (track->type != GES_TRACK_TYPE_VIDEO) {
GST_DEBUG ("Object is still image, creating silent audio source");
res = (GESTrackObject *) ges_track_audio_test_source_new ();
GST_DEBUG ("Object is still image, not adding any audio source");
return NULL;
} else {
GST_DEBUG ("Creating a GESTrackImageSource");
res = (GESTrackObject *) ges_track_image_source_new (priv->uri);

15
tests/check/ges/filesource.c
View file

@ -187,20 +187,9 @@ GST_START_TEST (test_filesource_images)
ges_track_remove_object (v, trobj);
ges_timeline_object_release_track_object (tlobj, trobj);
/* the timeline object should create an audio test source when the is_image
* property is set true */
/* the timeline object should not create any TrackObject in the audio track */
trobj = ges_timeline_object_create_track_object (tlobj, a);
ges_timeline_object_add_track_object (tlobj, trobj);
fail_unless (GES_IS_TRACK_AUDIO_TEST_SOURCE (trobj));
/* The track holds a reference to the object
* And the timelineobject holds a reference to the object */
ASSERT_OBJECT_REFCOUNT (trobj, "Audio Track Object", 2);
ges_track_remove_object (v, trobj);
ges_timeline_object_release_track_object (tlobj, trobj);
fail_unless (trobj == NULL);
g_object_unref (a);
g_object_unref (v);