Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (203057 => 203058)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-07-11 14:37:32 UTC (rev 203057)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-07-11 14:41:42 UTC (rev 203058)
@@ -92,7 +92,7 @@
g_object_set(object, "stream-properties", structure, NULL);
gst_structure_free(structure);
GUniquePtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(object)));
- LOG_MEDIA_MESSAGE("Set media.role as %s at %s", role, elementName.get());
+ GST_DEBUG("Set media.role as %s at %s", role, elementName.get());
}
void MediaPlayerPrivateGStreamer::registerMediaEngine(MediaEngineRegistrar registrar)
@@ -243,10 +243,10 @@
m_url = URL(URL(), cleanURL);
g_object_set(m_pipeline.get(), "uri", cleanURL.utf8().data(), nullptr);
- INFO_MEDIA_MESSAGE("Load %s", cleanURL.utf8().data());
+ GST_INFO("Load %s", cleanURL.utf8().data());
if (m_preload == MediaPlayer::None) {
- LOG_MEDIA_MESSAGE("Delaying load.");
+ GST_DEBUG("Delaying load.");
m_delayingLoad = true;
}
@@ -282,7 +282,7 @@
void MediaPlayerPrivateGStreamer::commitLoad()
{
ASSERT(!m_delayingLoad);
- LOG_MEDIA_MESSAGE("Committing load.");
+ GST_DEBUG("Committing load.");
// GStreamer needs to have the pipeline set to a paused state to
// start providing anything useful.
@@ -315,7 +315,7 @@
gst_query_parse_position(query, 0, &position);
gst_query_unref(query);
- LOG_MEDIA_MESSAGE("Position %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
+ GST_DEBUG("Position %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
float result = 0.0f;
if (static_cast<GstClockTime>(position) != GST_CLOCK_TIME_NONE) {
@@ -342,12 +342,12 @@
gst_element_get_state(m_pipeline.get(), ¤tState, &pending, 0);
if (currentState == newState || pending == newState) {
- LOG_MEDIA_MESSAGE("Rejected state change to %s from %s with %s pending", gst_element_state_get_name(newState),
+ GST_DEBUG("Rejected state change to %s from %s with %s pending", gst_element_state_get_name(newState),
gst_element_state_get_name(currentState), gst_element_state_get_name(pending));
return true;
}
- LOG_MEDIA_MESSAGE("Changing state change to %s from %s with %s pending", gst_element_state_get_name(newState),
+ GST_DEBUG("Changing state change to %s from %s with %s pending", gst_element_state_get_name(newState),
gst_element_state_get_name(currentState), gst_element_state_get_name(pending));
GstStateChangeReturn setStateResult = gst_element_set_state(m_pipeline.get(), newState);
@@ -392,7 +392,7 @@
m_delayingLoad = false;
m_preload = MediaPlayer::Auto;
setDownloadBuffering();
- LOG_MEDIA_MESSAGE("Play");
+ GST_DEBUG("Play");
} else {
loadingFailed(MediaPlayer::Empty);
}
@@ -407,7 +407,7 @@
return;
if (changePipelineState(GST_STATE_PAUSED))
- INFO_MEDIA_MESSAGE("Pause");
+ GST_INFO("Pause");
else
loadingFailed(MediaPlayer::Empty);
}
@@ -432,11 +432,11 @@
bool failure = !gst_element_query_duration(m_pipeline.get(), timeFormat, &timeLength) || static_cast<guint64>(timeLength) == GST_CLOCK_TIME_NONE;
if (failure) {
- LOG_MEDIA_MESSAGE("Time duration query failed for %s", m_url.string().utf8().data());
+ GST_DEBUG("Time duration query failed for %s", m_url.string().utf8().data());
return numeric_limits<float>::infinity();
}
- LOG_MEDIA_MESSAGE("Duration: %" GST_TIME_FORMAT, GST_TIME_ARGS(timeLength));
+ GST_DEBUG("Duration: %" GST_TIME_FORMAT, GST_TIME_ARGS(timeLength));
return static_cast<double>(timeLength) / GST_SECOND;
// FIXME: handle 3.14.9.5 properly
@@ -472,7 +472,7 @@
if (m_errorOccured)
return;
- INFO_MEDIA_MESSAGE("[Seek] seek attempt to %f secs", time);
+ GST_INFO("[Seek] seek attempt to %f secs", time);
// Avoid useless seeking.
if (time == currentTime())
@@ -482,7 +482,7 @@
return;
GstClockTime clockTime = toGstClockTime(time);
- INFO_MEDIA_MESSAGE("[Seek] seeking to %" GST_TIME_FORMAT " (%f)", GST_TIME_ARGS(clockTime), time);
+ GST_INFO("[Seek] seeking to %" GST_TIME_FORMAT " (%f)", GST_TIME_ARGS(clockTime), time);
if (m_seeking) {
m_timeOfOverlappingSeek = time;
@@ -495,13 +495,13 @@
GstState state;
GstStateChangeReturn getStateResult = gst_element_get_state(m_pipeline.get(), &state, nullptr, 0);
if (getStateResult == GST_STATE_CHANGE_FAILURE || getStateResult == GST_STATE_CHANGE_NO_PREROLL) {
- LOG_MEDIA_MESSAGE("[Seek] cannot seek, current state change is %s", gst_element_state_change_return_get_name(getStateResult));
+ GST_DEBUG("[Seek] cannot seek, current state change is %s", gst_element_state_change_return_get_name(getStateResult));
return;
}
if (getStateResult == GST_STATE_CHANGE_ASYNC || state < GST_STATE_PAUSED || m_isEndReached) {
m_seekIsPending = true;
if (m_isEndReached) {
- LOG_MEDIA_MESSAGE("[Seek] reset pipeline");
+ GST_DEBUG("[Seek] reset pipeline");
m_resetPipeline = true;
if (!changePipelineState(GST_STATE_PAUSED))
loadingFailed(MediaPlayer::Empty);
@@ -509,7 +509,7 @@
} else {
// We can seek now.
if (!doSeek(clockTime, m_player->rate(), static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE))) {
- LOG_MEDIA_MESSAGE("[Seek] seeking to %f failed", time);
+ GST_DEBUG("[Seek] seeking to %f failed", time);
return;
}
}
@@ -556,7 +556,7 @@
float currentPosition = static_cast<float>(playbackPosition() * GST_SECOND);
bool mute = false;
- INFO_MEDIA_MESSAGE("Set Rate to %f", m_playbackRate);
+ GST_INFO("Set Rate to %f", m_playbackRate);
if (m_playbackRate > 0) {
// Mute the sound if the playback rate is too extreme and
@@ -568,13 +568,13 @@
mute = true;
}
- INFO_MEDIA_MESSAGE("Need to mute audio?: %d", (int) mute);
+ GST_INFO("Need to mute audio?: %d", (int) mute);
if (doSeek(currentPosition, m_playbackRate, static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH))) {
g_object_set(m_pipeline.get(), "mute", mute, nullptr);
m_lastPlaybackRate = m_playbackRate;
} else {
m_playbackRate = m_lastPlaybackRate;
- ERROR_MEDIA_MESSAGE("Set rate to %f failed", m_playbackRate);
+ GST_ERROR("Set rate to %f failed", m_playbackRate);
}
if (m_playbackRatePause) {
@@ -594,7 +594,7 @@
bool MediaPlayerPrivateGStreamer::paused() const
{
if (m_isEndReached) {
- LOG_MEDIA_MESSAGE("Ignoring pause at EOS");
+ GST_DEBUG("Ignoring pause at EOS");
return true;
}
@@ -774,9 +774,9 @@
}
}
if (!found)
- WARN_MEDIA_MESSAGE("Got sample with unknown stream ID.");
+ GST_WARNING("Got sample with unknown stream ID.");
} else
- WARN_MEDIA_MESSAGE("Unable to handle sample with no stream start event.");
+ GST_WARNING("Unable to handle sample with no stream start event.");
}
#endif
@@ -896,7 +896,7 @@
// We ignore state changes from internal elements. They are forwarded to playbin2 anyway.
bool messageSourceIsPlaybin = GST_MESSAGE_SRC(message) == reinterpret_cast<GstObject*>(m_pipeline.get());
- LOG_MEDIA_MESSAGE("Message %s received from element %s", GST_MESSAGE_TYPE_NAME(message), GST_MESSAGE_SRC_NAME(message));
+ GST_DEBUG("Message %s received from element %s", GST_MESSAGE_TYPE_NAME(message), GST_MESSAGE_SRC_NAME(message));
switch (GST_MESSAGE_TYPE(message)) {
case GST_MESSAGE_ERROR:
if (m_resetPipeline)
@@ -904,7 +904,7 @@
if (m_missingPluginsCallback)
break;
gst_message_parse_error(message, &err.outPtr(), &debug.outPtr());
- ERROR_MEDIA_MESSAGE("Error %d: %s (url="" err->code, err->message, m_url.string().utf8().data());
+ GST_ERROR("Error %d: %s (url="" err->code, err->message, m_url.string().utf8().data());
GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(GST_BIN(m_pipeline.get()), GST_DEBUG_GRAPH_SHOW_ALL, "webkit-video.error");
@@ -920,7 +920,7 @@
// this case the HTMLMediaElement will emit a stalled
// event.
if (err->code == GST_STREAM_ERROR_TYPE_NOT_FOUND) {
- ERROR_MEDIA_MESSAGE("Decode error, let the Media element emit a stalled event.");
+ GST_ERROR("Decode error, let the Media element emit a stalled event.");
break;
}
error = MediaPlayer::DecodeError;
@@ -966,7 +966,7 @@
gst_element_get_state(m_pipeline.get(), ¤tState, nullptr, 250 * GST_NSECOND);
if (requestedState < currentState) {
GUniquePtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(message)));
- INFO_MEDIA_MESSAGE("Element %s requested state change to %s", elementName.get(),
+ GST_INFO("Element %s requested state change to %s", elementName.get(),
gst_element_state_get_name(requestedState));
m_requestedState = requestedState;
if (!changePipelineState(requestedState))
@@ -1041,7 +1041,7 @@
break;
}
default:
- LOG_MEDIA_MESSAGE("Unhandled GStreamer message type: %s",
+ GST_DEBUG("Unhandled GStreamer message type: %s",
GST_MESSAGE_TYPE_NAME(message));
break;
}
@@ -1053,7 +1053,7 @@
m_buffering = true;
gst_message_parse_buffering(message, &m_bufferingPercentage);
- LOG_MEDIA_MESSAGE("[Buffering] Buffering: %d%%.", m_bufferingPercentage);
+ GST_DEBUG("[Buffering] Buffering: %d%%.", m_bufferingPercentage);
updateStates();
}
@@ -1178,7 +1178,7 @@
if (stop != -1)
fillStatus = 100.0 * stop / GST_FORMAT_PERCENT_MAX;
- LOG_MEDIA_MESSAGE("[Buffering] Download buffer filled up to %f%%", fillStatus);
+ GST_DEBUG("[Buffering] Download buffer filled up to %f%%", fillStatus);
float mediaDuration = duration();
@@ -1189,7 +1189,7 @@
m_maxTimeLoaded = mediaDuration;
else
m_maxTimeLoaded = static_cast<float>((fillStatus * mediaDuration) / 100.0);
- LOG_MEDIA_MESSAGE("[Buffering] Updated maxTimeLoaded: %f", m_maxTimeLoaded);
+ GST_DEBUG("[Buffering] Updated maxTimeLoaded: %f", m_maxTimeLoaded);
}
m_downloadFinished = fillStatus == 100.0;
@@ -1211,7 +1211,7 @@
return 0.0f;
float mediaDuration = duration();
- LOG_MEDIA_MESSAGE("maxTimeSeekable, duration: %f", mediaDuration);
+ GST_DEBUG("maxTimeSeekable, duration: %f", mediaDuration);
// infinite duration means live stream
if (std::isinf(mediaDuration))
return 0.0f;
@@ -1227,7 +1227,7 @@
float loaded = m_maxTimeLoaded;
if (m_isEndReached)
loaded = duration();
- LOG_MEDIA_MESSAGE("maxTimeLoaded: %f", loaded);
+ GST_DEBUG("maxTimeLoaded: %f", loaded);
return loaded;
}
@@ -1238,7 +1238,7 @@
float currentMaxTimeLoaded = maxTimeLoaded();
bool didLoadingProgress = currentMaxTimeLoaded != m_maxTimeLoadedAtLastDidLoadingProgress;
m_maxTimeLoadedAtLastDidLoadingProgress = currentMaxTimeLoaded;
- LOG_MEDIA_MESSAGE("didLoadingProgress: %d", didLoadingProgress);
+ GST_DEBUG("didLoadingProgress: %d", didLoadingProgress);
return didLoadingProgress;
}
@@ -1256,7 +1256,7 @@
GstFormat fmt = GST_FORMAT_BYTES;
gint64 length = 0;
if (gst_element_query_duration(m_source.get(), fmt, &length)) {
- INFO_MEDIA_MESSAGE("totalBytes %" G_GINT64_FORMAT, length);
+ GST_INFO("totalBytes %" G_GINT64_FORMAT, length);
m_totalBytes = static_cast<unsigned long long>(length);
m_isStreaming = !length;
return m_totalBytes;
@@ -1291,7 +1291,7 @@
gst_iterator_free(iter);
- INFO_MEDIA_MESSAGE("totalBytes %" G_GINT64_FORMAT, length);
+ GST_INFO("totalBytes %" G_GINT64_FORMAT, length);
m_totalBytes = static_cast<unsigned long long>(length);
m_isStreaming = !length;
return m_totalBytes;
@@ -1334,7 +1334,7 @@
if (m_seekIsPending)
updateStates();
else {
- LOG_MEDIA_MESSAGE("[Seek] seeked to %f", m_seekTime);
+ GST_DEBUG("[Seek] seeked to %f", m_seekTime);
m_seeking = false;
if (m_timeOfOverlappingSeek != m_seekTime && m_timeOfOverlappingSeek != -1) {
seek(m_timeOfOverlappingSeek);
@@ -1370,7 +1370,7 @@
bool shouldUpdatePlaybackState = false;
switch (getStateResult) {
case GST_STATE_CHANGE_SUCCESS: {
- LOG_MEDIA_MESSAGE("State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
+ GST_DEBUG("State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
// Do nothing if on EOS and state changed to READY to avoid recreating the player
// on HTMLMediaElement and properly generate the video 'ended' event.
@@ -1395,7 +1395,7 @@
case GST_STATE_PLAYING:
if (m_buffering) {
if (m_bufferingPercentage == 100) {
- LOG_MEDIA_MESSAGE("[Buffering] Complete.");
+ GST_DEBUG("[Buffering] Complete.");
m_buffering = false;
m_readyState = MediaPlayer::HaveEnoughData;
m_networkState = m_downloadFinished ? MediaPlayer::Idle : MediaPlayer::Loading;
@@ -1426,7 +1426,7 @@
}
if (didBuffering && !m_buffering && !m_paused && m_playbackRate) {
- LOG_MEDIA_MESSAGE("[Buffering] Restarting playback.");
+ GST_DEBUG("[Buffering] Restarting playback.");
changePipelineState(GST_STATE_PLAYING);
}
} else if (state == GST_STATE_PLAYING) {
@@ -1433,7 +1433,7 @@
m_paused = false;
if ((m_buffering && !isLiveStream()) || !m_playbackRate) {
- LOG_MEDIA_MESSAGE("[Buffering] Pausing stream for buffering.");
+ GST_DEBUG("[Buffering] Pausing stream for buffering.");
changePipelineState(GST_STATE_PAUSED);
}
} else
@@ -1441,21 +1441,21 @@
if (m_requestedState == GST_STATE_PAUSED && state == GST_STATE_PAUSED) {
shouldUpdatePlaybackState = true;
- LOG_MEDIA_MESSAGE("Requested state change to %s was completed", gst_element_state_get_name(state));
+ GST_DEBUG("Requested state change to %s was completed", gst_element_state_get_name(state));
}
break;
}
case GST_STATE_CHANGE_ASYNC:
- LOG_MEDIA_MESSAGE("Async: State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
+ GST_DEBUG("Async: State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
// Change in progress.
break;
case GST_STATE_CHANGE_FAILURE:
- LOG_MEDIA_MESSAGE("Failure: State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
+ GST_DEBUG("Failure: State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
// Change failed
return;
case GST_STATE_CHANGE_NO_PREROLL:
- LOG_MEDIA_MESSAGE("No preroll: State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
+ GST_DEBUG("No preroll: State: %s, pending: %s", gst_element_state_get_name(state), gst_element_state_get_name(pending));
// Live pipelines go in PAUSED without prerolling.
m_isStreaming = true;
@@ -1475,7 +1475,7 @@
m_networkState = MediaPlayer::Loading;
break;
default:
- LOG_MEDIA_MESSAGE("Else : %d", getStateResult);
+ GST_DEBUG("Else : %d", getStateResult);
break;
}
@@ -1485,11 +1485,11 @@
m_player->playbackStateChanged();
if (m_networkState != oldNetworkState) {
- LOG_MEDIA_MESSAGE("Network State Changed from %u to %u", oldNetworkState, m_networkState);
+ GST_DEBUG("Network State Changed from %u to %u", oldNetworkState, m_networkState);
m_player->networkStateChanged();
}
if (m_readyState != oldReadyState) {
- LOG_MEDIA_MESSAGE("Ready State Changed from %u to %u", oldReadyState, m_readyState);
+ GST_DEBUG("Ready State Changed from %u to %u", oldReadyState, m_readyState);
m_player->readyStateChanged();
}
@@ -1496,11 +1496,11 @@
if (getStateResult == GST_STATE_CHANGE_SUCCESS && state >= GST_STATE_PAUSED) {
updatePlaybackRate();
if (m_seekIsPending) {
- LOG_MEDIA_MESSAGE("[Seek] committing pending seek to %f", m_seekTime);
+ GST_DEBUG("[Seek] committing pending seek to %f", m_seekTime);
m_seekIsPending = false;
m_seeking = doSeek(toGstClockTime(m_seekTime), m_player->rate(), static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE));
if (!m_seeking)
- LOG_MEDIA_MESSAGE("[Seek] seeking to %f failed", m_seekTime);
+ GST_DEBUG("[Seek] seeking to %f failed", m_seekTime);
}
}
}
@@ -1567,7 +1567,7 @@
RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_url);
if (securityOrigin->canRequest(newUrl)) {
- INFO_MEDIA_MESSAGE("New media url: %s", newUrl.string().utf8().data());
+ GST_INFO("New media url: %s", newUrl.string().utf8().data());
// Reset player states.
m_networkState = MediaPlayer::Loading;
@@ -1589,7 +1589,7 @@
return true;
}
} else
- INFO_MEDIA_MESSAGE("Not allowed to load new media location: %s", newUrl.string().utf8().data());
+ GST_INFO("Not allowed to load new media location: %s", newUrl.string().utf8().data());
}
m_mediaLocationCurrentIndex--;
return false;
@@ -1818,11 +1818,11 @@
bool shouldDownload = !isLiveStream() && m_preload == MediaPlayer::Auto;
if (shouldDownload) {
- LOG_MEDIA_MESSAGE("Enabling on-disk buffering");
+ GST_DEBUG("Enabling on-disk buffering");
g_object_set(m_pipeline.get(), "flags", flags | flagDownload, nullptr);
m_fillTimer.startRepeating(0.2);
} else {
- LOG_MEDIA_MESSAGE("Disabling on-disk buffering");
+ GST_DEBUG("Disabling on-disk buffering");
g_object_set(m_pipeline.get(), "flags", flags & ~flagDownload, nullptr);
m_fillTimer.stop();
}
@@ -1846,7 +1846,7 @@
{
m_autoAudioSink = gst_element_factory_make("autoaudiosink", 0);
if (!m_autoAudioSink) {
- WARN_MEDIA_MESSAGE("GStreamer's autoaudiosink not found. Please check your gst-plugins-good installation");
+ GST_WARNING("GStreamer's autoaudiosink not found. Please check your gst-plugins-good installation");
return nullptr;
}
@@ -1869,7 +1869,7 @@
if (m_preservesPitch) {
GstElement* scale = gst_element_factory_make("scaletempo", nullptr);
if (!scale) {
- WARN_MEDIA_MESSAGE("Failed to create scaletempo");
+ GST_WARNING("Failed to create scaletempo");
return m_autoAudioSink.get();
}
@@ -1887,7 +1887,7 @@
gst_bin_add_many(GST_BIN(audioSinkBin), convert, resample, m_autoAudioSink.get(), nullptr);
if (!gst_element_link_many(scale, convert, resample, m_autoAudioSink.get(), nullptr)) {
- WARN_MEDIA_MESSAGE("Failed to link audio sink elements");
+ GST_WARNING("Failed to link audio sink elements");
gst_object_unref(audioSinkBin);
return m_autoAudioSink.get();
}
@@ -1973,7 +1973,7 @@
GstElement* scale = gst_element_factory_make("scaletempo", 0);
if (!scale)
- WARN_MEDIA_MESSAGE("Failed to create scaletempo");
+ GST_WARNING("Failed to create scaletempo");
else
g_object_set(m_pipeline.get(), "audio-filter", scale, nullptr);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (203057 => 203058)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-07-11 14:37:32 UTC (rev 203057)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-07-11 14:41:42 UTC (rev 203058)
@@ -306,8 +306,8 @@
}
#endif
- LOG_MEDIA_MESSAGE("Original video size: %dx%d", originalSize.width(), originalSize.height());
- LOG_MEDIA_MESSAGE("Pixel aspect ratio: %d/%d", pixelAspectRatioNumerator, pixelAspectRatioDenominator);
+ GST_DEBUG("Original video size: %dx%d", originalSize.width(), originalSize.height());
+ GST_DEBUG("Pixel aspect ratio: %d/%d", pixelAspectRatioNumerator, pixelAspectRatioDenominator);
// Calculate DAR based on PAR and video size.
int displayWidth = originalSize.width() * pixelAspectRatioNumerator;
@@ -321,20 +321,20 @@
// Apply DAR to original video size. This is the same behavior as in xvimagesink's setcaps function.
guint64 width = 0, height = 0;
if (!(originalSize.height() % displayHeight)) {
- LOG_MEDIA_MESSAGE("Keeping video original height");
+ GST_DEBUG("Keeping video original height");
width = gst_util_uint64_scale_int(originalSize.height(), displayWidth, displayHeight);
height = static_cast<guint64>(originalSize.height());
} else if (!(originalSize.width() % displayWidth)) {
- LOG_MEDIA_MESSAGE("Keeping video original width");
+ GST_DEBUG("Keeping video original width");
height = gst_util_uint64_scale_int(originalSize.width(), displayHeight, displayWidth);
width = static_cast<guint64>(originalSize.width());
} else {
- LOG_MEDIA_MESSAGE("Approximating while keeping original video height");
+ GST_DEBUG("Approximating while keeping original video height");
width = gst_util_uint64_scale_int(originalSize.height(), displayWidth, displayHeight);
height = static_cast<guint64>(originalSize.height());
}
- LOG_MEDIA_MESSAGE("Natural size: %" G_GUINT64_FORMAT "x%" G_GUINT64_FORMAT, width, height);
+ GST_DEBUG("Natural size: %" G_GUINT64_FORMAT "x%" G_GUINT64_FORMAT, width, height);
m_videoSize = FloatSize(static_cast<int>(width), static_cast<int>(height));
return m_videoSize;
}
@@ -344,7 +344,7 @@
if (!m_volumeElement)
return;
- LOG_MEDIA_MESSAGE("Setting volume: %f", volume);
+ GST_DEBUG("Setting volume: %f", volume);
gst_stream_volume_set_volume(m_volumeElement.get(), GST_STREAM_VOLUME_FORMAT_CUBIC, static_cast<double>(volume));
}
@@ -373,7 +373,7 @@
void MediaPlayerPrivateGStreamerBase::volumeChangedCallback(MediaPlayerPrivateGStreamerBase* player)
{
// This is called when m_volumeElement receives the notify::volume signal.
- LOG_MEDIA_MESSAGE("Volume changed to: %f", player->volume());
+ GST_DEBUG("Volume changed to: %f", player->volume());
player->m_notifier.notify(MainThreadNotification::VolumeChanged, [player] { player->notifyPlayerOfVolumeChange(); });
}
@@ -550,7 +550,7 @@
}
if (triggerResize) {
- LOG_MEDIA_MESSAGE("First sample reached the sink, triggering video dimensions update");
+ GST_DEBUG("First sample reached the sink, triggering video dimensions update");
if (isMainThread())
m_player->sizeChanged();
else {
@@ -821,7 +821,7 @@
GstElement* colorconvert = gst_element_factory_make("glcolorconvert", nullptr);
if (!upload || !colorconvert) {
- WARN_MEDIA_MESSAGE("Failed to create GstGL elements");
+ GST_WARNING("Failed to create GstGL elements");
gst_object_unref(videoSink);
if (upload)
@@ -850,7 +850,7 @@
g_signal_connect(appsink, "new-sample", G_CALLBACK(newSampleCallback), this);
g_signal_connect(appsink, "new-preroll", G_CALLBACK(newPrerollCallback), this);
} else {
- WARN_MEDIA_MESSAGE("Failed to link GstGL elements");
+ GST_WARNING("Failed to link GstGL elements");
gst_object_unref(videoSink);
videoSink = nullptr;
}
@@ -906,12 +906,12 @@
// We don't set the initial volume because we trust the sink to keep it for us. See
// https://bugs.webkit.org/show_bug.cgi?id=118974 for more information.
if (!m_player->platformVolumeConfigurationRequired()) {
- LOG_MEDIA_MESSAGE("Setting stream volume to %f", m_player->volume());
+ GST_DEBUG("Setting stream volume to %f", m_player->volume());
g_object_set(m_volumeElement.get(), "volume", m_player->volume(), NULL);
} else
- LOG_MEDIA_MESSAGE("Not setting stream volume, trusting system one");
+ GST_DEBUG("Not setting stream volume, trusting system one");
- LOG_MEDIA_MESSAGE("Setting stream muted %d", m_player->muted());
+ GST_DEBUG("Setting stream muted %d", m_player->muted());
g_object_set(m_volumeElement.get(), "mute", m_player->muted(), NULL);
g_signal_connect_swapped(m_volumeElement.get(), "notify::volume", G_CALLBACK(volumeChangedCallback), this);
