mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 16:50:47 +00:00
parent
0d9b6a62c8
commit
2410cd7a00
5 changed files with 11 additions and 9 deletions
|
@ -604,7 +604,7 @@ gst_flv_mux_write_metadata (GstFlvMux * mux)
|
|||
} else if (!strcmp (tag_name, GST_TAG_ARTIST) ||
|
||||
!strcmp (tag_name, GST_TAG_TITLE)) {
|
||||
gchar *s;
|
||||
const gchar *t;
|
||||
const gchar *t = NULL;
|
||||
|
||||
if (!strcmp (tag_name, GST_TAG_ARTIST))
|
||||
t = "creator";
|
||||
|
|
|
@ -201,6 +201,9 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtrl * mixer,
|
|||
gain = (int) audioinfo.monitor_gain;
|
||||
balance = audioinfo.record.balance;
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
}
|
||||
|
||||
if (balance == AUDIO_MID_BALANCE) {
|
||||
|
|
|
@ -68,7 +68,6 @@ gst_sunaudiomixer_track_new (GstSunAudioTrackType track_num,
|
|||
GstMixerTrack *track;
|
||||
GObjectClass *klass;
|
||||
const gchar *untranslated_label;
|
||||
gint volume;
|
||||
|
||||
if ((guint) track_num < G_N_ELEMENTS (labels))
|
||||
untranslated_label = labels[track_num];
|
||||
|
|
|
@ -312,8 +312,8 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
|
|||
GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc);
|
||||
audio_info_t ainfo;
|
||||
int ret;
|
||||
int ctrl_fd = -1;
|
||||
int ports;
|
||||
GstSunAudioMixerCtrl *mixer;
|
||||
struct audio_info audioinfo;
|
||||
|
||||
ret = ioctl (sunaudiosrc->fd, AUDIO_GETINFO, &ainfo);
|
||||
if (ret == -1) {
|
||||
|
@ -333,8 +333,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
|
|||
ainfo.record.encoding = AUDIO_ENCODING_LINEAR;
|
||||
ainfo.record.buffer_size = spec->buffer_time;
|
||||
|
||||
GstSunAudioMixerCtrl *mixer = sunaudiosrc->mixer;
|
||||
struct audio_info audioinfo;
|
||||
mixer = sunaudiosrc->mixer;
|
||||
|
||||
if (ioctl (mixer->mixer_fd, AUDIO_GETINFO, &audioinfo) < 0) {
|
||||
g_warning ("Error getting audio device volume");
|
||||
|
|
|
@ -118,11 +118,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
|
|||
GST_DEBUG_OBJECT (e, " channels");
|
||||
/* and now, the channels */
|
||||
for (n = 0;; n++) {
|
||||
struct v4l2_input input = { 0, };
|
||||
struct v4l2_input input;
|
||||
GstV4l2TunerChannel *v4l2channel;
|
||||
|
||||
GstTunerChannel *channel;
|
||||
|
||||
memset (&input, 0, sizeof (input));
|
||||
|
||||
input.index = n;
|
||||
if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_ENUMINPUT, &input) < 0) {
|
||||
if (errno == EINVAL)
|
||||
|
@ -141,7 +142,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
|
|||
GST_LOG_OBJECT (e, " name: '%s'", input.name);
|
||||
GST_LOG_OBJECT (e, " type: %08x", input.type);
|
||||
GST_LOG_OBJECT (e, " audioset: %08x", input.audioset);
|
||||
GST_LOG_OBJECT (e, " std: %016x", input.std);
|
||||
GST_LOG_OBJECT (e, " std: %016x", (guint) input.std);
|
||||
GST_LOG_OBJECT (e, " status: %08x", input.status);
|
||||
|
||||
v4l2channel = g_object_new (GST_TYPE_V4L2_TUNER_CHANNEL, NULL);
|
||||
|
|
Loading…
Reference in a new issue