FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

playbin: remove deprecated raw audio and raw video sink flags

Browse Source 
These flags were deprecated in 2011 with commit
105da803ade859fb299ed3c5265d6acdd168ca8f

Removing these flags will simplify the logic in playbin.
This commit is contained in:
Aaron Boxer 2019-12-19 14:48:43 -05:00 committed by GStreamer Merge Bot
parent 66df967dab
commit 0fb2acab5b
4 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gst/playback/gstplaybin2.c
View File

@ -3110,7 +3110,6 @@ combiner_active_pad_changed (GObject * combiner, GParamSpec * pspec,
switch (combine->type) { switch (combine->type) {
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
property = "current-video"; property = "current-video";
playbin->current_video = get_current_stream_number (playbin, playbin->current_video = get_current_stream_number (playbin,
combine, group->video_channels); combine, group->video_channels);
@ -3124,7 +3123,6 @@ combiner_active_pad_changed (GObject * combiner, GParamSpec * pspec,
} }
break; break;
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
property = "current-audio"; property = "current-audio";
playbin->current_audio = get_current_stream_number (playbin, playbin->current_audio = get_current_stream_number (playbin,
combine, group->audio_channels); combine, group->audio_channels);
@ -3330,11 +3328,9 @@ notify_tags_cb (GObject * object, GParamSpec * pspec, gpointer user_data)
switch (ntdata->type) { switch (ntdata->type) {
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
signal = SIGNAL_VIDEO_TAGS_CHANGED; signal = SIGNAL_VIDEO_TAGS_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
signal = SIGNAL_AUDIO_TAGS_CHANGED; signal = SIGNAL_AUDIO_TAGS_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_TEXT: case GST_PLAY_SINK_TYPE_TEXT:
@ -3560,11 +3556,9 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
switch (combine->type) { switch (combine->type) {
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
signal = SIGNAL_VIDEO_CHANGED; signal = SIGNAL_VIDEO_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
signal = SIGNAL_AUDIO_CHANGED; signal = SIGNAL_AUDIO_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_TEXT: case GST_PLAY_SINK_TYPE_TEXT:
@ -3684,11 +3678,9 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
/* get the correct type-changed signal */ /* get the correct type-changed signal */
switch (combine->type) { switch (combine->type) {
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
signal = SIGNAL_VIDEO_CHANGED; signal = SIGNAL_VIDEO_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
signal = SIGNAL_AUDIO_CHANGED; signal = SIGNAL_AUDIO_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_TEXT: case GST_PLAY_SINK_TYPE_TEXT:

2
gst/playback/gstplaybin3.c
View File

@ -2628,7 +2628,6 @@ combiner_active_pad_changed (GObject * combiner, GParamSpec * pspec,
switch (combine->type) { switch (combine->type) {
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
playbin->current_video = get_current_stream_number (playbin, playbin->current_video = get_current_stream_number (playbin,
combine, channels); combine, channels);
@ -2640,7 +2639,6 @@ combiner_active_pad_changed (GObject * combiner, GParamSpec * pspec,
} }
break; break;
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
playbin->current_audio = get_current_stream_number (playbin, playbin->current_audio = get_current_stream_number (playbin,
combine, channels); combine, channels);

37
gst/playback/gstplaysink.c
View File

@ -179,9 +179,9 @@ typedef struct
#define PENDING_FLAG_IS_SET(playsink, flagtype) \ #define PENDING_FLAG_IS_SET(playsink, flagtype) \
((playsink->pending_blocked_pads) & (1 << flagtype)) ((playsink->pending_blocked_pads) & (1 << flagtype))
#define PENDING_VIDEO_BLOCK(playsink) \ #define PENDING_VIDEO_BLOCK(playsink) \
((playsink->pending_blocked_pads) & (1 << GST_PLAY_SINK_TYPE_VIDEO_RAW | 1 << GST_PLAY_SINK_TYPE_VIDEO)) ((playsink->pending_blocked_pads) & (1 << GST_PLAY_SINK_TYPE_VIDEO))
#define PENDING_AUDIO_BLOCK(playsink) \ #define PENDING_AUDIO_BLOCK(playsink) \
((playsink->pending_blocked_pads) & (1 << GST_PLAY_SINK_TYPE_AUDIO_RAW | 1 << GST_PLAY_SINK_TYPE_AUDIO)) ((playsink->pending_blocked_pads) & (1 << GST_PLAY_SINK_TYPE_AUDIO))
#define PENDING_TEXT_BLOCK(playsink) \ #define PENDING_TEXT_BLOCK(playsink) \
PENDING_FLAG_IS_SET(playsink, GST_PLAY_SINK_TYPE_TEXT) PENDING_FLAG_IS_SET(playsink, GST_PLAY_SINK_TYPE_TEXT)
@ -881,14 +881,12 @@ gst_play_sink_set_sink (GstPlaySink * playsink, GstPlaySinkType type,
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
switch (type) { switch (type) {
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
elem = &playsink->audio_sink; elem = &playsink->audio_sink;
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
sink_type = "audio"; sink_type = "audio";
#endif #endif
break; break;
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
elem = &playsink->video_sink; elem = &playsink->video_sink;
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
sink_type = "video"; sink_type = "video";
@ -941,7 +939,6 @@ gst_play_sink_get_sink (GstPlaySink * playsink, GstPlaySinkType type)
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
switch (type) { switch (type) {
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
{ {
GstPlayAudioChain *chain; GstPlayAudioChain *chain;
if ((chain = (GstPlayAudioChain *) playsink->audiochain)) if ((chain = (GstPlayAudioChain *) playsink->audiochain))
@ -950,7 +947,6 @@ gst_play_sink_get_sink (GstPlaySink * playsink, GstPlaySinkType type)
break; break;
} }
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
{ {
GstPlayVideoChain *chain; GstPlayVideoChain *chain;
if ((chain = (GstPlayVideoChain *) playsink->videochain)) if ((chain = (GstPlayVideoChain *) playsink->videochain))
@ -993,11 +989,9 @@ gst_play_sink_set_filter (GstPlaySink * playsink, GstPlaySinkType type,
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
switch (type) { switch (type) {
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
elem = &playsink->audio_filter; elem = &playsink->audio_filter;
break; break;
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
elem = &playsink->video_filter; elem = &playsink->video_filter;
break; break;
default: default:
@ -1028,7 +1022,6 @@ gst_play_sink_get_filter (GstPlaySink * playsink, GstPlaySinkType type)
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
switch (type) { switch (type) {
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
{ {
GstPlayAudioChain *chain; GstPlayAudioChain *chain;
if ((chain = (GstPlayAudioChain *) playsink->audiochain)) if ((chain = (GstPlayAudioChain *) playsink->audiochain))
@ -1037,7 +1030,6 @@ gst_play_sink_get_filter (GstPlaySink * playsink, GstPlaySinkType type)
break; break;
} }
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
{ {
GstPlayVideoChain *chain; GstPlayVideoChain *chain;
if ((chain = (GstPlayVideoChain *) playsink->videochain)) if ((chain = (GstPlayVideoChain *) playsink->videochain))
@ -1848,8 +1840,7 @@ gen_video_chain (GstPlaySink * playsink, gboolean raw, gboolean async)
/* add the video filter first, so everything is working with post-filter /* add the video filter first, so everything is working with post-filter
* samples */ * samples */
chain->filter = gst_play_sink_get_filter (playsink, chain->filter = gst_play_sink_get_filter (playsink, GST_PLAY_SINK_TYPE_VIDEO);
GST_PLAY_SINK_TYPE_VIDEO_RAW);
if (chain->filter) { if (chain->filter) {
if (!raw) { if (!raw) {
gst_object_unref (chain->filter); gst_object_unref (chain->filter);
@ -2733,8 +2724,7 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw)
/* add the audio filter first, so everything is working with post-filter /* add the audio filter first, so everything is working with post-filter
* samples */ * samples */
chain->filter = gst_play_sink_get_filter (playsink, chain->filter = gst_play_sink_get_filter (playsink, GST_PLAY_SINK_TYPE_AUDIO);
GST_PLAY_SINK_TYPE_AUDIO_RAW);
if (chain->filter) { if (chain->filter) {
if (!raw) { if (!raw) {
gst_object_unref (chain->filter); gst_object_unref (chain->filter);
@ -4260,7 +4250,6 @@ video_set_blocked (GstPlaySink * playsink, gboolean blocked)
sinkpad_blocked_cb, playsink, NULL); sinkpad_blocked_cb, playsink, NULL);
} else if (!blocked && playsink->video_block_id) { } else if (!blocked && playsink->video_block_id) {
gst_pad_remove_probe (opad, playsink->video_block_id); gst_pad_remove_probe (opad, playsink->video_block_id);
PENDING_FLAG_UNSET (playsink, GST_PLAY_SINK_TYPE_VIDEO_RAW);
PENDING_FLAG_UNSET (playsink, GST_PLAY_SINK_TYPE_VIDEO); PENDING_FLAG_UNSET (playsink, GST_PLAY_SINK_TYPE_VIDEO);
playsink->video_block_id = 0; playsink->video_block_id = 0;
playsink->video_pad_blocked = FALSE; playsink->video_pad_blocked = FALSE;
@ -4292,7 +4281,6 @@ audio_set_blocked (GstPlaySink * playsink, gboolean blocked)
playsink->vis_pad_block_id = 0; playsink->vis_pad_block_id = 0;
gst_pad_remove_probe (opad, playsink->audio_block_id); gst_pad_remove_probe (opad, playsink->audio_block_id);
PENDING_FLAG_UNSET (playsink, GST_PLAY_SINK_TYPE_AUDIO_RAW);
PENDING_FLAG_UNSET (playsink, GST_PLAY_SINK_TYPE_AUDIO); PENDING_FLAG_UNSET (playsink, GST_PLAY_SINK_TYPE_AUDIO);
playsink->audio_block_id = 0; playsink->audio_block_id = 0;
playsink->audio_pad_blocked = FALSE; playsink->audio_pad_blocked = FALSE;
@ -4450,13 +4438,11 @@ gst_play_sink_refresh_pad (GstPlaySink * playsink, GstPad * pad,
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
if (pad == playsink->video_pad) { if (pad == playsink->video_pad) {
if (type != GST_PLAY_SINK_TYPE_VIDEO_RAW && if (type != GST_PLAY_SINK_TYPE_VIDEO)
type != GST_PLAY_SINK_TYPE_VIDEO)
goto wrong_type; goto wrong_type;
block_id = &playsink->video_block_id; block_id = &playsink->video_block_id;
} else if (pad == playsink->audio_pad) { } else if (pad == playsink->audio_pad) {
if (type != GST_PLAY_SINK_TYPE_AUDIO_RAW && if (type != GST_PLAY_SINK_TYPE_AUDIO)
type != GST_PLAY_SINK_TYPE_AUDIO)
goto wrong_type; goto wrong_type;
block_id = &playsink->audio_block_id; block_id = &playsink->audio_block_id;
} else if (pad == playsink->text_pad) { } else if (pad == playsink->text_pad) {
@ -4516,7 +4502,6 @@ gst_play_sink_request_pad (GstPlaySink * playsink, GstPlaySinkType type)
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
switch (type) { switch (type) {
case GST_PLAY_SINK_TYPE_AUDIO_RAW:
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
pad_name = "audio_sink"; pad_name = "audio_sink";
if (!playsink->audio_tee) { if (!playsink->audio_tee) {
@ -4550,7 +4535,6 @@ gst_play_sink_request_pad (GstPlaySink * playsink, GstPlaySinkType type)
res = playsink->audio_pad; res = playsink->audio_pad;
block_id = &playsink->audio_block_id; block_id = &playsink->audio_block_id;
break; break;
case GST_PLAY_SINK_TYPE_VIDEO_RAW:
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
pad_name = "video_sink"; pad_name = "video_sink";
if (!playsink->video_pad) { if (!playsink->video_pad) {
@ -4643,14 +4627,11 @@ gst_play_sink_request_new_pad (GstElement * element, GstPadTemplate * templ,
tplname = GST_PAD_TEMPLATE_NAME_TEMPLATE (templ); tplname = GST_PAD_TEMPLATE_NAME_TEMPLATE (templ);
/* Figure out the GstPlaySinkType based on the template */ /* Figure out the GstPlaySinkType based on the template */
if (!strcmp (tplname, "audio_sink")) if (!strcmp (tplname, "audio_sink") || !strcmp (tplname, "audio_raw_sink"))
type = GST_PLAY_SINK_TYPE_AUDIO; type = GST_PLAY_SINK_TYPE_AUDIO;
else if (!strcmp (tplname, "audio_raw_sink")) else if (!strcmp (tplname, "video_sink") ||
type = GST_PLAY_SINK_TYPE_AUDIO_RAW; !strcmp (tplname, "video_raw_sink"))
else if (!strcmp (tplname, "video_sink"))
type = GST_PLAY_SINK_TYPE_VIDEO; type = GST_PLAY_SINK_TYPE_VIDEO;
else if (!strcmp (tplname, "video_raw_sink"))
type = GST_PLAY_SINK_TYPE_VIDEO_RAW;
else if (!strcmp (tplname, "text_sink")) else if (!strcmp (tplname, "text_sink"))
type = GST_PLAY_SINK_TYPE_TEXT; type = GST_PLAY_SINK_TYPE_TEXT;
else else

15
gst/playback/gstplaysink.h
View File

@ -42,25 +42,20 @@ G_BEGIN_DECLS
/** /**
* GstPlaySinkType: * GstPlaySinkType:
* @GST_PLAY_SINK_TYPE_AUDIO: an audio pad * @GST_PLAY_SINK_TYPE_AUDIO: an audio pad
* @GST_PLAY_SINK_TYPE_AUDIO_RAW: a raw audio pad. Deprecated.
* @GST_PLAY_SINK_TYPE_VIDEO: a video pad * @GST_PLAY_SINK_TYPE_VIDEO: a video pad
* @GST_PLAY_SINK_TYPE_VIDEO_RAW: a raw video pad. Deprecated.
* @GST_PLAY_SINK_TYPE_TEXT: a text pad * @GST_PLAY_SINK_TYPE_TEXT: a text pad
* @GST_PLAY_SINK_TYPE_LAST: the last type
* @GST_PLAY_SINK_TYPE_FLUSHING: a flushing pad, used when shutting down * @GST_PLAY_SINK_TYPE_FLUSHING: a flushing pad, used when shutting down
* @GST_PLAY_SINK_TYPE_LAST: the last type
* *
* Types of pads that can be requested from the sinks. * Types of pads that can be requested from the sinks.
*/ */
typedef enum { typedef enum {
GST_PLAY_SINK_TYPE_AUDIO = 0, GST_PLAY_SINK_TYPE_AUDIO = 0,
GST_PLAY_SINK_TYPE_AUDIO_RAW = 1, GST_PLAY_SINK_TYPE_VIDEO = 1,
GST_PLAY_SINK_TYPE_VIDEO = 2, GST_PLAY_SINK_TYPE_TEXT = 2,
GST_PLAY_SINK_TYPE_VIDEO_RAW = 3,
GST_PLAY_SINK_TYPE_TEXT = 4,
GST_PLAY_SINK_TYPE_LAST = 5,
/* this is a dummy pad */ /* this is a dummy pad */
GST_PLAY_SINK_TYPE_FLUSHING = 6 GST_PLAY_SINK_TYPE_FLUSHING = 3,
GST_PLAY_SINK_TYPE_LAST = 4
} GstPlaySinkType; } GstPlaySinkType;
typedef struct _GstPlaySink GstPlaySink; typedef struct _GstPlaySink GstPlaySink;