gst-plugins-base: re-indent with GNU indent 2.2.12

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4182>
This commit is contained in:
Tim-Philipp Müller 2023-03-15 18:51:58 +00:00 committed by GStreamer Marge Bot
parent 574e6b7994
commit 8759b77a50
38 changed files with 253 additions and 253 deletions

View File

@ -499,9 +499,9 @@ theora_enc_get_supported_formats (void)
const char *fourcc; const char *fourcc;
} formats[] = { } formats[] = {
{ {
TH_PF_420, "I420"}, { TH_PF_420, "I420"}, {
TH_PF_422, "Y42B"}, { TH_PF_422, "Y42B"}, {
TH_PF_444, "Y444"} TH_PF_444, "Y444"}
}; };
GString *string = NULL; GString *string = NULL;
guint i; guint i;

View File

@ -607,7 +607,7 @@ check_cap (GstDRMDumbAllocator * alloc)
if (ret) if (ret)
GST_WARNING_OBJECT (alloc, "could not get dumb buffer capability"); GST_WARNING_OBJECT (alloc, "could not get dumb buffer capability");
return ! !(has_dumb); return !!(has_dumb);
} }
#endif #endif
@ -747,7 +747,7 @@ gst_drm_dumb_allocator_has_prime_export (GstAllocator * base_alloc)
if (ret) if (ret)
GST_WARNING_OBJECT (alloc, "could not get prime capability"); GST_WARNING_OBJECT (alloc, "could not get prime capability");
return ! !(has_prime & DRM_PRIME_CAP_EXPORT); return !!(has_prime & DRM_PRIME_CAP_EXPORT);
#else #else
return FALSE; return FALSE;

View File

@ -146,21 +146,21 @@ gst_audio_channel_mixer_fill_compatible (gfloat ** matrix, gint in_channels,
GstAudioChannelPosition pos2[1]; GstAudioChannelPosition pos2[1];
} conv[] = { } conv[] = {
/* front: mono <-> stereo */ /* front: mono <-> stereo */
{ { {{
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, { GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
GST_AUDIO_CHANNEL_POSITION_MONO}}, GST_AUDIO_CHANNEL_POSITION_MONO}},
/* front center: 2 <-> 1 */ /* front center: 2 <-> 1 */
{ { {{
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, { GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}}, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}},
/* rear: 2 <-> 1 */ /* rear: 2 <-> 1 */
{ { {{
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, { GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}}, { { GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}}, {{
GST_AUDIO_CHANNEL_POSITION_INVALID}} GST_AUDIO_CHANNEL_POSITION_INVALID}}
}; };
gint c; gint c;

View File

@ -957,7 +957,7 @@ gst_audio_decoder_setup (GstAudioDecoder * dec)
gst_query_unref (query); gst_query_unref (query);
/* normalize to bool */ /* normalize to bool */
dec->priv->agg = ! !res; dec->priv->agg = !!res;
} }
static GstFlowReturn static GstFlowReturn

View File

@ -358,7 +358,7 @@ kf_factor (int n, int *facbuf)
* It can be freed with free(), rather than a kiss_fft_f32-specific function. * It can be freed with free(), rather than a kiss_fft_f32-specific function.
* */ * */
kiss_fft_f32_cfg kiss_fft_f32_cfg
kiss_fft_f32_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fft_f32_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
kiss_fft_f32_cfg st = NULL; kiss_fft_f32_cfg st = NULL;
size_t memneeded = sizeof (struct kiss_fft_f32_state) size_t memneeded = sizeof (struct kiss_fft_f32_state)

View File

@ -358,7 +358,7 @@ kf_factor (int n, int *facbuf)
* It can be freed with free(), rather than a kiss_fft_f64-specific function. * It can be freed with free(), rather than a kiss_fft_f64-specific function.
* */ * */
kiss_fft_f64_cfg kiss_fft_f64_cfg
kiss_fft_f64_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fft_f64_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
kiss_fft_f64_cfg st = NULL; kiss_fft_f64_cfg st = NULL;
size_t memneeded = sizeof (struct kiss_fft_f64_state) size_t memneeded = sizeof (struct kiss_fft_f64_state)

View File

@ -358,7 +358,7 @@ kf_factor (int n, int *facbuf)
* It can be freed with free(), rather than a kiss_fft_s16-specific function. * It can be freed with free(), rather than a kiss_fft_s16-specific function.
* */ * */
kiss_fft_s16_cfg kiss_fft_s16_cfg
kiss_fft_s16_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fft_s16_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
kiss_fft_s16_cfg st = NULL; kiss_fft_s16_cfg st = NULL;
size_t memneeded = sizeof (struct kiss_fft_s16_state) size_t memneeded = sizeof (struct kiss_fft_s16_state)

View File

@ -358,7 +358,7 @@ kf_factor (int n, int *facbuf)
* It can be freed with free(), rather than a kiss_fft_s32-specific function. * It can be freed with free(), rather than a kiss_fft_s32-specific function.
* */ * */
kiss_fft_s32_cfg kiss_fft_s32_cfg
kiss_fft_s32_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fft_s32_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
kiss_fft_s32_cfg st = NULL; kiss_fft_s32_cfg st = NULL;
size_t memneeded = sizeof (struct kiss_fft_s32_state) size_t memneeded = sizeof (struct kiss_fft_s32_state)

View File

@ -20,7 +20,7 @@ struct kiss_fftr_f32_state
}; };
kiss_fftr_f32_cfg kiss_fftr_f32_cfg
kiss_fftr_f32_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fftr_f32_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
int i; int i;
kiss_fftr_f32_cfg st = NULL; kiss_fftr_f32_cfg st = NULL;

