encodebin: rename flags names

Rename flags names from native-audio/-video to
no-audio/video-conversion to be more explicit on what it does
This commit is contained in:
Thiago Santos 2011-07-28 11:21:26 -03:00
parent 264d91a502
commit c874edd089

View file

@ -120,8 +120,8 @@
typedef enum typedef enum
{ {
GST_ENC_FLAG_NATIVE_AUDIO = (1 << 0), GST_ENC_FLAG_NO_AUDIO_CONVERSION = (1 << 0),
GST_ENC_FLAG_NATIVE_VIDEO = (1 << 1) GST_ENC_FLAG_NO_VIDEO_CONVERSION = (1 << 1)
} GstEncFlags; } GstEncFlags;
#define GST_TYPE_ENC_FLAGS (gst_enc_flags_get_type()) #define GST_TYPE_ENC_FLAGS (gst_enc_flags_get_type())
@ -267,10 +267,10 @@ GType
gst_enc_flags_get_type (void) gst_enc_flags_get_type (void)
{ {
static const GFlagsValue values[] = { static const GFlagsValue values[] = {
{C_FLAGS (GST_ENC_FLAG_NATIVE_AUDIO), "Only use native audio formats", {C_FLAGS (GST_ENC_FLAG_NO_AUDIO_CONVERSION), "Do not use audio conversion "
"native-audio"}, "elements", "no-audio-conversion"},
{C_FLAGS (GST_ENC_FLAG_NATIVE_VIDEO), "Only use native video formats", {C_FLAGS (GST_ENC_FLAG_NO_VIDEO_CONVERSION), "Do not use video conversion "
"native-video"}, "elements", "no-video-conversion"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static volatile GType id = 0;
@ -1261,7 +1261,8 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
/* 3.2. restriction elements */ /* 3.2. restriction elements */
/* 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 = ! !(ebin->flags & GST_ENC_FLAG_NATIVE_VIDEO); const gboolean native_video =
! !(ebin->flags & GST_ENC_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");
@ -1323,7 +1324,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
} }
} else if (GST_IS_ENCODING_AUDIO_PROFILE (sprof) } else if (GST_IS_ENCODING_AUDIO_PROFILE (sprof)
&& !(ebin->flags & GST_ENC_FLAG_NATIVE_AUDIO)) { && !(ebin->flags & GST_ENC_FLAG_NO_AUDIO_CONVERSION)) {
GstElement *aconv, *ares, *arate, *aconv2; GstElement *aconv, *ares, *arate, *aconv2;
GST_LOG ("Adding conversion elements for audio stream"); GST_LOG ("Adding conversion elements for audio stream");