View File

@ -20,7 +20,7 @@ struct kiss_fftr_f64_state
}; };
kiss_fftr_f64_cfg kiss_fftr_f64_cfg
kiss_fftr_f64_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fftr_f64_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
int i; int i;
kiss_fftr_f64_cfg st = NULL; kiss_fftr_f64_cfg st = NULL;

View File

@ -20,7 +20,7 @@ struct kiss_fftr_s16_state
}; };
kiss_fftr_s16_cfg kiss_fftr_s16_cfg
kiss_fftr_s16_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fftr_s16_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
int i; int i;
kiss_fftr_s16_cfg st = NULL; kiss_fftr_s16_cfg st = NULL;

View File

@ -20,7 +20,7 @@ struct kiss_fftr_s32_state
}; };
kiss_fftr_s32_cfg kiss_fftr_s32_cfg
kiss_fftr_s32_alloc (int nfft, int inverse_fft, void *mem, size_t * lenmem) kiss_fftr_s32_alloc (int nfft, int inverse_fft, void *mem, size_t *lenmem)
{ {
int i; int i;
kiss_fftr_s32_cfg st = NULL; kiss_fftr_s32_cfg st = NULL;

View File

@ -244,7 +244,8 @@ gst_gl_filter_fixate_caps (GstBaseTransform * bt,
GstStructure *ins, *outs; GstStructure *ins, *outs;
const GValue *from_par, *to_par; const GValue *from_par, *to_par;
GValue fpar = { 0, }, tpar = { GValue fpar = { 0, }, tpar = {
0,}; 0,
};
othercaps = gst_caps_make_writable (othercaps); othercaps = gst_caps_make_writable (othercaps);
othercaps = gst_caps_truncate (othercaps); othercaps = gst_caps_truncate (othercaps);

View File

@ -128,7 +128,7 @@ gst_gl_display_wayland_new (const gchar * name)
* Returns: (transfer full): a new #GstGLDisplayWayland * Returns: (transfer full): a new #GstGLDisplayWayland
*/ */
GstGLDisplayWayland * GstGLDisplayWayland *
gst_gl_display_wayland_new_with_display (struct wl_display * display) gst_gl_display_wayland_new_with_display (struct wl_display *display)
{ {
GstGLDisplayWayland *ret; GstGLDisplayWayland *ret;

View File

@ -121,11 +121,11 @@ static const struct
const gchar type_string[12]; const gchar type_string[12];
} missing_type_mapping[] = { } missing_type_mapping[] = {
{ {
GST_MISSING_TYPE_URISOURCE, "urisource"}, { GST_MISSING_TYPE_URISOURCE, "urisource"}, {
GST_MISSING_TYPE_URISINK, "urisink"}, { GST_MISSING_TYPE_URISINK, "urisink"}, {
GST_MISSING_TYPE_ELEMENT, "element"}, { GST_MISSING_TYPE_ELEMENT, "element"}, {
GST_MISSING_TYPE_DECODER, "decoder"}, { GST_MISSING_TYPE_DECODER, "decoder"}, {
GST_MISSING_TYPE_ENCODER, "encoder"} GST_MISSING_TYPE_ENCODER, "encoder"}
}; };
static GstMissingType static GstMissingType

View File

@ -1038,24 +1038,24 @@ static const struct
const GstAudioChannelPosition gst_pos; const GstAudioChannelPosition gst_pos;
} layout_mapping[] = { } layout_mapping[] = {
{ {
0x00001, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, { 0x00001, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
0x00002, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, { 0x00002, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
0x00004, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, { 0x00004, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
0x00008, GST_AUDIO_CHANNEL_POSITION_LFE1}, { 0x00008, GST_AUDIO_CHANNEL_POSITION_LFE1}, {
0x00010, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, { 0x00010, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
0x00020, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, { 0x00020, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
0x00040, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, { 0x00040, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
0x00080, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, { 0x00080, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
0x00100, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, { 0x00100, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
0x00200, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, { 0x00200, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
0x00400, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, { 0x00400, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
0x00800, GST_AUDIO_CHANNEL_POSITION_TOP_CENTER}, { 0x00800, GST_AUDIO_CHANNEL_POSITION_TOP_CENTER}, {
0x01000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT}, { 0x01000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT}, {
0x02000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER}, { 0x02000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER}, {
0x04000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}, { 0x04000, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}, {
0x08000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT}, { 0x08000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT}, {
0x10000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER}, { 0x10000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER}, {
0x20000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT} 0x20000, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT}
}; };
#define MAX_CHANNEL_POSITIONS G_N_ELEMENTS (layout_mapping) #define MAX_CHANNEL_POSITIONS G_N_ELEMENTS (layout_mapping)

View File

@ -67,19 +67,19 @@ static const struct
GstRTSPLowerTrans transports; GstRTSPLowerTrans transports;
} rtsp_schemes_map[] = { } rtsp_schemes_map[] = {
{ {
"rtsp", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_UDP | "rtsp", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_UDP |
GST_RTSP_LOWER_TRANS_UDP_MCAST}, { GST_RTSP_LOWER_TRANS_UDP_MCAST}, {
"rtspu", GST_RTSP_LOWER_TRANS_UDP | GST_RTSP_LOWER_TRANS_UDP_MCAST}, { "rtspu", GST_RTSP_LOWER_TRANS_UDP | GST_RTSP_LOWER_TRANS_UDP_MCAST}, {
"rtspt", GST_RTSP_LOWER_TRANS_TCP}, { "rtspt", GST_RTSP_LOWER_TRANS_TCP}, {
"rtsph", GST_RTSP_LOWER_TRANS_HTTP | GST_RTSP_LOWER_TRANS_TCP}, { "rtsph", GST_RTSP_LOWER_TRANS_HTTP | GST_RTSP_LOWER_TRANS_TCP}, {
"rtsps", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_UDP | "rtsps", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_UDP |
GST_RTSP_LOWER_TRANS_UDP_MCAST | GST_RTSP_LOWER_TRANS_TLS}, { GST_RTSP_LOWER_TRANS_UDP_MCAST | GST_RTSP_LOWER_TRANS_TLS}, {
"rtspsu", "rtspsu",
GST_RTSP_LOWER_TRANS_UDP | GST_RTSP_LOWER_TRANS_UDP_MCAST | GST_RTSP_LOWER_TRANS_UDP | GST_RTSP_LOWER_TRANS_UDP_MCAST |
GST_RTSP_LOWER_TRANS_TLS}, { GST_RTSP_LOWER_TRANS_TLS}, {
"rtspst", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_TLS}, { "rtspst", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_TLS}, {
"rtspsh", "rtspsh",
GST_RTSP_LOWER_TRANS_HTTP | GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_HTTP | GST_RTSP_LOWER_TRANS_TCP |
GST_RTSP_LOWER_TRANS_TLS} GST_RTSP_LOWER_TRANS_TLS}
}; };

View File

@ -892,7 +892,7 @@ gst_tag_demux_seek_pull (GstTagDemux * tagdemux, GstEvent * event)
gst_segment_do_seek (&seeksegment, rate, format, flags, gst_segment_do_seek (&seeksegment, rate, format, flags,
start_type, start, stop_type, stop, NULL); start_type, start, stop_type, stop, NULL);
flush = ! !(flags & GST_SEEK_FLAG_FLUSH); flush = !!(flags & GST_SEEK_FLAG_FLUSH);
GST_DEBUG_OBJECT (tagdemux, "New segment %" GST_SEGMENT_FORMAT, &seeksegment); GST_DEBUG_OBJECT (tagdemux, "New segment %" GST_SEGMENT_FORMAT, &seeksegment);

View File

@ -313,67 +313,67 @@ static const struct ID3v2FrameIDConvert
} frame_id_conversions[] = { } frame_id_conversions[] = {
/* 2.3.x frames */ /* 2.3.x frames */
{ {
"TORY", "TDOR"}, { "TORY", "TDOR"}, {
"TYER", "TDRC"}, "TYER", "TDRC"},
/* 2.2.x frames */ /* 2.2.x frames */
{ {
"BUF", "RBUF"}, { "BUF", "RBUF"}, {
"CNT", "PCNT"}, { "CNT", "PCNT"}, {
"COM", "COMM"}, { "COM", "COMM"}, {
"CRA", "AENC"}, { "CRA", "AENC"}, {
"ETC", "ETCO"}, { "ETC", "ETCO"}, {
"GEO", "GEOB"}, { "GEO", "GEOB"}, {
"IPL", "TIPL"}, { "IPL", "TIPL"}, {
"MCI", "MCDI"}, { "MCI", "MCDI"}, {
"MLL", "MLLT"}, { "MLL", "MLLT"}, {
"PIC", "APIC"}, { "PIC", "APIC"}, {
"POP", "POPM"}, { "POP", "POPM"}, {
"REV", "RVRB"}, { "REV", "RVRB"}, {
"SLT", "SYLT"}, { "SLT", "SYLT"}, {
"STC", "SYTC"}, { "STC", "SYTC"}, {
"TAL", "TALB"}, { "TAL", "TALB"}, {
"TBP", "TBPM"}, { "TBP", "TBPM"}, {
"TCM", "TCOM"}, { "TCM", "TCOM"}, {
"TCO", "TCON"}, { "TCO", "TCON"}, {
"TCR", "TCOP"}, { "TCR", "TCOP"}, {
"TDA", "TDAT"}, { /* obsolete, but we need to parse it anyway */ "TDA", "TDAT"}, { /* obsolete, but we need to parse it anyway */
"TDY", "TDLY"}, { "TDY", "TDLY"}, {
"TEN", "TENC"}, { "TEN", "TENC"}, {
"TFT", "TFLT"}, { "TFT", "TFLT"}, {
"TKE", "TKEY"}, { "TKE", "TKEY"}, {
"TLA", "TLAN"}, { "TLA", "TLAN"}, {
"TLE", "TLEN"}, { "TLE", "TLEN"}, {
"TMT", "TMED"}, { "TMT", "TMED"}, {
"TOA", "TOAL"}, { "TOA", "TOAL"}, {
"TOF", "TOFN"}, { "TOF", "TOFN"}, {
"TOL", "TOLY"}, { "TOL", "TOLY"}, {
"TOR", "TDOR"}, { "TOR", "TDOR"}, {
"TOT", "TOAL"}, { "TOT", "TOAL"}, {
"TP1", "TPE1"}, { "TP1", "TPE1"}, {
"TP2", "TPE2"}, { "TP2", "TPE2"}, {
"TP3", "TPE3"}, { "TP3", "TPE3"}, {
"TP4", "TPE4"}, { "TP4", "TPE4"}, {
"TPA", "TPOS"}, { "TPA", "TPOS"}, {
"TPB", "TPUB"}, { "TPB", "TPUB"}, {
"TRC", "TSRC"}, { "TRC", "TSRC"}, {
"TRD", "TDRC"}, { "TRD", "TDRC"}, {
"TRK", "TRCK"}, { "TRK", "TRCK"}, {
"TSS", "TSSE"}, { "TSS", "TSSE"}, {
"TT1", "TIT1"}, { "TT1", "TIT1"}, {
"TT2", "TIT2"}, { "TT2", "TIT2"}, {
"TT3", "TIT3"}, { "TT3", "TIT3"}, {
"TXT", "TOLY"}, { "TXT", "TOLY"}, {
"TXX", "TXXX"}, { "TXX", "TXXX"}, {
"TYE", "TDRC"}, { "TYE", "TDRC"}, {
"UFI", "UFID"}, { "UFI", "UFID"}, {
"ULT", "USLT"}, { "ULT", "USLT"}, {
"WAF", "WOAF"}, { "WAF", "WOAF"}, {
"WAR", "WOAR"}, { "WAR", "WOAR"}, {
"WAS", "WOAS"}, { "WAS", "WOAS"}, {
"WCM", "WCOM"}, { "WCM", "WCOM"}, {
"WCP", "WCOP"}, { "WCP", "WCOP"}, {
"WPB", "WPUB"}, { "WPB", "WPUB"}, {
"WXX", "WXXX"} "WXX", "WXXX"}
}; };
static gboolean static gboolean

View File

@ -166,26 +166,26 @@ static const struct
const Tag element_tag; const Tag element_tag;
} tag_map[] = { } tag_map[] = {
{ {
"cc:License", "rdf:about", TAG_CC_LICENSE}, { "cc:License", "rdf:about", TAG_CC_LICENSE}, {
"cc:deprecatedOn", "rdf:datatype", TAG_CC_DEPRECATED_ON}, { "cc:deprecatedOn", "rdf:datatype", TAG_CC_DEPRECATED_ON}, {
"cc:jurisdiction", "rdf:resource", TAG_CC_JURISDICTION}, { "cc:jurisdiction", "rdf:resource", TAG_CC_JURISDICTION}, {
"cc:legalcode", "rdf:resource", TAG_CC_LEGALCODE}, { "cc:legalcode", "rdf:resource", TAG_CC_LEGALCODE}, {
"cc:prohibits", "rdf:resource", TAG_CC_PROHIBITS}, { "cc:prohibits", "rdf:resource", TAG_CC_PROHIBITS}, {
"cc:requires", "rdf:resource", TAG_CC_REQUIRES}, { "cc:requires", "rdf:resource", TAG_CC_REQUIRES}, {
"cc:permits", "rdf:resource", TAG_CC_PERMITS}, { "cc:permits", "rdf:resource", TAG_CC_PERMITS}, {
"dc:creator", "rdf:resource", TAG_DC_CREATOR}, { "dc:creator", "rdf:resource", TAG_DC_CREATOR}, {
"dc:source", "rdf:resource", TAG_DC_SOURCE}, { "dc:source", "rdf:resource", TAG_DC_SOURCE}, {
"dc:title", "xml:lang", TAG_DC_TITLE}, { "dc:title", "xml:lang", TAG_DC_TITLE}, {
"dc:description", "xml:lang", TAG_DC_DESCRIPTION}, { "dc:description", "xml:lang", TAG_DC_DESCRIPTION}, {
"dcq:hasVersion", NULL, TAG_DCQ_HAS_VERSION}, { "dcq:hasVersion", NULL, TAG_DCQ_HAS_VERSION}, {
"dcq:isReplacedBy", "rdf:resource", TAG_DCQ_IS_REPLACED_BY}, { "dcq:isReplacedBy", "rdf:resource", TAG_DCQ_IS_REPLACED_BY}, {
"rdf:RDF", NULL, TAG_RDF_RDF}, { "rdf:RDF", NULL, TAG_RDF_RDF}, {
"rdf:Description", "rdf:about", TAG_RDF_DESCRIPTION}, "rdf:Description", "rdf:about", TAG_RDF_DESCRIPTION},
/* these three are just for by-nc-nd_2.0_jp_.rdf */ /* these three are just for by-nc-nd_2.0_jp_.rdf */
{ {
"dc:isBasedOn", "rdf:resource", TAG_DC_SOURCE}, { "dc:isBasedOn", "rdf:resource", TAG_DC_SOURCE}, {
"dc:hasVersion", NULL, TAG_DCQ_HAS_VERSION}, { "dc:hasVersion", NULL, TAG_DCQ_HAS_VERSION}, {
"dc:isReplacedBy", "rdf:resource", TAG_DCQ_IS_REPLACED_BY} "dc:isReplacedBy", "rdf:resource", TAG_DCQ_IS_REPLACED_BY}
}; };
static void static void

View File

@ -46,19 +46,19 @@ static const struct mview_map_t
GstVideoMultiviewMode mode; GstVideoMultiviewMode mode;
} gst_multiview_modes[] = { } gst_multiview_modes[] = {
{ {
"mono", GST_VIDEO_MULTIVIEW_MODE_MONO}, { "mono", GST_VIDEO_MULTIVIEW_MODE_MONO}, {
"left", GST_VIDEO_MULTIVIEW_MODE_LEFT}, { "left", GST_VIDEO_MULTIVIEW_MODE_LEFT}, {
"right", GST_VIDEO_MULTIVIEW_MODE_RIGHT}, { "right", GST_VIDEO_MULTIVIEW_MODE_RIGHT}, {
"side-by-side", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE}, { "side-by-side", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE}, {
"side-by-side-quincunx", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE_QUINCUNX}, { "side-by-side-quincunx", GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE_QUINCUNX}, {
"column-interleaved", GST_VIDEO_MULTIVIEW_MODE_COLUMN_INTERLEAVED}, { "column-interleaved", GST_VIDEO_MULTIVIEW_MODE_COLUMN_INTERLEAVED}, {
"row-interleaved", GST_VIDEO_MULTIVIEW_MODE_ROW_INTERLEAVED}, { "row-interleaved", GST_VIDEO_MULTIVIEW_MODE_ROW_INTERLEAVED}, {
"top-bottom", GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM}, { "top-bottom", GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM}, {
"checkerboard", GST_VIDEO_MULTIVIEW_MODE_CHECKERBOARD}, { "checkerboard", GST_VIDEO_MULTIVIEW_MODE_CHECKERBOARD}, {
"frame-by-frame", GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME}, { "frame-by-frame", GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME}, {
"multiview-frame-by-frame", "multiview-frame-by-frame",
GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME}, { GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME}, {
"separated", GST_VIDEO_MULTIVIEW_MODE_SEPARATED} "separated", GST_VIDEO_MULTIVIEW_MODE_SEPARATED}
}; };
/** /**

View File

@ -1053,7 +1053,7 @@ gst_video_overlay_rectangle_apply_global_alpha (GstVideoOverlayRectangle * rect,
for (j = 0; j < w; j++) { for (j = 0; j < w; j++) {
guint8 na = (guint8) (*src * global_alpha); guint8 na = (guint8) (*src * global_alpha);
if (! !(rect->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA)) { if (!!(rect->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA)) {
dst[argb_r] = dst[argb_r] =
(guint8) ((double) (dst[argb_r] * 255) / (double) dst[argb_a]) * (guint8) ((double) (dst[argb_r] * 255) / (double) dst[argb_a]) *
na / 255; na / 255;
@ -1201,11 +1201,11 @@ gst_video_overlay_rectangle_get_pixels_raw_internal (GstVideoOverlayRectangle *
format = GST_VIDEO_INFO_FORMAT (&rectangle->info); format = GST_VIDEO_INFO_FORMAT (&rectangle->info);
apply_global_alpha = apply_global_alpha =
(! !(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA) (!!(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
&& !(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)); && !(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA));
revert_global_alpha = revert_global_alpha =
(! !(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA) (!!(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)
&& ! !(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA)); && !!(flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA));
/* This assumes we don't need to adjust the format */ /* This assumes we don't need to adjust the format */
if (wanted_width == width && if (wanted_width == width &&

View File

@ -1466,7 +1466,7 @@ gst_video_scaler_2d (GstVideoScaler * hscale, GstVideoScaler * vscale,
&bits)) &bits))
goto no_func; goto no_func;
interlaced = vscale && ! !(vscale->flags & GST_VIDEO_SCALER_FLAG_INTERLACED); interlaced = vscale && !!(vscale->flags & GST_VIDEO_SCALER_FLAG_INTERLACED);
#define LINE(s,ss,i) ((guint8 *)(s) + ((i) * (ss))) #define LINE(s,ss,i) ((guint8 *)(s) + ((i) * (ss)))
#define TMP_LINE(s,i) ((guint8 *)((s)->tmpline1) + (i) * (sizeof (gint32) * width * n_elems)) #define TMP_LINE(s,i) ((guint8 *)((s)->tmpline1) + (i) * (sizeof (gint32) * width * n_elems))

View File

@ -41,7 +41,6 @@
* (aka making up for GstImplementsInterface removal) (probably yes) */ * (aka making up for GstImplementsInterface removal) (probably yes) */
G_DEFINE_INTERFACE (GstVideoOrientation, gst_video_orientation, 0) G_DEFINE_INTERFACE (GstVideoOrientation, gst_video_orientation, 0)
static void static void
gst_video_orientation_default_init (GstVideoOrientationInterface * gst_video_orientation_default_init (GstVideoOrientationInterface *
iface) iface)

View File

@ -1333,7 +1333,7 @@ setup_smart_encoder (GstEncodeBaseBin * ebin, GstEncodingProfile * sprof,
gst_caps_make_writable (gst_encoding_profile_get_format (sprof)); gst_caps_make_writable (gst_encoding_profile_get_format (sprof));
GstCaps *tmpcaps = gst_pad_query_caps (srcpad, NULL); GstCaps *tmpcaps = gst_pad_query_caps (srcpad, NULL);
const gboolean native_video = const gboolean native_video =
! !(ebin->flags & GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION); !!(ebin->flags & GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION);
GstStructure *structure = gst_caps_get_structure (format, 0); GstStructure *structure = gst_caps_get_structure (format, 0);
/* Check if stream format is compatible */ /* Check if stream format is compatible */
@ -1755,7 +1755,7 @@ _create_stream_group (GstEncodeBaseBin * ebin, GstEncodingProfile * sprof,
/* FIXME : Once we have properties for specific converters, use those */ /* FIXME : Once we have properties for specific converters, use those */
if (GST_IS_ENCODING_VIDEO_PROFILE (sprof)) { if (GST_IS_ENCODING_VIDEO_PROFILE (sprof)) {
const gboolean native_video = const gboolean native_video =
! !(ebin->flags & GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION); !!(ebin->flags & GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION);
GstElement *cspace = NULL, *scale, *vrate, *cspace2 = NULL; GstElement *cspace = NULL, *scale, *vrate, *cspace2 = NULL;
GST_LOG ("Adding conversion elements for video stream"); GST_LOG ("Adding conversion elements for video stream");

View File

@ -75,7 +75,7 @@ gst_playback_utils_get_n_common_capsfeatures (GstElementFactory * fact1,
gst_static_caps_get (&raw_video_caps); gst_static_caps_get (&raw_video_caps);
GstStructure *raw_struct = gst_caps_get_structure (raw_caps, 0); GstStructure *raw_struct = gst_caps_get_structure (raw_caps, 0);
gboolean native_raw = gboolean native_raw =
(isaudioelement ? ! !(flags & GST_PLAY_FLAG_NATIVE_AUDIO) : ! !(flags & (isaudioelement ? !!(flags & GST_PLAY_FLAG_NATIVE_AUDIO) : !!(flags &
GST_PLAY_FLAG_NATIVE_VIDEO)); GST_PLAY_FLAG_NATIVE_VIDEO));
fact1_tmpl_caps = get_template_caps (fact1, GST_PAD_SRC); fact1_tmpl_caps = get_template_caps (fact1, GST_PAD_SRC);

View File

@ -3049,7 +3049,7 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw)
} else if (chain->conv) { } else if (chain->conv) {
/* no volume, we need to add a volume element when we can */ /* no volume, we need to add a volume element when we can */
g_object_set (chain->conv, "use-volume", g_object_set (chain->conv, "use-volume",
! !(playsink->flags & GST_PLAY_FLAG_SOFT_VOLUME), NULL); !!(playsink->flags & GST_PLAY_FLAG_SOFT_VOLUME), NULL);
GST_DEBUG_OBJECT (playsink, "the sink has no volume property"); GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
if (playsink->flags & GST_PLAY_FLAG_SOFT_VOLUME) { if (playsink->flags & GST_PLAY_FLAG_SOFT_VOLUME) {
@ -4474,14 +4474,14 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstPlaySink * playsink)
if (pad == playsink->audio_pad) { if (pad == playsink->audio_pad) {
raw = is_raw_pad (pad); raw = is_raw_pad (pad);
reconfigure = (! !playsink->audio_pad_raw != ! !raw) reconfigure = (!!playsink->audio_pad_raw != !!raw)
&& playsink->audiochain; && playsink->audiochain;
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Audio caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw, "Audio caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw,
reconfigure, caps); reconfigure, caps);
} else if (pad == playsink->video_pad) { } else if (pad == playsink->video_pad) {
raw = is_raw_pad (pad); raw = is_raw_pad (pad);
reconfigure = (! !playsink->video_pad_raw != ! !raw) reconfigure = (!!playsink->video_pad_raw != !!raw)
&& playsink->videochain; && playsink->videochain;
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Video caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw, "Video caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw,

View File

@ -117,7 +117,6 @@ gst_play_sink_convert_bin_add_identity (GstPlaySinkConvertBin * self)
(_("Missing element '%s' - check your GStreamer installation."), (_("Missing element '%s' - check your GStreamer installation."),
"identity"), (self->audio ? "identity"), (self->audio ?
"audio rendering might fail" : "video rendering might fail") "audio rendering might fail" : "video rendering might fail")
); );
} else { } else {
g_object_set (self->identity, "silent", TRUE, "signal-handoffs", FALSE, g_object_set (self->identity, "silent", TRUE, "signal-handoffs", FALSE,

View File

@ -750,8 +750,9 @@ _get_silent_property (GstElement * element, gboolean * invert)
const gchar *name; const gchar *name;
gboolean invert; gboolean invert;
} properties[] = { { } properties[] = { {
"silent", FALSE}, { "silent", FALSE}, {
"enable", TRUE}}; "enable", TRUE}
};
guint i; guint i;
for (i = 0; i < G_N_ELEMENTS (properties); i++) { for (i = 0; i < G_N_ELEMENTS (properties); i++) {

View File

@ -95,8 +95,6 @@ G_DEFINE_TYPE (GstSubParse, gst_sub_parse, GST_TYPE_ELEMENT);
GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (subparse, "subparse", GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (subparse, "subparse",
GST_RANK_PRIMARY, GST_TYPE_SUBPARSE, sub_parse_element_init (plugin)) GST_RANK_PRIMARY, GST_TYPE_SUBPARSE, sub_parse_element_init (plugin))
static void gst_sub_parse_dispose (GObject * object) static void gst_sub_parse_dispose (GObject * object)
{ {
GstSubParse *subparse = GST_SUBPARSE (object); GstSubParse *subparse = GST_SUBPARSE (object);

View File

@ -409,7 +409,6 @@ gst_sub_parse_type_find (GstTypeFind * tf, gpointer private)
GST_TYPE_FIND_REGISTER_DEFINE (subparse, "subparse_typefind", GST_RANK_MARGINAL, GST_TYPE_FIND_REGISTER_DEFINE (subparse, "subparse_typefind", GST_RANK_MARGINAL,
gst_sub_parse_type_find, "srt,sub,mpsub,mdvd,smi,txt,dks,vtt", SUB_CAPS, gst_sub_parse_type_find, "srt,sub,mpsub,mdvd,smi,txt,dks,vtt", SUB_CAPS,
NULL, NULL) NULL, NULL)
gboolean gboolean
sub_parse_element_init (GstPlugin * plugin) sub_parse_element_init (GstPlugin * plugin)
{ {

View File

@ -1045,8 +1045,8 @@ flac_type_find (GstTypeFind * tf, gpointer unused)
return; return;
} }
/* disabled because it happily typefinds /dev/urandom as audio/x-flac, and /* disabled because it happily typefinds /dev/urandom as audio/x-flac, and
* because I yet have to see header-less flac in the wild */ * because I yet have to see header-less flac in the wild */
#if 0 #if 0
/* flac without headers (subset format) */ /* flac without headers (subset format) */
/* 64K should be enough */ /* 64K should be enough */
@ -4862,24 +4862,24 @@ ogganx_type_find (GstTypeFind * tf, gpointer private)
GstOggStreamType stream_type; GstOggStreamType stream_type;
} markers[] = { } markers[] = {
{ {
"\001vorbis", 7, OGG_AUDIO}, { "\001vorbis", 7, OGG_AUDIO}, {
"\200theora", 7, OGG_VIDEO}, { "\200theora", 7, OGG_VIDEO}, {
"fLaC", 4, OGG_AUDIO}, { "fLaC", 4, OGG_AUDIO}, {
"\177FLAC", 5, OGG_AUDIO}, { "\177FLAC", 5, OGG_AUDIO}, {
"Speex", 5, OGG_AUDIO}, { "Speex", 5, OGG_AUDIO}, {
"CMML\0\0\0\0", 8, OGG_OTHER}, { "CMML\0\0\0\0", 8, OGG_OTHER}, {
"PCM ", 8, OGG_AUDIO}, { "PCM ", 8, OGG_AUDIO}, {
"Annodex", 7, OGG_ANNODEX}, { "Annodex", 7, OGG_ANNODEX}, {
"fishead", 7, OGG_SKELETON}, { "fishead", 7, OGG_SKELETON}, {
"AnxData", 7, OGG_ANNODEX}, { "AnxData", 7, OGG_ANNODEX}, {
"CELT ", 8, OGG_AUDIO}, { "CELT ", 8, OGG_AUDIO}, {
"\200kate\0\0\0", 8, OGG_KATE}, { "\200kate\0\0\0", 8, OGG_KATE}, {
"BBCD\0", 5, OGG_VIDEO}, { "BBCD\0", 5, OGG_VIDEO}, {
"OVP80\1\1", 7, OGG_VIDEO}, { "OVP80\1\1", 7, OGG_VIDEO}, {
"OpusHead", 8, OGG_AUDIO}, { "OpusHead", 8, OGG_AUDIO}, {
"\001audio\0\0\0", 9, OGG_AUDIO}, { "\001audio\0\0\0", 9, OGG_AUDIO}, {
"\001video\0\0\0", 9, OGG_VIDEO}, { "\001video\0\0\0", 9, OGG_VIDEO}, {
"\001text\0\0\0", 9, OGG_OTHER} "\001text\0\0\0", 9, OGG_OTHER}
}; };
while (c.offset < 4096 && data_scan_ctx_ensure_data (tf, &c, 64)) { while (c.offset < 4096 && data_scan_ctx_ensure_data (tf, &c, 64)) {

View File

@ -1586,11 +1586,12 @@ GST_START_TEST (test_preserve_width)
int width; int width;
const gchar *outf; const gchar *outf;
} test_formats[] = { { } test_formats[] = { {
8, "S8"}, { 8, "S8"}, {
16, "S16LE"}, { 16, "S16LE"}, {
24, "S24LE"}, { 24, "S24LE"}, {
32, "S32LE"}, { 32, "S32LE"}, {
0, NULL}}; 0, NULL}
};
gint i; gint i;
GstStructure *structure; GstStructure *structure;

View File

@ -239,26 +239,27 @@ GST_START_TEST (test_opus_encode_properties)
int value; int value;
} param_changes[steps] = { } param_changes[steps] = {
{ {
"frame-size", 40}, { "frame-size", 40}, {
"inband-fec", 1}, { "inband-fec", 1}, {
"complexity", 5}, { "complexity", 5}, {
"bandwidth", 1104}, { "bandwidth", 1104}, {
"frame-size", 2}, { "frame-size", 2}, {
"max-payload-size", 80}, { "max-payload-size", 80}, {
"frame-size", 60}, { "frame-size", 60}, {
"max-payload-size", 900}, { "max-payload-size", 900}, {
"complexity", 1}, { "complexity", 1}, {
"bitrate", 30000}, { "bitrate", 30000}, {
"frame-size", 10}, { "frame-size", 10}, {
"bitrate", 300000}, { "bitrate", 300000}, {
"inband-fec", 0}, { "inband-fec", 0}, {
"frame-size", 5}, { "frame-size", 5}, {
"bandwidth", 1101}, { "bandwidth", 1101}, {
"frame-size", 10}, { "frame-size", 10}, {
"bitrate", 500000}, { "bitrate", 500000}, {
"frame-size", 5}, { "frame-size", 5}, {
"bitrate", 80000}, { "bitrate", 80000}, {
"complexity", 8},}; "complexity", 8},
};
opusenc = setup_opusenc (); opusenc = setup_opusenc ();

View File

@ -229,11 +229,11 @@ GST_START_TEST (test_rgb_formats)
guint8 b_expected; guint8 b_expected;
} test_patterns[] = { } test_patterns[] = {
{ {
"white", 3, 0xff, 0xff, 0xff}, { "white", 3, 0xff, 0xff, 0xff}, {
"red", 4, 0xff, 0x00, 0x00}, { "red", 4, 0xff, 0x00, 0x00}, {
"green", 5, 0x00, 0xff, 0x00}, { "green", 5, 0x00, 0xff, 0x00}, {
"blue", 6, 0x00, 0x00, 0xff}, { "blue", 6, 0x00, 0x00, 0xff}, {
"black", 2, 0x00, 0x00, 0x00} "black", 2, 0x00, 0x00, 0x00}
}; };
const struct const struct
{ {
@ -242,18 +242,18 @@ GST_START_TEST (test_rgb_formats)
guint32 red_mask, green_mask, blue_mask, alpha_mask; guint32 red_mask, green_mask, blue_mask, alpha_mask;
} rgb_formats[] = { } rgb_formats[] = {
{ {
"RGBA", 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff}, { "RGBA", 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff}, {
"ARGB", 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, { "ARGB", 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, {
"BGRA", 32, 32, 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff}, { "BGRA", 32, 32, 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff}, {
"ABGR", 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, { "ABGR", 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, {
"RGBx", 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0x00000000}, { "RGBx", 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0x00000000}, {
"xRGB", 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000}, { "xRGB", 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000}, {
"BGRx", 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0x00000000}, { "BGRx", 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0x00000000}, {
"xBGR", 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000}, { "xBGR", 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000}, {
"RGB", 24, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000}, { "RGB", 24, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000}, {
"BGR", 24, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000}, { "BGR", 24, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000}, {
"RGB16", 16, 16, 0x0000f800, 0x000007e0, 0x0000001f, 0x00000000}, { "RGB16", 16, 16, 0x0000f800, 0x000007e0, 0x0000001f, 0x00000000}, {
"RGB15", 16, 15, 0x00007c00, 0x000003e0, 0x0000001f, 0x0000000} "RGB15", 16, 15, 0x00007c00, 0x000003e0, 0x0000001f, 0x0000000}
}; };
GstElement *pipeline, *src, *filter, *sink; GstElement *pipeline, *src, *filter, *sink;
GstCaps *template_caps; GstCaps *template_caps;

View File

@ -64,10 +64,11 @@ static const struct
gsize size; gsize size;
} formats[] = { } formats[] = {
{ {
GST_VIDEO_FORMAT_RGBA, 1, 1, 0, rgba_pixel, 4}, { GST_VIDEO_FORMAT_RGBA, 1, 1, 0, rgba_pixel, 4}, {
GST_VIDEO_FORMAT_RGB, 1, 1, 0, rgba_pixel, 3}, { GST_VIDEO_FORMAT_RGB, 1, 1, 0, rgba_pixel, 3}, {
GST_VIDEO_FORMAT_YUY2, 1, 1, 0, rgba_pixel, 1}, { GST_VIDEO_FORMAT_YUY2, 1, 1, 0, rgba_pixel, 1}, {
GST_VIDEO_FORMAT_I420, 1, 1, 0, rgba_pixel, 1},}; GST_VIDEO_FORMAT_I420, 1, 1, 0, rgba_pixel, 1},
};
GST_START_TEST (test_allocator_alloc) GST_START_TEST (test_allocator_alloc)
{ {

View File

@ -1183,15 +1183,15 @@ GST_START_TEST (test_xmp_parsing)
gint result_test; gint result_test;
} test_data[] = { } test_data[] = {
{ {
"", -1, -1}, { "", -1, -1}, {
"<rdf:Description rdf:about=\"\" />", 0, -1}, { "<rdf:Description rdf:about=\"\" />", 0, -1}, {
"<rdf:Description rdf:about=\"\"></rdf:Description>", 0, -1}, { "<rdf:Description rdf:about=\"\"></rdf:Description>", 0, -1}, {
"<rdf:Description rdf:about=\"\" ></rdf:Description>", 0, -1}, { "<rdf:Description rdf:about=\"\" ></rdf:Description>", 0, -1}, {
"<rdf:Description rdf:about=\"\"><dc:description>test</dc:description></rdf:Description>", "<rdf:Description rdf:about=\"\"><dc:description>test</dc:description></rdf:Description>",
1, 0}, { 1, 0}, {
"<rdf:Description rdf:about=\"\" dc:description=\"test\"></rdf:Description>", "<rdf:Description rdf:about=\"\" dc:description=\"test\"></rdf:Description>",
1, 0}, { 1, 0}, {
NULL, -1, -1} NULL, -1, -1}
}; };
/* test data */ /* test data */

View File

@ -120,17 +120,17 @@ sync_flags (GstMViewWidget * mv)
{ {
mv->synching = TRUE; mv->synching = TRUE;
g_object_set (G_OBJECT (mv->lflip), "active", g_object_set (G_OBJECT (mv->lflip), "active",
! !(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED), NULL); !!(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED), NULL);
g_object_set (G_OBJECT (mv->lflop), "active", g_object_set (G_OBJECT (mv->lflop), "active",
! !(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED), NULL); !!(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED), NULL);
g_object_set (G_OBJECT (mv->rflip), "active", g_object_set (G_OBJECT (mv->rflip), "active",
! !(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED), NULL); !!(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED), NULL);
g_object_set (G_OBJECT (mv->rflop), "active", g_object_set (G_OBJECT (mv->rflop), "active",
! !(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED), NULL); !!(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED), NULL);
g_object_set (G_OBJECT (mv->right_first), "active", g_object_set (G_OBJECT (mv->right_first), "active",
! !(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST), NULL); !!(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST), NULL);
g_object_set (G_OBJECT (mv->half_aspect), "active", g_object_set (G_OBJECT (mv->half_aspect), "active",
! !(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT), NULL); !!(mv->flags & GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT), NULL);
mv->synching = FALSE; mv->synching = FALSE;
} }